diff --git a/ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp b/ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp index a44c3cf7d2..293c791b20 100644 --- a/ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp +++ b/ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp @@ -166,7 +166,7 @@ QString RicSaveMultiPlotTemplateFeature::createTextFromObject( RimSummaryMultiPl std::set sourceStrings; const QString summaryFieldKeyword = RicSummaryPlotTemplateTools::summaryCaseFieldKeyword(); - for ( const auto& curve : summaryPlot->allCurves( RimSummaryDataSourceStepping::Axis::Y_AXIS ) ) + for ( const auto& curve : summaryPlot->allCurves() ) { auto fieldHandle = curve->findField( summaryFieldKeyword ); if ( fieldHandle ) @@ -186,7 +186,7 @@ QString RicSaveMultiPlotTemplateFeature::createTextFromObject( RimSummaryMultiPl std::set sourceStrings; const QString summaryFieldKeyword = RicSummaryPlotTemplateTools::summaryCaseXFieldKeyword(); - for ( const auto& curve : summaryPlot->allCurves( RimSummaryDataSourceStepping::Axis::Y_AXIS ) ) + for ( const auto& curve : summaryPlot->allCurves() ) { if ( curve->axisTypeX() != RiaDefines::HorizontalAxisType::SUMMARY_VECTOR ) continue; diff --git a/ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp b/ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp index 0717d016d0..bd02e4765c 100644 --- a/ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp +++ b/ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp @@ -247,7 +247,7 @@ void RicSummaryPlotTemplateTools::setValuesForPlaceholders( RimSummaryPlot* { // Replace single summary curves data sources - auto summaryCurves = summaryPlot->allCurves( RimSummaryDataSourceStepping::Axis::Y_AXIS ); + auto summaryCurves = summaryPlot->allCurves(); for ( const auto& curve : summaryCurves ) { auto summaryCaseHandle = curve->findField( RicSummaryPlotTemplateTools::summaryCaseFieldKeyword() ); diff --git a/ApplicationLibCode/ProjectDataModel/RimMainPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimMainPlotCollection.cpp index 208c85b8b8..fbae6cd76d 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMainPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMainPlotCollection.cpp @@ -210,7 +210,7 @@ void RimMainPlotCollection::initAfterRead() auto summaryPlot = new RimSummaryPlot; summaryMultiPlot->addPlot( summaryPlot ); - for ( auto curve : crossPlot->allCurves( RimSummaryDataSourceStepping::Axis::Y_AXIS ) ) + for ( auto curve : crossPlot->allCurves() ) { crossPlot->removeCurve( curve ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp index 5632c314fa..6892254a68 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp @@ -51,7 +51,6 @@ RimEnsembleCurveSetCollection::RimEnsembleCurveSetCollection() CAF_PDM_InitFieldNoDefault( &m_ySourceStepping, "YSourceStepping", "" ); m_ySourceStepping = new RimSummaryPlotSourceStepping; - m_ySourceStepping->setSourceSteppingType( RimSummaryDataSourceStepping::Axis::Y_AXIS ); m_ySourceStepping.uiCapability()->setUiTreeHidden( true ); m_ySourceStepping.uiCapability()->setUiTreeChildrenHidden( true ); m_ySourceStepping.xmlCapability()->disableIO(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressModifier.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressModifier.cpp index b62de94173..2b49a42859 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressModifier.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressModifier.cpp @@ -56,7 +56,7 @@ std::vector RimSummaryAddressModifier::createAddressM mods.emplace_back( RimSummaryAddressModifier( curveSet ) ); } - auto curves = summaryPlot->allCurves( RimSummaryDataSourceStepping::Axis::Y_AXIS ); + auto curves = summaryPlot->allCurves(); for ( auto c : curves ) { mods.emplace_back( RimSummaryAddressModifier( c ) ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp index c9616ac569..70fbf082cd 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp @@ -65,24 +65,9 @@ RimSummaryCurveCollection::RimSummaryCurveCollection() CAF_PDM_InitFieldNoDefault( &m_ySourceStepping, "YSourceStepping", "" ); m_ySourceStepping = new RimSummaryPlotSourceStepping; - m_ySourceStepping->setSourceSteppingType( RimSummaryDataSourceStepping::Axis::Y_AXIS ); m_ySourceStepping.uiCapability()->setUiTreeHidden( true ); m_ySourceStepping.uiCapability()->setUiTreeChildrenHidden( true ); m_ySourceStepping.xmlCapability()->disableIO(); - - CAF_PDM_InitFieldNoDefault( &m_xSourceStepping, "XSourceStepping", "" ); - m_xSourceStepping = new RimSummaryPlotSourceStepping; - m_xSourceStepping->setSourceSteppingType( RimSummaryDataSourceStepping::Axis::X_AXIS ); - m_xSourceStepping.uiCapability()->setUiTreeHidden( true ); - m_xSourceStepping.uiCapability()->setUiTreeChildrenHidden( true ); - m_xSourceStepping.xmlCapability()->disableIO(); - - CAF_PDM_InitFieldNoDefault( &m_unionSourceStepping, "UnionSourceStepping", "" ); - m_unionSourceStepping = new RimSummaryPlotSourceStepping; - m_unionSourceStepping->setSourceSteppingType( RimSummaryDataSourceStepping::Axis::UNION_X_Y_AXIS ); - m_unionSourceStepping.uiCapability()->setUiTreeHidden( true ); - m_unionSourceStepping.uiCapability()->setUiTreeChildrenHidden( true ); - m_unionSourceStepping.xmlCapability()->disableIO(); } //-------------------------------------------------------------------------------------------------- @@ -255,70 +240,6 @@ std::vector RimSummaryCurveCollection::curves() const return m_curves.childrenByType(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -std::vector RimSummaryCurveCollection::curvesForSourceStepping( RimSummaryDataSourceStepping::Axis steppingType ) const -{ - std::vector stepCurves; - - if ( m_curveForSourceStepping ) - { - stepCurves.push_back( m_curveForSourceStepping ); - - { - // Add corresponding history/summary curve with or without H - - const std::string historyIdentifier = "H"; - - std::string vectorName; - - if ( steppingType == RimSummaryDataSourceStepping::Axis::X_AXIS ) - { - vectorName = m_curveForSourceStepping->summaryAddressX().vectorName(); - } - else if ( steppingType == RimSummaryDataSourceStepping::Axis::Y_AXIS ) - { - vectorName = m_curveForSourceStepping->summaryAddressY().vectorName(); - } - - std::string candidateName; - if ( RiaStdStringTools::endsWith( vectorName, historyIdentifier ) ) - { - candidateName = vectorName.substr( 0, vectorName.size() - 1 ); - } - else - { - candidateName = vectorName + historyIdentifier; - } - - for ( const auto& c : curves() ) - { - if ( steppingType == RimSummaryDataSourceStepping::Axis::X_AXIS ) - { - if ( c->summaryCaseX() == m_curveForSourceStepping->summaryCaseX() && c->summaryAddressX().vectorName() == candidateName ) - { - stepCurves.push_back( c ); - } - } - else if ( steppingType == RimSummaryDataSourceStepping::Axis::Y_AXIS ) - { - if ( c->summaryCaseY() == m_curveForSourceStepping->summaryCaseY() && c->summaryAddressY().vectorName() == candidateName ) - { - stepCurves.push_back( c ); - } - } - } - } - } - else - { - stepCurves = curves(); - } - - return stepCurves; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -425,22 +346,9 @@ RimSummaryCurve* RimSummaryCurveCollection::curveForSourceStepping() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimSummaryPlotSourceStepping* RimSummaryCurveCollection::sourceSteppingObject( RimSummaryDataSourceStepping::Axis sourceSteppingType ) const +RimSummaryPlotSourceStepping* RimSummaryCurveCollection::sourceSteppingObject() const { - if ( sourceSteppingType == RimSummaryDataSourceStepping::Axis::X_AXIS ) - { - return m_xSourceStepping(); - } - else if ( sourceSteppingType == RimSummaryDataSourceStepping::Axis::Y_AXIS ) - { - return m_ySourceStepping(); - } - if ( sourceSteppingType == RimSummaryDataSourceStepping::Axis::UNION_X_Y_AXIS ) - { - return m_unionSourceStepping(); - } - - return nullptr; + return m_ySourceStepping(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h index 364744a2f7..376188283e 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h @@ -52,11 +52,10 @@ public: void setCurveForSourceStepping( RimSummaryCurve* curve ); RimSummaryCurve* curveForSourceStepping() const; - RimSummaryPlotSourceStepping* sourceSteppingObject( RimSummaryDataSourceStepping::Axis sourceSteppingType ) const; + RimSummaryPlotSourceStepping* sourceSteppingObject() const; std::set horizontalAxisTypes() const; std::vector curves() const; - std::vector curvesForSourceStepping( RimSummaryDataSourceStepping::Axis steppingType ) const; void setCurveAsTopZWithinCategory( RimSummaryCurve* curve ); @@ -108,8 +107,6 @@ private: caf::PdmField m_editPlot; caf::PdmChildField m_ySourceStepping; - caf::PdmChildField m_xSourceStepping; - caf::PdmChildField m_unionSourceStepping; caf::PdmPointer m_currentSummaryCurve; caf::PdmPointer m_curveForSourceStepping; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryDataSourceStepping.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryDataSourceStepping.h index b050ace7db..ee01a0dd7e 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryDataSourceStepping.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryDataSourceStepping.h @@ -26,13 +26,6 @@ class RimEnsembleCurveSet; class RimSummaryDataSourceStepping { public: - enum class Axis - { - Y_AXIS, - X_AXIS, - UNION_X_Y_AXIS - }; - enum class SourceSteppingDimension { SUMMARY_CASE, @@ -48,8 +41,7 @@ public: }; public: - virtual std::vector availableAxes() const = 0; - virtual std::vector curvesForStepping( RimSummaryDataSourceStepping::Axis axis ) const = 0; - virtual std::vector allCurves( RimSummaryDataSourceStepping::Axis axis ) const = 0; - virtual std::vector curveSets() const = 0; + virtual std::vector curvesForStepping() const = 0; + virtual std::vector allCurves() const = 0; + virtual std::vector curveSets() const = 0; }; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp index 3dccfeb4c4..d0b99c26c3 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp @@ -163,7 +163,6 @@ RimSummaryMultiPlot::RimSummaryMultiPlot() CAF_PDM_InitFieldNoDefault( &m_sourceStepping, "SourceStepping", "" ); m_sourceStepping = new RimSummaryPlotSourceStepping; - m_sourceStepping->setSourceSteppingType( RimSummaryDataSourceStepping::Axis::Y_AXIS ); m_sourceStepping->setSourceSteppingObject( this ); m_sourceStepping.uiCapability()->setUiTreeHidden( true ); m_sourceStepping.uiCapability()->setUiTreeChildrenHidden( true ); @@ -308,21 +307,13 @@ void RimSummaryMultiPlot::updateAfterPlotRemove() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimSummaryMultiPlot::availableAxes() const -{ - return { RimSummaryDataSourceStepping::Axis::X_AXIS }; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -std::vector RimSummaryMultiPlot::curvesForStepping( RimSummaryDataSourceStepping::Axis axis ) const +std::vector RimSummaryMultiPlot::curvesForStepping() const { std::vector curves; for ( auto summaryPlot : summaryPlots() ) { - for ( auto curve : summaryPlot->curvesForStepping( axis ) ) + for ( auto curve : summaryPlot->curvesForStepping() ) { curves.push_back( curve ); } @@ -352,13 +343,13 @@ std::vector RimSummaryMultiPlot::curveSets() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimSummaryMultiPlot::allCurves( RimSummaryDataSourceStepping::Axis axis ) const +std::vector RimSummaryMultiPlot::allCurves() const { std::vector curves; for ( auto summaryPlot : summaryPlots() ) { - for ( auto curve : summaryPlot->allCurves( axis ) ) + for ( auto curve : summaryPlot->allCurves() ) { curves.push_back( curve ); } @@ -378,7 +369,7 @@ void RimSummaryMultiPlot::populateNameHelper( RimSummaryPlotNameHelper* nameHelp std::vector sumCases; std::vector ensembleCases; - for ( RimSummaryCurve* curve : allCurves( RimSummaryDataSourceStepping::Axis::Y_AXIS ) ) + for ( RimSummaryCurve* curve : allCurves() ) { addresses.push_back( curve->curveAddress() ); sumCases.push_back( curve->summaryCaseY() ); @@ -1538,7 +1529,7 @@ void RimSummaryMultiPlot::appendSubPlotByStepping( int direction ) if ( m_sourceStepping()->stepDimension() == RimSummaryDataSourceStepping::SourceSteppingDimension::SUMMARY_CASE ) { RimSummaryCase* newCase = m_sourceStepping()->stepCase( direction ); - for ( auto curve : newPlot->allCurves( RimSummaryDataSourceStepping::Axis::Y_AXIS ) ) + for ( auto curve : newPlot->allCurves() ) { curve->setSummaryCaseY( newCase ); @@ -1585,7 +1576,7 @@ void RimSummaryMultiPlot::appendCurveByStepping( int direction ) { std::vector addresses; - for ( auto curve : plot->allCurves( RimSummaryDataSourceStepping::Axis::Y_AXIS ) ) + for ( auto curve : plot->allCurves() ) { auto address = curve->summaryAddressY(); auto sumCase = curve->summaryCaseY(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h index ec16511e61..5797a0fbec 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h @@ -68,10 +68,9 @@ public: void setAutoPlotTitle( bool enable ); void setAutoSubPlotTitle( bool enable ); - std::vector availableAxes() const override; - std::vector curvesForStepping( RimSummaryDataSourceStepping::Axis axis ) const override; - std::vector curveSets() const override; - std::vector allCurves( RimSummaryDataSourceStepping::Axis axis ) const override; + std::vector curvesForStepping() const override; + std::vector curveSets() const override; + std::vector allCurves() const override; void addPlot( RimPlot* plot ) override; void insertPlot( RimPlot* plot, size_t index ) override; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 72d135edb9..d7c69aca7f 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -461,7 +461,7 @@ void RimSummaryPlot::moveCurvesToPlot( RimSummaryPlot* plot, const std::vector RimSummaryPlot::curvesForStepping( RimSummaryDataSourceStepping::Axis axis ) const +std::vector RimSummaryPlot::curvesForStepping() const { auto curveForStepping = summaryCurveCollection()->curveForSourceStepping(); if ( curveForStepping ) @@ -483,26 +483,11 @@ std::vector RimSummaryPlot::curveSets() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimSummaryPlot::allCurves( RimSummaryDataSourceStepping::Axis axis ) const +std::vector RimSummaryPlot::allCurves() const { return summaryCurves(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -std::vector RimSummaryPlot::availableAxes() const -{ - auto axisTypes = m_summaryCurveCollection->horizontalAxisTypes(); - - if ( axisTypes.contains( RiaDefines::HorizontalAxisType::SUMMARY_VECTOR ) ) - { - return { RimSummaryDataSourceStepping::Axis::X_AXIS, RimSummaryDataSourceStepping::Axis::Y_AXIS }; - } - - return { RimSummaryDataSourceStepping::Axis::X_AXIS }; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -1242,16 +1227,6 @@ void RimSummaryPlot::ensureRequiredAxisObjectsForCurves() m_axisPropertiesArray.push_back( axisProperties ); } - - auto axisTypes = m_summaryCurveCollection->horizontalAxisTypes(); - if ( axisTypes.contains( RiaDefines::HorizontalAxisType::SUMMARY_VECTOR ) ) - { - m_sourceStepping->setSourceSteppingType( RimSummaryDataSourceStepping::Axis::UNION_X_Y_AXIS ); - } - else - { - m_sourceStepping->setSourceSteppingType( RimSummaryDataSourceStepping::Axis::Y_AXIS ); - } } //-------------------------------------------------------------------------------------------------- @@ -3078,7 +3053,7 @@ RimSummaryPlotSourceStepping* RimSummaryPlot::sourceSteppingObjectForKeyEventHan if ( axisTypes.contains( RiaDefines::HorizontalAxisType::SUMMARY_VECTOR ) ) { - return summaryCurveCollection()->sourceSteppingObject( RimSummaryDataSourceStepping::Axis::UNION_X_Y_AXIS ); + return summaryCurveCollection()->sourceSteppingObject(); } return m_sourceStepping; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h index af71a8722c..3a5e96101c 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h @@ -198,10 +198,9 @@ public: static void moveCurvesToPlot( RimSummaryPlot* plot, const std::vector curves, int insertAtPosition ); - std::vector availableAxes() const override; - std::vector curvesForStepping( RimSummaryDataSourceStepping::Axis axis ) const override; - std::vector curveSets() const override; - std::vector allCurves( RimSummaryDataSourceStepping::Axis axis ) const override; + std::vector curvesForStepping() const override; + std::vector curveSets() const override; + std::vector allCurves() const override; std::vector plotAxes( RimPlotAxisProperties::Orientation orientation ) const; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp index 9f026737b7..e814c095f6 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp @@ -59,7 +59,6 @@ CAF_PDM_SOURCE_INIT( RimSummaryPlotSourceStepping, "RimSummaryCurveCollectionMod /// //-------------------------------------------------------------------------------------------------- RimSummaryPlotSourceStepping::RimSummaryPlotSourceStepping() - : m_sourceSteppingType( RimSummaryDataSourceStepping::Axis::Y_AXIS ) { CAF_PDM_InitObject( "Summary Curves Modifier" ); @@ -96,14 +95,6 @@ RimSummaryPlotSourceStepping::RimSummaryPlotSourceStepping() CAF_PDM_InitField( &m_autoUpdateAppearance, "AutoUpdateAppearance", false, "Update Appearance" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimSummaryPlotSourceStepping::setSourceSteppingType( RimSummaryDataSourceStepping::Axis sourceSteppingType ) -{ - m_sourceSteppingType = sourceSteppingType; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -325,7 +316,7 @@ QList RimSummaryPlotSourceStepping::calculateValueOption void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { std::vector curves; - if ( dataSourceSteppingObject() ) curves = dataSourceSteppingObject()->allCurves( m_sourceSteppingType ); + if ( dataSourceSteppingObject() ) curves = dataSourceSteppingObject()->allCurves(); bool isAutoZoomAllowed = false; bool doZoomAll = false; @@ -398,25 +389,19 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle* for ( auto curve : curves ) { - if ( isYAxisStepping() ) + if ( previousCase == curve->summaryCaseY() ) { - if ( previousCase == curve->summaryCaseY() ) - { - curve->setSummaryCaseY( m_summaryCase ); + curve->setSummaryCaseY( m_summaryCase ); - if ( m_autoUpdateAppearance ) - { - curve->setCurveAppearanceFromCaseType(); - } + if ( m_autoUpdateAppearance ) + { + curve->setCurveAppearanceFromCaseType(); } } - if ( isXAxisStepping() ) + if ( previousCase == curve->summaryCaseX() ) { - if ( previousCase == curve->summaryCaseX() ) - { - curve->setSummaryCaseX( m_summaryCase ); - } + curve->setSummaryCaseX( m_summaryCase ); } } @@ -507,19 +492,13 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle* { for ( auto curve : curves ) { - if ( isYAxisStepping() ) - { - RifEclipseSummaryAddress adr = curve->summaryAddressY(); - RimDataSourceSteppingTools::updateAddressIfMatching( oldValue, newValue, summaryCategoryToModify, adr ); - curve->setSummaryAddressY( adr ); - } + RifEclipseSummaryAddress adrY = curve->summaryAddressY(); + RimDataSourceSteppingTools::updateAddressIfMatching( oldValue, newValue, summaryCategoryToModify, adrY ); + curve->setSummaryAddressY( adrY ); - if ( isXAxisStepping() ) - { - RifEclipseSummaryAddress adr = curve->summaryAddressX(); - RimDataSourceSteppingTools::updateAddressIfMatching( oldValue, newValue, summaryCategoryToModify, adr ); - curve->setSummaryAddressX( adr ); - } + RifEclipseSummaryAddress adrX = curve->summaryAddressX(); + RimDataSourceSteppingTools::updateAddressIfMatching( oldValue, newValue, summaryCategoryToModify, adrX ); + curve->setSummaryAddressX( adrX ); } if ( dataSourceSteppingObject() ) @@ -634,7 +613,7 @@ std::set RimSummaryPlotSourceStepping::adressesForSour } std::vector curves; - if ( dataSourceSteppingObject() ) curves = dataSourceSteppingObject()->curvesForStepping( m_sourceSteppingType ); + if ( dataSourceSteppingObject() ) curves = dataSourceSteppingObject()->curvesForStepping(); size_t maxAddrCount = 0; int maxAddrIndex = -1; @@ -644,7 +623,7 @@ std::set RimSummaryPlotSourceStepping::adressesForSour auto curve = curves[i]; if ( !curve ) continue; - if ( isYAxisStepping() && curve->summaryCaseY() && curve->summaryCaseY()->summaryReader() ) + if ( curve->summaryCaseY() && curve->summaryCaseY()->summaryReader() ) { auto addresses = curve->summaryCaseY()->summaryReader()->allResultAddresses(); @@ -656,7 +635,7 @@ std::set RimSummaryPlotSourceStepping::adressesForSour } } - if ( isXAxisStepping() && curve->summaryCaseX() && curve->summaryCaseX()->summaryReader() ) + if ( curve->summaryCaseX() && curve->summaryCaseX()->summaryReader() ) { auto addresses = curve->summaryCaseX()->summaryReader()->allResultAddresses(); size_t addrCount = addresses.size(); @@ -672,13 +651,13 @@ std::set RimSummaryPlotSourceStepping::adressesForSour { auto curve = curves[maxAddrIndex]; - if ( isXAxisStepping() && curve->summaryCaseX() && curve->summaryCaseX()->summaryReader() ) + if ( curve->summaryCaseX() && curve->summaryCaseX()->summaryReader() ) { auto addresses = curve->summaryCaseX()->summaryReader()->allResultAddresses(); addressSet.insert( addresses.begin(), addresses.end() ); } - if ( isYAxisStepping() && curve->summaryCaseY() && curve->summaryCaseY()->summaryReader() ) + if ( curve->summaryCaseY() && curve->summaryCaseY()->summaryReader() ) { auto addresses = curve->summaryCaseY()->summaryReader()->allResultAddresses(); addressSet.insert( addresses.begin(), addresses.end() ); @@ -704,16 +683,13 @@ std::set RimSummaryPlotSourceStepping::addressesForCur } std::vector curves; - if ( dataSourceSteppingObject() ) curves = dataSourceSteppingObject()->curvesForStepping( m_sourceSteppingType ); + if ( dataSourceSteppingObject() ) curves = dataSourceSteppingObject()->curvesForStepping(); for ( auto curve : curves ) { - if ( isYAxisStepping() ) - { - addresses.insert( curve->summaryAddressY() ); - } + addresses.insert( curve->summaryAddressY() ); - if ( isXAxisStepping() ) + if ( curve->axisTypeX() == RiaDefines::HorizontalAxisType::SUMMARY_VECTOR ) { addresses.insert( curve->summaryAddressX() ); } @@ -731,15 +707,12 @@ std::set RimSummaryPlotSourceStepping::summaryCasesCurveCollect std::set sumCases; std::vector curves; - if ( dataSourceSteppingObject() ) curves = dataSourceSteppingObject()->curvesForStepping( m_sourceSteppingType ); + if ( dataSourceSteppingObject() ) curves = dataSourceSteppingObject()->curvesForStepping(); for ( auto c : curves ) { - if ( isYAxisStepping() ) - { - sumCases.insert( c->summaryCaseY() ); - } + sumCases.insert( c->summaryCaseY() ); - if ( isXAxisStepping() ) + if ( c->axisTypeX() == RiaDefines::HorizontalAxisType::SUMMARY_VECTOR ) { sumCases.insert( c->summaryCaseX() ); } @@ -918,30 +891,6 @@ std::set RimSummaryPlotSourceStepping::ensembleCollec return summaryCaseCollections; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RimSummaryPlotSourceStepping::isXAxisStepping() const -{ - if ( m_sourceSteppingType == RimSummaryDataSourceStepping::Axis::UNION_X_Y_AXIS ) return true; - - if ( m_sourceSteppingType == RimSummaryDataSourceStepping::Axis::X_AXIS ) return true; - - return false; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RimSummaryPlotSourceStepping::isYAxisStepping() const -{ - if ( m_sourceSteppingType == RimSummaryDataSourceStepping::Axis::UNION_X_Y_AXIS ) return true; - - if ( m_sourceSteppingType == RimSummaryDataSourceStepping::Axis::Y_AXIS ) return true; - - return false; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -1302,13 +1251,11 @@ void RimSummaryPlotSourceStepping::updateVectorNameInCurves( std::vector> curvesInPlot; for ( auto curve : curves ) { - if ( isYAxisStepping() ) { auto adr = curve->summaryAddressY(); if ( RimDataSourceSteppingTools::updateQuantityIfMatching( oldValue, newValue, adr ) ) curve->setSummaryAddressY( adr ); } - if ( isXAxisStepping() ) { auto adr = curve->summaryAddressX(); if ( RimDataSourceSteppingTools::updateQuantityIfMatching( oldValue, newValue, adr ) ) curve->setSummaryAddressX( adr ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h index 76b1256dab..09cf0091d8 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h @@ -49,7 +49,6 @@ class RimSummaryPlotSourceStepping : public caf::PdmObject public: RimSummaryPlotSourceStepping(); - void setSourceSteppingType( RimSummaryDataSourceStepping::Axis sourceSteppingType ); void setSourceSteppingObject( caf::PdmObject* sourceObject ); void applyNextStep(); @@ -92,9 +91,6 @@ private: std::vector activeFieldsForDataSourceStepping(); std::vector toolbarFieldsForDataSourceStepping(); - bool isXAxisStepping() const; - bool isYAxisStepping() const; - void modifyCurrentIndex( caf::PdmValueField* valueField, int indexOffset, bool notifyChange = true ); std::vector summaryCasesForSourceStepping(); @@ -132,6 +128,5 @@ private: caf::PdmField m_includeEnsembleCasesForCaseStepping; caf::PdmField m_autoUpdateAppearance; - RimSummaryDataSourceStepping::Axis m_sourceSteppingType; - std::vector m_cachedIdentifiers; + std::vector m_cachedIdentifiers; };