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

#5620 Delta Case : Use term delta case for delta ensemble and delta summary

Browse Source
This commit is contained in:
Magne Sjaastad
2020-03-06 23:17:05 +01:00
parent 61ff1eab29
commit 49d74ce0e7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/SummaryPlotCommands/RicNewDerivedEnsembleFeature.cpp
View File

@@ -52,7 +52,7 @@ bool RicNewDerivedEnsembleFeature::showWarningDialogWithQuestion()
msgBox.setIcon( QMessageBox::Question ); msgBox.setIcon( QMessageBox::Question );
msgBox.setWindowTitle( "Ensemble Matching" ); msgBox.setWindowTitle( "Ensemble Matching" );
msgBox.setText( "None of the cases in the ensembles match" ); 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 ); msgBox.setStandardButtons( QMessageBox::Yes | QMessageBox::No );
int ret = msgBox.exec(); int ret = msgBox.exec();
@@ -113,6 +113,6 @@ void RicNewDerivedEnsembleFeature::onActionTriggered( bool isChecked )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewDerivedEnsembleFeature::setupActionLook( QAction* actionToSetup ) void RicNewDerivedEnsembleFeature::setupActionLook( QAction* actionToSetup )
{ {
actionToSetup->setText( "New Derived Ensemble" ); actionToSetup->setText( "New Delta Ensemble" );
actionToSetup->setIcon( QIcon( ":/SummaryEnsemble16x16.png" ) ); actionToSetup->setIcon( QIcon( ":/SummaryEnsemble16x16.png" ) );
} }

2
ApplicationCode/Commands/SummaryPlotCommands/RicNewDerivedSummaryFeature.cpp
View File

@@ -66,6 +66,6 @@ void RicNewDerivedSummaryFeature::onActionTriggered( bool isChecked )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewDerivedSummaryFeature::setupActionLook( QAction* actionToSetup ) void RicNewDerivedSummaryFeature::setupActionLook( QAction* actionToSetup )
{ {
actionToSetup->setText( "New Derived Summary" ); actionToSetup->setText( "New Delta Summary Case" );
// actionToSetup->setIcon( QIcon( ":/SummaryEnsemble16x16.png" ) ); // actionToSetup->setIcon( QIcon( ":/SummaryEnsemble16x16.png" ) );
} }

6
ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp
View File

@@ -39,7 +39,7 @@ CAF_PDM_SOURCE_INIT( RimDerivedEnsembleCaseCollection, "RimDerivedEnsembleCaseCo
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimDerivedEnsembleCaseCollection::RimDerivedEnsembleCaseCollection() RimDerivedEnsembleCaseCollection::RimDerivedEnsembleCaseCollection()
{ {
CAF_PDM_InitObject( "Derived Ensemble", ":/SummaryEnsemble16x16.png", "", "" ); CAF_PDM_InitObject( "Delta Ensemble", ":/SummaryEnsemble16x16.png", "", "" );
CAF_PDM_InitFieldNoDefault( &m_ensemble1, "Ensemble1", "Ensemble 1", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_ensemble1, "Ensemble1", "Ensemble 1", "", "", "" );
m_ensemble1.uiCapability()->setUiTreeChildrenHidden( true ); m_ensemble1.uiCapability()->setUiTreeChildrenHidden( true );
@@ -68,7 +68,7 @@ RimDerivedEnsembleCaseCollection::RimDerivedEnsembleCaseCollection()
m_cases.xmlCapability()->disableIO(); m_cases.xmlCapability()->disableIO();
setNameAsReadOnly(); setNameAsReadOnly();
setName( "Derived Ensemble" ); setName( "Delta Ensemble" );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -249,7 +249,7 @@ void RimDerivedEnsembleCaseCollection::fieldChangedByUi( const caf::PdmFieldHand
bool doUpdateCases = false; bool doUpdateCases = false;
bool doShowDialog = 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; doUpdate = true;
doUpdateCases = true; doUpdateCases = true;