OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prevent update of show statistics selection in source stepping

Browse Source 
- Refactor code into two functions
- Do not update selection when performing source stepping
This commit is contained in:
Jørgen Herje
2023-02-21 12:56:35 +01:00
committed by Magne Sjaastad
parent 88ebf857ff
commit 0601de4c18
10 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Commands/PlotBuilderCommands/RicSummaryPlotBuilder.cpp
View File

@@ -251,7 +251,7 @@ RimEnsembleCurveSet* RicSummaryPlotBuilder::createCurveSet( RimSummaryCaseCollec
auto curveSet = new RimEnsembleCurveSet(); auto curveSet = new RimEnsembleCurveSet();
curveSet->setSummaryCaseCollection( ensemble ); curveSet->setSummaryCaseCollection( ensemble );
curveSet->setSummaryAddress( addr ); curveSet->setSummaryAddressAndStatisticsFlag( addr );
return curveSet; return curveSet;
} }

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp
View File

@@ -315,7 +315,7 @@ void RicSummaryPlotTemplateTools::setValuesForPlaceholders( RimSummaryPlot*
setPlaceholderWellName( &curveAdr, wellNames ); setPlaceholderWellName( &curveAdr, wellNames );
setPlaceholderGroupName( &curveAdr, groupNames ); setPlaceholderGroupName( &curveAdr, groupNames );
setPlaceholderRegion( &curveAdr, regions ); setPlaceholderRegion( &curveAdr, regions );
curveSet->setSummaryAddress( curveAdr ); curveSet->setSummaryAddressAndStatisticsFlag( curveAdr );
} }
} }
} }

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
View File

@@ -90,7 +90,7 @@ std::vector<RimEnsembleCurveSet*>
RimEnsembleCurveSetColorManager::cycledEnsembleColorRange( static_cast<int>( colorIndex ) ) ) ); RimEnsembleCurveSetColorManager::cycledEnsembleColorRange( static_cast<int>( colorIndex ) ) ) );
curveSet->setSummaryCaseCollection( ensemble ); curveSet->setSummaryCaseCollection( ensemble );
curveSet->setSummaryAddress( addr ); curveSet->setSummaryAddressAndStatisticsFlag( addr );
auto filter = curveSet->filterCollection()->addFilter(); auto filter = curveSet->filterCollection()->addFilter();
filter->setActive( false ); filter->setActive( false );

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp
View File

@@ -509,7 +509,7 @@ void RicSummaryPlotEditorUi::updatePreviewCurvesFromCurveDefinitions(
curveSet = new RimEnsembleCurveSet(); curveSet = new RimEnsembleCurveSet();
curveSet->disableStatisticCurves(); curveSet->disableStatisticCurves();
curveSet->setSummaryCaseCollection( curveDef.ensemble() ); curveSet->setSummaryCaseCollection( curveDef.ensemble() );
curveSet->setSummaryAddress( curveDef.summaryAddress() ); curveSet->setSummaryAddressAndStatisticsFlag( curveDef.summaryAddress() );
// Set single curve set color // Set single curve set color
auto allCurveSets = m_previewPlot->ensembleCurveSetCollection()->curveSets(); auto allCurveSets = m_previewPlot->ensembleCurveSetCollection()->curveSets();

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp
View File

@@ -557,7 +557,7 @@ RimEnsembleCurveSet* RicSummaryPlotFeatureImpl::createCurveSet( RimSummaryCaseCo
auto curveSet = new RimEnsembleCurveSet(); auto curveSet = new RimEnsembleCurveSet();
curveSet->setSummaryCaseCollection( ensemble ); curveSet->setSummaryCaseCollection( ensemble );
curveSet->setSummaryAddress( addr ); curveSet->setSummaryAddressAndStatisticsFlag( addr );
if ( ensembleColoringStyle == EnsembleColoringType::PARAMETER || if ( ensembleColoringStyle == EnsembleColoringType::PARAMETER ||
ensembleColoringStyle == EnsembleColoringType::LOG_PARAMETER ) ensembleColoringStyle == EnsembleColoringType::LOG_PARAMETER )

8
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -388,8 +388,16 @@ void RimEnsembleCurveSet::setSummaryAddress( RifEclipseSummaryAddress address )
RimSummaryAddress* summaryAddress = new RimSummaryAddress(); RimSummaryAddress* summaryAddress = new RimSummaryAddress();
summaryAddress->setAddress( address ); summaryAddress->setAddress( address );
m_objectiveValuesSummaryAddresses.push_back( summaryAddress ); m_objectiveValuesSummaryAddresses.push_back( summaryAddress );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::setSummaryAddressAndStatisticsFlag( RifEclipseSummaryAddress address )
{
setSummaryAddress( address );
m_statistics->setShowStatisticsCurves( !address.isHistoryVector() ); m_statistics->setShowStatisticsCurves( !address.isHistoryVector() );
m_statistics->updateAllRequiredEditors();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
View File

@@ -107,6 +107,7 @@ public:
void deleteCurve( RimSummaryCurve* curve ); void deleteCurve( RimSummaryCurve* curve );
void setSummaryAddress( RifEclipseSummaryAddress address ); void setSummaryAddress( RifEclipseSummaryAddress address );
void setSummaryAddressAndStatisticsFlag( RifEclipseSummaryAddress address );
RifEclipseSummaryAddress summaryAddress() const; RifEclipseSummaryAddress summaryAddress() const;
std::vector<RimSummaryCurve*> curves() const; std::vector<RimSummaryCurve*> curves() const;

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressModifier.cpp
View File

@@ -92,7 +92,7 @@ RifEclipseSummaryAddress RimSummaryAddressModifier::address() const
void RimSummaryAddressModifier::setAddress( const RifEclipseSummaryAddress& address ) void RimSummaryAddressModifier::setAddress( const RifEclipseSummaryAddress& address )
{ {
if ( m_curve ) m_curve->setSummaryAddressY( address ); if ( m_curve ) m_curve->setSummaryAddressY( address );
if ( m_curveSet ) m_curveSet->setSummaryAddress( address ); if ( m_curveSet ) m_curveSet->setSummaryAddressAndStatisticsFlag( address );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -2513,7 +2513,7 @@ RimEnsembleCurveSet* RimSummaryPlot::addNewEnsembleCurveY( const RifEclipseSumma
auto* curveSet = new RimEnsembleCurveSet(); auto* curveSet = new RimEnsembleCurveSet();
curveSet->setSummaryCaseCollection( ensemble ); curveSet->setSummaryCaseCollection( ensemble );
curveSet->setSummaryAddress( address ); curveSet->setSummaryAddressAndStatisticsFlag( address );
cvf::Color3f curveColor = cvf::Color3f curveColor =
RimSummaryCurveAppearanceCalculator::computeTintedCurveColorForAddress( curveSet->summaryAddress(), RimSummaryCurveAppearanceCalculator::computeTintedCurveColorForAddress( curveSet->summaryAddress(),

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp
View File

@@ -505,7 +505,7 @@ void RimSummaryPlotFilterTextCurveSetEditor::updateParentPlot()
RimEnsembleCurveSet* curveSet = new RimEnsembleCurveSet(); RimEnsembleCurveSet* curveSet = new RimEnsembleCurveSet();
curveSet->setSummaryCaseCollection( curveDef.ensemble() ); curveSet->setSummaryCaseCollection( curveDef.ensemble() );
curveSet->setSummaryAddress( curveDef.summaryAddress() ); curveSet->setSummaryAddressAndStatisticsFlag( curveDef.summaryAddress() );
parentPlot->ensembleCurveSetCollection()->addCurveSet( curveSet ); parentPlot->ensembleCurveSetCollection()->addCurveSet( curveSet );
} }