mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#4683 clang-format on all files in ApplicationCode
This commit is contained in:
Magne Sjaastad
@@ -1,17 +1,17 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2017- Statoil ASA
|
||||
//
|
||||
//
|
||||
// ResInsight is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
//
|
||||
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
// for more details.
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
@@ -30,8 +30,8 @@
|
||||
#include "RimSummaryPlot.h"
|
||||
#include "RimSummaryPlotSourceStepping.h"
|
||||
|
||||
#include "RiuSummaryQwtPlot.h"
|
||||
#include "RiuQwtPlotCurve.h"
|
||||
#include "RiuSummaryQwtPlot.h"
|
||||
|
||||
#include "cafPdmUiTreeViewEditor.h"
|
||||
|
||||
@@ -39,46 +39,46 @@
|
||||
|
||||
#include <QKeyEvent>
|
||||
|
||||
CAF_PDM_SOURCE_INIT(RimSummaryCurveCollection, "RimSummaryCurveCollection");
|
||||
CAF_PDM_SOURCE_INIT( RimSummaryCurveCollection, "RimSummaryCurveCollection" );
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimSummaryCurveCollection::RimSummaryCurveCollection()
|
||||
{
|
||||
CAF_PDM_InitObject("Summary Curves", ":/SummaryCurveFilter16x16.png", "", "");
|
||||
CAF_PDM_InitObject( "Summary Curves", ":/SummaryCurveFilter16x16.png", "", "" );
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&m_curves, "CollectionCurves", "Collection Curves", "", "", "");
|
||||
m_curves.uiCapability()->setUiHidden(true);
|
||||
m_curves.uiCapability()->setUiTreeChildrenHidden(false);
|
||||
CAF_PDM_InitFieldNoDefault( &m_curves, "CollectionCurves", "Collection Curves", "", "", "" );
|
||||
m_curves.uiCapability()->setUiHidden( true );
|
||||
m_curves.uiCapability()->setUiTreeChildrenHidden( false );
|
||||
|
||||
CAF_PDM_InitField(&m_showCurves, "IsActive", true, "Show Curves", "", "", "");
|
||||
m_showCurves.uiCapability()->setUiHidden(true);
|
||||
CAF_PDM_InitField( &m_showCurves, "IsActive", true, "Show Curves", "", "", "" );
|
||||
m_showCurves.uiCapability()->setUiHidden( true );
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&m_ySourceStepping, "YSourceStepping", "", "", "", "");
|
||||
CAF_PDM_InitFieldNoDefault( &m_ySourceStepping, "YSourceStepping", "", "", "", "" );
|
||||
m_ySourceStepping = new RimSummaryPlotSourceStepping;
|
||||
m_ySourceStepping->setSourceSteppingType(RimSummaryPlotSourceStepping::Y_AXIS);
|
||||
m_ySourceStepping.uiCapability()->setUiHidden(true);
|
||||
m_ySourceStepping.uiCapability()->setUiTreeChildrenHidden(true);
|
||||
m_ySourceStepping->setSourceSteppingType( RimSummaryPlotSourceStepping::Y_AXIS );
|
||||
m_ySourceStepping.uiCapability()->setUiHidden( true );
|
||||
m_ySourceStepping.uiCapability()->setUiTreeChildrenHidden( true );
|
||||
m_ySourceStepping.xmlCapability()->disableIO();
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&m_xSourceStepping, "XSourceStepping", "", "", "", "");
|
||||
CAF_PDM_InitFieldNoDefault( &m_xSourceStepping, "XSourceStepping", "", "", "", "" );
|
||||
m_xSourceStepping = new RimSummaryPlotSourceStepping;
|
||||
m_xSourceStepping->setSourceSteppingType(RimSummaryPlotSourceStepping::X_AXIS);
|
||||
m_xSourceStepping.uiCapability()->setUiHidden(true);
|
||||
m_xSourceStepping.uiCapability()->setUiTreeChildrenHidden(true);
|
||||
m_xSourceStepping->setSourceSteppingType( RimSummaryPlotSourceStepping::X_AXIS );
|
||||
m_xSourceStepping.uiCapability()->setUiHidden( true );
|
||||
m_xSourceStepping.uiCapability()->setUiTreeChildrenHidden( true );
|
||||
m_xSourceStepping.xmlCapability()->disableIO();
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&m_unionSourceStepping, "UnionSourceStepping", "", "", "", "");
|
||||
CAF_PDM_InitFieldNoDefault( &m_unionSourceStepping, "UnionSourceStepping", "", "", "", "" );
|
||||
m_unionSourceStepping = new RimSummaryPlotSourceStepping;
|
||||
m_unionSourceStepping->setSourceSteppingType(RimSummaryPlotSourceStepping::UNION_X_Y_AXIS);
|
||||
m_unionSourceStepping.uiCapability()->setUiHidden(true);
|
||||
m_unionSourceStepping.uiCapability()->setUiTreeChildrenHidden(true);
|
||||
m_unionSourceStepping->setSourceSteppingType( RimSummaryPlotSourceStepping::UNION_X_Y_AXIS );
|
||||
m_unionSourceStepping.uiCapability()->setUiHidden( true );
|
||||
m_unionSourceStepping.uiCapability()->setUiTreeChildrenHidden( true );
|
||||
m_unionSourceStepping.xmlCapability()->disableIO();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimSummaryCurveCollection::~RimSummaryCurveCollection()
|
||||
{
|
||||
@@ -86,7 +86,7 @@ RimSummaryCurveCollection::~RimSummaryCurveCollection()
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimSummaryCurveCollection::isCurvesVisible()
|
||||
{
|
||||
@@ -94,43 +94,43 @@ bool RimSummaryCurveCollection::isCurvesVisible()
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::loadDataAndUpdate(bool updateParentPlot)
|
||||
void RimSummaryCurveCollection::loadDataAndUpdate( bool updateParentPlot )
|
||||
{
|
||||
for (RimSummaryCurve* curve : m_curves)
|
||||
for ( RimSummaryCurve* curve : m_curves )
|
||||
{
|
||||
curve->loadDataAndUpdate(false);
|
||||
curve->loadDataAndUpdate( false );
|
||||
curve->updateQwtPlotAxis();
|
||||
}
|
||||
|
||||
if ( updateParentPlot )
|
||||
{
|
||||
RimSummaryPlot* parentPlot;
|
||||
firstAncestorOrThisOfTypeAsserted(parentPlot);
|
||||
firstAncestorOrThisOfTypeAsserted( parentPlot );
|
||||
parentPlot->updateAll();
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::setParentQwtPlotAndReplot(QwtPlot* plot)
|
||||
void RimSummaryCurveCollection::setParentQwtPlotAndReplot( QwtPlot* plot )
|
||||
{
|
||||
for (RimSummaryCurve* curve : m_curves)
|
||||
for ( RimSummaryCurve* curve : m_curves )
|
||||
{
|
||||
curve->setParentQwtPlotNoReplot(plot);
|
||||
curve->setParentQwtPlotNoReplot( plot );
|
||||
}
|
||||
|
||||
if (plot) plot->replot();
|
||||
if ( plot ) plot->replot();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::detachQwtCurves()
|
||||
{
|
||||
for (RimSummaryCurve* curve : m_curves)
|
||||
for ( RimSummaryCurve* curve : m_curves )
|
||||
{
|
||||
curve->detachQwtCurve();
|
||||
}
|
||||
@@ -141,20 +141,20 @@ void RimSummaryCurveCollection::detachQwtCurves()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::reattachQwtCurves()
|
||||
{
|
||||
for (RimSummaryCurve* curve : m_curves)
|
||||
for ( RimSummaryCurve* curve : m_curves )
|
||||
{
|
||||
curve->reattachQwtCurve();
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimSummaryCurve* RimSummaryCurveCollection::findRimCurveFromQwtCurve(const QwtPlotCurve* qwtCurve) const
|
||||
RimSummaryCurve* RimSummaryCurveCollection::findRimCurveFromQwtCurve( const QwtPlotCurve* qwtCurve ) const
|
||||
{
|
||||
for (RimSummaryCurve* rimCurve : m_curves)
|
||||
for ( RimSummaryCurve* rimCurve : m_curves )
|
||||
{
|
||||
if (rimCurve->qwtPlotCurve() == qwtCurve)
|
||||
if ( rimCurve->qwtPlotCurve() == qwtCurve )
|
||||
{
|
||||
return rimCurve;
|
||||
}
|
||||
@@ -164,31 +164,31 @@ RimSummaryCurve* RimSummaryCurveCollection::findRimCurveFromQwtCurve(const QwtPl
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::addCurve(RimSummaryCurve* curve)
|
||||
void RimSummaryCurveCollection::addCurve( RimSummaryCurve* curve )
|
||||
{
|
||||
if (curve)
|
||||
if ( curve )
|
||||
{
|
||||
m_curves.push_back(curve);
|
||||
m_curves.push_back( curve );
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::deleteCurve(RimSummaryCurve* curve)
|
||||
void RimSummaryCurveCollection::deleteCurve( RimSummaryCurve* curve )
|
||||
{
|
||||
if (curve)
|
||||
if ( curve )
|
||||
{
|
||||
m_curves.removeChildObject(curve);
|
||||
m_curves.removeChildObject( curve );
|
||||
curve->markCachedDataForPurge();
|
||||
delete curve;
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<RimSummaryCurve*> RimSummaryCurveCollection::curves() const
|
||||
{
|
||||
@@ -196,15 +196,16 @@ std::vector<RimSummaryCurve*> RimSummaryCurveCollection::curves() const
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<RimSummaryCurve*> RimSummaryCurveCollection::curvesForSourceStepping(RimSummaryPlotSourceStepping::SourceSteppingType steppingType) const
|
||||
std::vector<RimSummaryCurve*>
|
||||
RimSummaryCurveCollection::curvesForSourceStepping( RimSummaryPlotSourceStepping::SourceSteppingType steppingType ) const
|
||||
{
|
||||
std::vector<RimSummaryCurve*> stepCurves;
|
||||
|
||||
if (m_curveForSourceStepping)
|
||||
if ( m_curveForSourceStepping )
|
||||
{
|
||||
stepCurves.push_back(m_curveForSourceStepping);
|
||||
stepCurves.push_back( m_curveForSourceStepping );
|
||||
|
||||
{
|
||||
// Add corresponding history/summary curve with or without H
|
||||
@@ -213,41 +214,41 @@ std::vector<RimSummaryCurve*> RimSummaryCurveCollection::curvesForSourceStepping
|
||||
|
||||
std::string quantity;
|
||||
|
||||
if (steppingType == RimSummaryPlotSourceStepping::X_AXIS)
|
||||
if ( steppingType == RimSummaryPlotSourceStepping::X_AXIS )
|
||||
{
|
||||
quantity = m_curveForSourceStepping->summaryAddressX().quantityName();
|
||||
}
|
||||
else if (steppingType == RimSummaryPlotSourceStepping::Y_AXIS)
|
||||
else if ( steppingType == RimSummaryPlotSourceStepping::Y_AXIS )
|
||||
{
|
||||
quantity = m_curveForSourceStepping->summaryAddressY().quantityName();
|
||||
}
|
||||
|
||||
std::string candidateName;
|
||||
if (RiaStdStringTools::endsWith(quantity, historyIdentifier))
|
||||
if ( RiaStdStringTools::endsWith( quantity, historyIdentifier ) )
|
||||
{
|
||||
candidateName = quantity.substr(0, quantity.size() - 1);
|
||||
candidateName = quantity.substr( 0, quantity.size() - 1 );
|
||||
}
|
||||
else
|
||||
{
|
||||
candidateName = quantity + historyIdentifier;
|
||||
}
|
||||
|
||||
for (const auto& c : curves())
|
||||
for ( const auto& c : curves() )
|
||||
{
|
||||
if (steppingType == RimSummaryPlotSourceStepping::X_AXIS)
|
||||
if ( steppingType == RimSummaryPlotSourceStepping::X_AXIS )
|
||||
{
|
||||
if (c->summaryCaseX() == m_curveForSourceStepping->summaryCaseX() &&
|
||||
c->summaryAddressX().quantityName() == candidateName)
|
||||
if ( c->summaryCaseX() == m_curveForSourceStepping->summaryCaseX() &&
|
||||
c->summaryAddressX().quantityName() == candidateName )
|
||||
{
|
||||
stepCurves.push_back(c);
|
||||
stepCurves.push_back( c );
|
||||
}
|
||||
}
|
||||
else if (steppingType == RimSummaryPlotSourceStepping::Y_AXIS)
|
||||
else if ( steppingType == RimSummaryPlotSourceStepping::Y_AXIS )
|
||||
{
|
||||
if (c->summaryCaseY() == m_curveForSourceStepping->summaryCaseY() &&
|
||||
c->summaryAddressY().quantityName() == candidateName)
|
||||
if ( c->summaryCaseY() == m_curveForSourceStepping->summaryCaseY() &&
|
||||
c->summaryAddressY().quantityName() == candidateName )
|
||||
{
|
||||
stepCurves.push_back(c);
|
||||
stepCurves.push_back( c );
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -262,32 +263,31 @@ std::vector<RimSummaryCurve*> RimSummaryCurveCollection::curvesForSourceStepping
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::deleteCurvesAssosiatedWithCase(RimSummaryCase* summaryCase)
|
||||
void RimSummaryCurveCollection::deleteCurvesAssosiatedWithCase( RimSummaryCase* summaryCase )
|
||||
{
|
||||
std::vector<RimSummaryCurve*> summaryCurvesToDelete;
|
||||
|
||||
for (RimSummaryCurve* summaryCurve : m_curves)
|
||||
for ( RimSummaryCurve* summaryCurve : m_curves )
|
||||
{
|
||||
if (!summaryCurve) continue;
|
||||
if (!summaryCurve->summaryCaseY()) continue;
|
||||
if ( !summaryCurve ) continue;
|
||||
if ( !summaryCurve->summaryCaseY() ) continue;
|
||||
|
||||
if (summaryCurve->summaryCaseY() == summaryCase)
|
||||
if ( summaryCurve->summaryCaseY() == summaryCase )
|
||||
{
|
||||
summaryCurvesToDelete.push_back(summaryCurve);
|
||||
summaryCurvesToDelete.push_back( summaryCurve );
|
||||
}
|
||||
}
|
||||
for (RimSummaryCurve* summaryCurve : summaryCurvesToDelete)
|
||||
for ( RimSummaryCurve* summaryCurve : summaryCurvesToDelete )
|
||||
{
|
||||
m_curves.removeChildObject(summaryCurve);
|
||||
m_curves.removeChildObject( summaryCurve );
|
||||
delete summaryCurve;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::deleteAllCurves()
|
||||
{
|
||||
@@ -295,27 +295,27 @@ void RimSummaryCurveCollection::deleteAllCurves()
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::updateCaseNameHasChanged()
|
||||
{
|
||||
for (RimSummaryCurve* curve : m_curves)
|
||||
for ( RimSummaryCurve* curve : m_curves )
|
||||
{
|
||||
curve->updateCurveNameNoLegendUpdate();
|
||||
curve->updateConnectedEditors();
|
||||
}
|
||||
|
||||
RimSummaryPlot* parentPlot;
|
||||
firstAncestorOrThisOfTypeAsserted(parentPlot);
|
||||
firstAncestorOrThisOfTypeAsserted( parentPlot );
|
||||
|
||||
parentPlot->updatePlotTitle();
|
||||
if (parentPlot->qwtPlot()) parentPlot->qwtPlot()->updateLegend();
|
||||
if ( parentPlot->qwtPlot() ) parentPlot->qwtPlot()->updateLegend();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::setCurrentSummaryCurve(RimSummaryCurve* curve)
|
||||
void RimSummaryCurveCollection::setCurrentSummaryCurve( RimSummaryCurve* curve )
|
||||
{
|
||||
m_currentSummaryCurve = curve;
|
||||
|
||||
@@ -323,14 +323,14 @@ void RimSummaryCurveCollection::setCurrentSummaryCurve(RimSummaryCurve* curve)
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<caf::PdmFieldHandle*> RimSummaryCurveCollection::fieldsToShowInToolbar()
|
||||
{
|
||||
RimSummaryCrossPlot* parentCrossPlot;
|
||||
firstAncestorOrThisOfType(parentCrossPlot);
|
||||
firstAncestorOrThisOfType( parentCrossPlot );
|
||||
|
||||
if (parentCrossPlot)
|
||||
if ( parentCrossPlot )
|
||||
{
|
||||
return m_unionSourceStepping->fieldsToShowInToolbar();
|
||||
}
|
||||
@@ -339,18 +339,18 @@ std::vector<caf::PdmFieldHandle*> RimSummaryCurveCollection::fieldsToShowInToolb
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::handleKeyPressEvent(QKeyEvent* keyEvent)
|
||||
void RimSummaryCurveCollection::handleKeyPressEvent( QKeyEvent* keyEvent )
|
||||
{
|
||||
if (!keyEvent) return;
|
||||
if ( !keyEvent ) return;
|
||||
|
||||
RimSummaryPlotSourceStepping* sourceStepping = nullptr;
|
||||
{
|
||||
RimSummaryCrossPlot* summaryCrossPlot = nullptr;
|
||||
this->firstAncestorOrThisOfType(summaryCrossPlot);
|
||||
|
||||
if (summaryCrossPlot)
|
||||
this->firstAncestorOrThisOfType( summaryCrossPlot );
|
||||
|
||||
if ( summaryCrossPlot )
|
||||
{
|
||||
sourceStepping = m_unionSourceStepping();
|
||||
}
|
||||
@@ -360,15 +360,15 @@ void RimSummaryCurveCollection::handleKeyPressEvent(QKeyEvent* keyEvent)
|
||||
}
|
||||
}
|
||||
|
||||
if (keyEvent->key() == Qt::Key_PageUp)
|
||||
if ( keyEvent->key() == Qt::Key_PageUp )
|
||||
{
|
||||
if (keyEvent->modifiers() & Qt::ShiftModifier)
|
||||
if ( keyEvent->modifiers() & Qt::ShiftModifier )
|
||||
{
|
||||
sourceStepping->applyPrevCase();
|
||||
|
||||
keyEvent->accept();
|
||||
}
|
||||
else if (keyEvent->modifiers() & Qt::ControlModifier)
|
||||
else if ( keyEvent->modifiers() & Qt::ControlModifier )
|
||||
{
|
||||
sourceStepping->applyPrevOtherIdentifier();
|
||||
|
||||
@@ -381,15 +381,15 @@ void RimSummaryCurveCollection::handleKeyPressEvent(QKeyEvent* keyEvent)
|
||||
keyEvent->accept();
|
||||
}
|
||||
}
|
||||
else if (keyEvent->key() == Qt::Key_PageDown)
|
||||
else if ( keyEvent->key() == Qt::Key_PageDown )
|
||||
{
|
||||
if (keyEvent->modifiers() & Qt::ShiftModifier)
|
||||
if ( keyEvent->modifiers() & Qt::ShiftModifier )
|
||||
{
|
||||
sourceStepping->applyNextCase();
|
||||
|
||||
keyEvent->accept();
|
||||
}
|
||||
else if (keyEvent->modifiers() & Qt::ControlModifier)
|
||||
else if ( keyEvent->modifiers() & Qt::ControlModifier )
|
||||
{
|
||||
sourceStepping->applyNextOtherIdentifier();
|
||||
|
||||
@@ -405,19 +405,19 @@ void RimSummaryCurveCollection::handleKeyPressEvent(QKeyEvent* keyEvent)
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::setCurveAsTopZWithinCategory(RimSummaryCurve* curve)
|
||||
void RimSummaryCurveCollection::setCurveAsTopZWithinCategory( RimSummaryCurve* curve )
|
||||
{
|
||||
for (const auto& c : m_curves)
|
||||
for ( const auto& c : m_curves )
|
||||
{
|
||||
if (c == curve)
|
||||
if ( c == curve )
|
||||
{
|
||||
c->setAsTopZWithinCategory(true);
|
||||
c->setAsTopZWithinCategory( true );
|
||||
}
|
||||
else
|
||||
{
|
||||
c->setAsTopZWithinCategory(false);
|
||||
c->setAsTopZWithinCategory( false );
|
||||
}
|
||||
|
||||
c->setZIndexFromCurveInfo();
|
||||
@@ -425,15 +425,15 @@ void RimSummaryCurveCollection::setCurveAsTopZWithinCategory(RimSummaryCurve* cu
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::setCurveForSourceStepping(RimSummaryCurve* curve)
|
||||
void RimSummaryCurveCollection::setCurveForSourceStepping( RimSummaryCurve* curve )
|
||||
{
|
||||
m_curveForSourceStepping = curve;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimSummaryCurve* RimSummaryCurveCollection::curveForSourceStepping() const
|
||||
{
|
||||
@@ -441,54 +441,56 @@ RimSummaryCurve* RimSummaryCurveCollection::curveForSourceStepping() const
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
|
||||
void RimSummaryCurveCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
|
||||
const QVariant& oldValue,
|
||||
const QVariant& newValue )
|
||||
{
|
||||
if (changedField == &m_showCurves)
|
||||
if ( changedField == &m_showCurves )
|
||||
{
|
||||
loadDataAndUpdate(true);
|
||||
loadDataAndUpdate( true );
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
|
||||
void RimSummaryCurveCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
|
||||
{
|
||||
RimSummaryCrossPlot* parentCrossPlot;
|
||||
firstAncestorOrThisOfType(parentCrossPlot);
|
||||
firstAncestorOrThisOfType( parentCrossPlot );
|
||||
|
||||
if (parentCrossPlot)
|
||||
if ( parentCrossPlot )
|
||||
{
|
||||
{
|
||||
auto group = uiOrdering.addNewGroup("Y Source Stepping");
|
||||
auto group = uiOrdering.addNewGroup( "Y Source Stepping" );
|
||||
|
||||
m_ySourceStepping()->uiOrdering(uiConfigName, *group);
|
||||
m_ySourceStepping()->uiOrdering( uiConfigName, *group );
|
||||
}
|
||||
|
||||
{
|
||||
auto group = uiOrdering.addNewGroup("X Source Stepping");
|
||||
auto group = uiOrdering.addNewGroup( "X Source Stepping" );
|
||||
|
||||
m_xSourceStepping()->uiOrdering(uiConfigName, *group);
|
||||
m_xSourceStepping()->uiOrdering( uiConfigName, *group );
|
||||
}
|
||||
|
||||
{
|
||||
auto group = uiOrdering.addNewGroup("XY Union Source Stepping");
|
||||
auto group = uiOrdering.addNewGroup( "XY Union Source Stepping" );
|
||||
|
||||
m_unionSourceStepping()->uiOrdering(uiConfigName, *group);
|
||||
m_unionSourceStepping()->uiOrdering( uiConfigName, *group );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
auto group = uiOrdering.addNewGroup("Data Source");
|
||||
auto group = uiOrdering.addNewGroup( "Data Source" );
|
||||
|
||||
m_ySourceStepping()->uiOrdering(uiConfigName, *group);
|
||||
m_ySourceStepping()->uiOrdering( uiConfigName, *group );
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
caf::PdmFieldHandle* RimSummaryCurveCollection::objectToggleField()
|
||||
{
|
||||
@@ -496,12 +498,12 @@ caf::PdmFieldHandle* RimSummaryCurveCollection::objectToggleField()
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryCurveCollection::defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
|
||||
void RimSummaryCurveCollection::defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
|
||||
{
|
||||
caf::PdmUiTreeViewEditorAttribute* myAttr = dynamic_cast<caf::PdmUiTreeViewEditorAttribute*>(attribute);
|
||||
if (myAttr && m_currentSummaryCurve.notNull())
|
||||
caf::PdmUiTreeViewEditorAttribute* myAttr = dynamic_cast<caf::PdmUiTreeViewEditorAttribute*>( attribute );
|
||||
if ( myAttr && m_currentSummaryCurve.notNull() )
|
||||
{
|
||||
myAttr->currentObject = m_currentSummaryCurve.p();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user