#12282 Assign a postfix to identical ensemble names

magnesj · magnesj · commit d0b3f285fd07 · 2025-03-24T16:05:12.000+01:00
diff --git a/ApplicationLibCode/Application/RiaApplication.cpp b/ApplicationLibCode/Application/RiaApplication.cpp
@@ -778,9 +778,9 @@ bool RiaApplication::loadProject( const QString& projectFileName, ProjectLoadAct
         sumMainCollection->updateAutoShortName();
         for ( auto sumCaseGroup : sumMainCollection->summaryEnsembles() )
         {
-            sumCaseGroup->updateName();
             sumCaseGroup->loadDataAndUpdate();
         }
+        sumMainCollection->updateEnsembleNames();
 
         for ( auto well : oilField->wellPathCollection()->allWellPaths() )
         {
diff --git a/ApplicationLibCode/Application/Tools/RiaEnsembleNameTools.cpp b/ApplicationLibCode/Application/Tools/RiaEnsembleNameTools.cpp
@@ -400,37 +400,6 @@ std::map<QString, std::pair<QString, QString>>
     return mapping;
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RiaEnsembleNameTools::updateAutoNameEnsembles( std::vector<RimSummaryEnsemble*> ensembles )
-{
-    std::set<std::string> key1;
-    std::set<std::string> key2;
-
-    for ( const auto& ensemble : ensembles )
-    {
-        const auto keys = ensemble->nameKeys();
-        key1.insert( keys.first );
-        key2.insert( keys.second );
-    }
-
-    bool useKey1 = key1.size() > 1;
-    bool useKey2 = key2.size() > 1;
-
-    if ( !useKey1 && !useKey2 )
-    {
-        useKey2 = true;
-    }
-
-    for ( auto ensemble : ensembles )
-    {
-        ensemble->setUsePathKey1( useKey1 );
-        ensemble->setUsePathKey2( useKey2 );
-        ensemble->updateName();
-    }
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/Application/Tools/RiaEnsembleNameTools.h b/ApplicationLibCode/Application/Tools/RiaEnsembleNameTools.h
@@ -59,8 +59,6 @@ class RiaEnsembleNameTools
                                                                                          const QStringList&   fileNames,
                                                                                          const std::vector<QStringList>& fileNameComponents );
 
-    static void updateAutoNameEnsembles( std::vector<RimSummaryEnsemble*> ensembles );
-
     static QString uniqueShortNameForEnsembleCase( RimSummaryCase* summaryCase );
     static QString uniqueShortNameForSummaryCase( RimSummaryCase* summaryCase );
 
diff --git a/ApplicationLibCode/Application/Tools/Summary/RiaSummaryTools.cpp b/ApplicationLibCode/Application/Tools/Summary/RiaSummaryTools.cpp
@@ -442,3 +442,14 @@ time_t RiaSummaryTools::calculateTimeThreshold( const time_t& minimum, const tim
 
     return timeThreshold;
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RiaSummaryTools::updateSummaryEnsembleNames()
+{
+    if ( auto sumCaseMainColl = RiaSummaryTools::summaryCaseMainCollection() )
+    {
+        sumCaseMainColl->updateEnsembleNames();
+    }
+}
diff --git a/ApplicationLibCode/Application/Tools/Summary/RiaSummaryTools.h b/ApplicationLibCode/Application/Tools/Summary/RiaSummaryTools.h
@@ -99,6 +99,8 @@ class RiaSummaryTools
 
     static time_t calculateTimeThreshold( const time_t& minimum, const time_t& maximum );
 
+    static void updateSummaryEnsembleNames();
+
 private:
     static void updateRequiredCalculatedCurves( RimSummaryCase* sourceSummaryCase );
     static bool isCalculationRequired( const RimUserDefinedCalculation* summaryCalculation, const RimSummaryCase* summaryCase );
diff --git a/ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp b/ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp
@@ -102,7 +102,7 @@ void RicImportEnsembleFeature::onActionTriggered( bool isChecked )
                 importSingleEnsemble( fileNames, useEnsembleNameDialog, ensembleGroupingMode, fileType, groupName );
             }
 
-            RiaEnsembleNameTools::updateAutoNameEnsembles( RiaApplication::instance()->project()->summaryGroups() );
+            RiaSummaryTools::updateSummaryEnsembleNames();
         }
     }
 }
@@ -137,6 +137,8 @@ RimSummaryEnsemble* RicImportEnsembleFeature::importSingleEnsemble( const QStrin
             summaryCase->updateAutoShortName();
         }
 
+        RiaSummaryTools::updateSummaryEnsembleNames();
+
         RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( {}, { ensemble } );
     }
 
diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicReplaceSummaryEnsembleFeature.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicReplaceSummaryEnsembleFeature.cpp
@@ -75,10 +75,9 @@ void RicReplaceSummaryEnsembleFeature::onActionTriggered( bool isChecked )
         summaryCase->updateAutoShortName();
     }
 
-    summaryEnsemble->updateName();
-
     if ( auto sumCaseMainColl = RiaSummaryTools::summaryCaseMainCollection() )
     {
+        sumCaseMainColl->updateEnsembleNames();
         sumCaseMainColl->updateAllRequiredEditors();
     }
 }
diff --git a/ApplicationLibCode/ProjectDataModel/Cloud/RimCloudDataSourceCollection.cpp b/ApplicationLibCode/ProjectDataModel/Cloud/RimCloudDataSourceCollection.cpp
@@ -88,13 +88,13 @@ void RimCloudDataSourceCollection::createEnsemblesFromSelectedDataSources( const
         RimSummaryEnsembleSumo* ensemble = new RimSummaryEnsembleSumo();
         ensemble->setUsePathKey1( true );
         ensemble->setSumoDataSource( dataSource );
-        ensemble->updateName();
         RiaSummaryTools::summaryCaseMainCollection()->addEnsemble( ensemble );
         ensemble->loadDataAndUpdate();
 
         RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( {}, { ensemble } );
     }
 
+    RiaSummaryTools::updateSummaryEnsembleNames();
     RiaSummaryTools::summaryCaseMainCollection()->updateAllRequiredEditors();
 }
 
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimDeltaSummaryEnsemble.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimDeltaSummaryEnsemble.cpp
@@ -18,16 +18,18 @@
 
 #include "RiaQDateTimeTools.h"
 
+#include "Summary/RiaSummaryTools.h"
+
 #include "SummaryPlotCommands/RicNewDerivedEnsembleFeature.h"
 
+#include "RifSummaryReaderInterface.h"
+
 #include "RimDeltaSummaryCase.h"
 #include "RimDeltaSummaryEnsemble.h"
 #include "RimProject.h"
 #include "RimSummaryCaseMainCollection.h"
 #include "RimSummaryEnsemble.h"
 
-#include "RifSummaryReaderInterface.h"
-
 #include "cafPdmUiCheckBoxEditor.h"
 #include "cafPdmUiPushButtonEditor.h"
 #include "cafPdmUiTreeSelectionEditor.h"
@@ -107,7 +109,8 @@ RimDeltaSummaryEnsemble::~RimDeltaSummaryEnsemble()
 void RimDeltaSummaryEnsemble::setEnsemble1( RimSummaryEnsemble* ensemble )
 {
     m_ensemble1 = ensemble;
-    updateName();
+
+    RiaSummaryTools::updateSummaryEnsembleNames();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -116,7 +119,8 @@ void RimDeltaSummaryEnsemble::setEnsemble1( RimSummaryEnsemble* ensemble )
 void RimDeltaSummaryEnsemble::setEnsemble2( RimSummaryEnsemble* ensemble )
 {
     m_ensemble2 = ensemble;
-    updateName();
+
+    RiaSummaryTools::updateSummaryEnsembleNames();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -271,7 +275,6 @@ void RimDeltaSummaryEnsemble::onLoadDataAndUpdate()
 {
     updateDerivedEnsembleCases();
     updateReferringCurveSets();
-    updateName();
     updateConnectedEditors();
 }
 
@@ -349,7 +352,6 @@ void RimDeltaSummaryEnsemble::defineUiOrdering( QString uiConfigName, caf::PdmUi
 
     uiOrdering.skipRemainingFields( true );
 
-    updateName();
     if ( !isValid() ) m_caseCount = "";
 }
 
@@ -389,7 +391,7 @@ void RimDeltaSummaryEnsemble::fieldChangedByUi( const caf::PdmFieldHandle* chang
 
     if ( doUpdate )
     {
-        updateName();
+        RiaSummaryTools::updateSummaryEnsembleNames();
 
         if ( doUpdateCases )
         {
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
@@ -277,7 +277,7 @@ void RimSummaryCaseMainCollection::removeEnsemble( RimSummaryEnsemble* ensemble
 {
     m_ensembles.removeChild( ensemble );
 
-    RiaEnsembleNameTools::updateAutoNameEnsembles( summaryEnsembles() );
+    RiaSummaryTools::updateSummaryEnsembleNames();
 
     dataSourceHasChanged.send();
 }
@@ -545,7 +545,7 @@ RimSummaryEnsemble* RimSummaryCaseMainCollection::defaultAllocator()
 //--------------------------------------------------------------------------------------------------
 void RimSummaryCaseMainCollection::onCaseNameChanged( const SignalEmitter* emitter )
 {
-    RiaEnsembleNameTools::updateAutoNameEnsembles( summaryEnsembles() );
+    RiaSummaryTools::updateSummaryEnsembleNames();
 
     RimSummaryMultiPlotCollection* summaryPlotColl = RiaSummaryTools::summaryMultiPlotCollection();
     summaryPlotColl->updateSummaryNameHasChanged();
@@ -721,3 +721,38 @@ void RimSummaryCaseMainCollection::onProjectBeingSaved()
         }
     }
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimSummaryCaseMainCollection::updateEnsembleNames()
+{
+    std::set<std::string> key1;
+    std::set<std::string> key2;
+
+    auto ensembles = summaryEnsembles();
+
+    for ( const auto& ensemble : ensembles )
+    {
+        const auto keys = ensemble->nameKeys();
+        key1.insert( keys.first );
+        key2.insert( keys.second );
+    }
+
+    bool useKey1 = key1.size() > 1;
+    bool useKey2 = key2.size() > 1;
+
+    if ( !useKey1 && !useKey2 )
+    {
+        useKey2 = true;
+    }
+
+    std::set<QString> existingNames;
+    for ( auto ensemble : ensembles )
+    {
+        ensemble->setUsePathKey1( useKey1 );
+        ensemble->setUsePathKey2( useKey2 );
+        ensemble->updateName( existingNames );
+        existingNames.insert( ensemble->name() );
+    }
+}
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h
@@ -76,6 +76,8 @@ class RimSummaryCaseMainCollection : public caf::PdmObject
     void updateAutoShortName();
     void onProjectBeingSaved();
 
+    void updateEnsembleNames();
+
 private:
     void initAfterRead() override;
 
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsemble.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsemble.cpp
@@ -26,6 +26,7 @@
 #include "RiaStdStringTools.h"
 #include "RiaTextStringTools.h"
 #include "Summary/RiaSummaryAddressAnalyzer.h"
+#include "Summary/RiaSummaryTools.h"
 
 #include "RifSummaryReaderInterface.h"
 
@@ -236,7 +237,7 @@ QString RimSummaryEnsemble::name() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryEnsemble::updateName()
+void RimSummaryEnsemble::updateName( const std::set<QString>& existingEnsembleNames )
 {
     const auto [key1, key2] = nameKeys();
 
@@ -270,6 +271,19 @@ void RimSummaryEnsemble::updateName()
         {
             candidateName = candidateName.left( candidateName.length() - 1 );
         }
+
+        // Avoid identical ensemble names by appending a number
+        if ( existingEnsembleNames.contains( candidateName ) )
+        {
+            int     counter = 1;
+            QString uniqueName;
+            do
+            {
+                uniqueName = QString( "%1 (subset-%2)" ).arg( candidateName ).arg( counter++ );
+            } while ( existingEnsembleNames.contains( uniqueName ) );
+
+            candidateName = uniqueName;
+        }
     }
 
     if ( m_name == candidateName ) return;
@@ -889,7 +903,7 @@ void RimSummaryEnsemble::fieldChangedByUi( const caf::PdmFieldHandle* changedFie
     }
     if ( changedField == &m_autoName || changedField == &m_nameTemplateString )
     {
-        updateName();
+        RiaSummaryTools::updateSummaryEnsembleNames();
     }
 }
 
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsemble.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsemble.h
@@ -66,7 +66,7 @@ class RimSummaryEnsemble : public caf::PdmObject
     QString name() const;
 
     void                                        setNameTemplate( const QString& name );
-    void                                        updateName();
+    void                                        updateName( const std::set<QString>& existingEnsembleNames );
     void                                        setUsePathKey1( bool useKey1 );
     void                                        setUsePathKey2( bool useKey2 );
     virtual std::pair<std::string, std::string> nameKeys() const;
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/Sumo/RimSummaryEnsembleSumo.cpp b/ApplicationLibCode/ProjectDataModel/Summary/Sumo/RimSummaryEnsembleSumo.cpp
@@ -488,7 +488,7 @@ void RimSummaryEnsembleSumo::fieldChangedByUi( const caf::PdmFieldHandle* change
     {
         clearCachedData();
         updateResultAddresses();
-        updateName();
+        RiaSummaryTools::updateSummaryEnsembleNames();
         buildMetaData();
 
         updateConnectedEditors();
@@ -555,7 +555,7 @@ void RimSummaryEnsembleSumo::onLoadDataAndUpdate()
         }
     }
 
-    updateName();
+    RiaSummaryTools::updateSummaryEnsembleNames();
     updateResultAddresses();
 
     buildMetaData();

Original file line number	Diff line number	Diff line change
`@@ -778,9 +778,9 @@ bool RiaApplication::loadProject( const QString& projectFileName, ProjectLoadAct`
`778`	`778`	`sumMainCollection->updateAutoShortName();`
`779`	`779`	`for ( auto sumCaseGroup : sumMainCollection->summaryEnsembles() )`
`780`	`780`	`{`
`781`		`- sumCaseGroup->updateName();`
`782`	`781`	`sumCaseGroup->loadDataAndUpdate();`
`783`	`782`	`}`
	`783`	`+ sumMainCollection->updateEnsembleNames();`
`784`	`784`
`785`	`785`	`for ( auto well : oilField->wellPathCollection()->allWellPaths() )`
`786`	`786`	`{`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ void RicImportEnsembleFeature::onActionTriggered( bool isChecked )`
`102`	`102`	`importSingleEnsemble( fileNames, useEnsembleNameDialog, ensembleGroupingMode, fileType, groupName );`
`103`	`103`	`}`
`104`	`104`
`105`		`- RiaEnsembleNameTools::updateAutoNameEnsembles( RiaApplication::instance()->project()->summaryGroups() );`
	`105`	`+ RiaSummaryTools::updateSummaryEnsembleNames();`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`
`@@ -137,6 +137,8 @@ RimSummaryEnsemble* RicImportEnsembleFeature::importSingleEnsemble( const QStrin`
`137`	`137`	`summaryCase->updateAutoShortName();`
`138`	`138`	`}`
`139`	`139`
	`140`	`+ RiaSummaryTools::updateSummaryEnsembleNames();`
	`141`	`+`
`140`	`142`	`RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( {}, { ensemble } );`
`141`	`143`	`}`
`142`	`144`
Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,9 @@ void RicReplaceSummaryEnsembleFeature::onActionTriggered( bool isChecked )`
`75`	`75`	`summaryCase->updateAutoShortName();`
`76`	`76`	`}`
`77`	`77`
`78`		`- summaryEnsemble->updateName();`
`79`		`-`
`80`	`78`	`if ( auto sumCaseMainColl = RiaSummaryTools::summaryCaseMainCollection() )`
`81`	`79`	`{`
	`80`	`+ sumCaseMainColl->updateEnsembleNames();`
`82`	`81`	`sumCaseMainColl->updateAllRequiredEditors();`
`83`	`82`	`}`
`84`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,13 +88,13 @@ void RimCloudDataSourceCollection::createEnsemblesFromSelectedDataSources( const`
`88`	`88`	`RimSummaryEnsembleSumo* ensemble = new RimSummaryEnsembleSumo();`
`89`	`89`	`ensemble->setUsePathKey1( true );`
`90`	`90`	`ensemble->setSumoDataSource( dataSource );`
`91`		`- ensemble->updateName();`
`92`	`91`	`RiaSummaryTools::summaryCaseMainCollection()->addEnsemble( ensemble );`
`93`	`92`	`ensemble->loadDataAndUpdate();`
`94`	`93`
`95`	`94`	`RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( {}, { ensemble } );`
`96`	`95`	`}`
`97`	`96`
	`97`	`+ RiaSummaryTools::updateSummaryEnsembleNames();`
`98`	`98`	`RiaSummaryTools::summaryCaseMainCollection()->updateAllRequiredEditors();`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -18,16 +18,18 @@`
`18`	`18`
`19`	`19`	`#include "RiaQDateTimeTools.h"`
`20`	`20`
	`21`	`+#include "Summary/RiaSummaryTools.h"`
	`22`	`+`
`21`	`23`	`#include "SummaryPlotCommands/RicNewDerivedEnsembleFeature.h"`
`22`	`24`
	`25`	`+#include "RifSummaryReaderInterface.h"`
	`26`	`+`
`23`	`27`	`#include "RimDeltaSummaryCase.h"`
`24`	`28`	`#include "RimDeltaSummaryEnsemble.h"`
`25`	`29`	`#include "RimProject.h"`
`26`	`30`	`#include "RimSummaryCaseMainCollection.h"`
`27`	`31`	`#include "RimSummaryEnsemble.h"`
`28`	`32`
`29`		`-#include "RifSummaryReaderInterface.h"`
`30`		`-`
`31`	`33`	`#include "cafPdmUiCheckBoxEditor.h"`
`32`	`34`	`#include "cafPdmUiPushButtonEditor.h"`
`33`	`35`	`#include "cafPdmUiTreeSelectionEditor.h"`
`@@ -107,7 +109,8 @@ RimDeltaSummaryEnsemble::~RimDeltaSummaryEnsemble()`
`107`	`109`	`void RimDeltaSummaryEnsemble::setEnsemble1( RimSummaryEnsemble* ensemble )`
`108`	`110`	`{`
`109`	`111`	`m_ensemble1 = ensemble;`
`110`		`- updateName();`
	`112`	`+`
	`113`	`+ RiaSummaryTools::updateSummaryEnsembleNames();`
`111`	`114`	`}`
`112`	`115`
`113`	`116`	`//--------------------------------------------------------------------------------------------------`
`@@ -116,7 +119,8 @@ void RimDeltaSummaryEnsemble::setEnsemble1( RimSummaryEnsemble* ensemble )`
`116`	`119`	`void RimDeltaSummaryEnsemble::setEnsemble2( RimSummaryEnsemble* ensemble )`
`117`	`120`	`{`
`118`	`121`	`m_ensemble2 = ensemble;`
`119`		`- updateName();`
	`122`	`+`
	`123`	`+ RiaSummaryTools::updateSummaryEnsembleNames();`
`120`	`124`	`}`
`121`	`125`
`122`	`126`	`//--------------------------------------------------------------------------------------------------`
`@@ -271,7 +275,6 @@ void RimDeltaSummaryEnsemble::onLoadDataAndUpdate()`
`271`	`275`	`{`
`272`	`276`	`updateDerivedEnsembleCases();`
`273`	`277`	`updateReferringCurveSets();`
`274`		`- updateName();`
`275`	`278`	`updateConnectedEditors();`
`276`	`279`	`}`
`277`	`280`
`@@ -349,7 +352,6 @@ void RimDeltaSummaryEnsemble::defineUiOrdering( QString uiConfigName, caf::PdmUi`
`349`	`352`
`350`	`353`	`uiOrdering.skipRemainingFields( true );`
`351`	`354`
`352`		`- updateName();`
`353`	`355`	`if ( !isValid() ) m_caseCount = "";`
`354`	`356`	`}`
`355`	`357`
`@@ -389,7 +391,7 @@ void RimDeltaSummaryEnsemble::fieldChangedByUi( const caf::PdmFieldHandle* chang`
`389`	`391`
`390`	`392`	`if ( doUpdate )`
`391`	`393`	`{`
`392`		`- updateName();`
	`394`	`+ RiaSummaryTools::updateSummaryEnsembleNames();`
`393`	`395`
`394`	`396`	`if ( doUpdateCases )`
`395`	`397`	`{`