From 49d74ce0e7e6c6fb4e7bf526093ea9bc61b94d4b Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 6 Mar 2020 23:17:05 +0100 Subject: [PATCH] #5620 Delta Case : Use term delta case for delta ensemble and delta summary --- .../SummaryPlotCommands/RicNewDerivedEnsembleFeature.cpp | 4 ++-- .../SummaryPlotCommands/RicNewDerivedSummaryFeature.cpp | 2 +- .../Summary/RimDerivedEnsembleCaseCollection.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewDerivedEnsembleFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewDerivedEnsembleFeature.cpp index d1808d4ee1..a9ac7346b6 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewDerivedEnsembleFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewDerivedEnsembleFeature.cpp @@ -52,7 +52,7 @@ bool RicNewDerivedEnsembleFeature::showWarningDialogWithQuestion() msgBox.setIcon( QMessageBox::Question ); msgBox.setWindowTitle( "Ensemble Matching" ); msgBox.setText( "None of the cases in the ensembles match" ); - msgBox.setInformativeText( "Do you want to keep the derived ensemble?" ); + msgBox.setInformativeText( "Do you want to keep the delta ensemble?" ); msgBox.setStandardButtons( QMessageBox::Yes | QMessageBox::No ); int ret = msgBox.exec(); @@ -113,6 +113,6 @@ void RicNewDerivedEnsembleFeature::onActionTriggered( bool isChecked ) //-------------------------------------------------------------------------------------------------- void RicNewDerivedEnsembleFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setText( "New Derived Ensemble" ); + actionToSetup->setText( "New Delta Ensemble" ); actionToSetup->setIcon( QIcon( ":/SummaryEnsemble16x16.png" ) ); } diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewDerivedSummaryFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewDerivedSummaryFeature.cpp index d10162a404..50adab2d4a 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewDerivedSummaryFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewDerivedSummaryFeature.cpp @@ -66,6 +66,6 @@ void RicNewDerivedSummaryFeature::onActionTriggered( bool isChecked ) //-------------------------------------------------------------------------------------------------- void RicNewDerivedSummaryFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setText( "New Derived Summary" ); + actionToSetup->setText( "New Delta Summary Case" ); // actionToSetup->setIcon( QIcon( ":/SummaryEnsemble16x16.png" ) ); } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp index 3137f12fcf..4641ce5715 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp @@ -39,7 +39,7 @@ CAF_PDM_SOURCE_INIT( RimDerivedEnsembleCaseCollection, "RimDerivedEnsembleCaseCo //-------------------------------------------------------------------------------------------------- RimDerivedEnsembleCaseCollection::RimDerivedEnsembleCaseCollection() { - CAF_PDM_InitObject( "Derived Ensemble", ":/SummaryEnsemble16x16.png", "", "" ); + CAF_PDM_InitObject( "Delta Ensemble", ":/SummaryEnsemble16x16.png", "", "" ); CAF_PDM_InitFieldNoDefault( &m_ensemble1, "Ensemble1", "Ensemble 1", "", "", "" ); m_ensemble1.uiCapability()->setUiTreeChildrenHidden( true ); @@ -68,7 +68,7 @@ RimDerivedEnsembleCaseCollection::RimDerivedEnsembleCaseCollection() m_cases.xmlCapability()->disableIO(); setNameAsReadOnly(); - setName( "Derived Ensemble" ); + setName( "Delta Ensemble" ); } //-------------------------------------------------------------------------------------------------- @@ -249,7 +249,7 @@ void RimDerivedEnsembleCaseCollection::fieldChangedByUi( const caf::PdmFieldHand bool doUpdateCases = false; bool doShowDialog = false; - if ( changedField == &m_ensemble1 || changedField == &m_ensemble2 || m_matchOnParameters ) + if ( changedField == &m_ensemble1 || changedField == &m_ensemble2 || changedField == &m_matchOnParameters ) { doUpdate = true; doUpdateCases = true;