#5775 Add ensemble id to RimSummaryCaseCollection.

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -68,6 +68,7 @@
 #include "RimScriptCollection.h"
 #include "RimSummaryCalculation.h"
 #include "RimSummaryCalculationCollection.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCaseMainCollection.h"
 #include "RimSummaryCrossPlotCollection.h"
 #include "RimSummaryPlotCollection.h"
@@ -113,6 +114,7 @@ RimProject::RimProject( void )
     , m_nextValidPlotId( 1 )
     , m_nextValidCalculationId( 1 )
     , m_nextValidSummaryCaseId( 1 )
+    , m_nextValidEnsembleId( 1 )
 {
     CAF_PDM_InitScriptableObjectWithNameAndComment( "Project", "", "", "", "Project", "The ResInsight Project" );
 
@@ -256,6 +258,7 @@ void RimProject::close()
     m_nextValidPlotId        = 1;
     m_nextValidCalculationId = 1;
     m_nextValidSummaryCaseId = 1;
+    m_nextValidEnsembleId    = 1;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -503,6 +506,23 @@ void RimProject::assignCaseIdToSummaryCase( RimSummaryCase* summaryCase )
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimProject::assignIdToEnsemble( RimSummaryCaseCollection* summaryCaseCollection )
+{
+    if ( summaryCaseCollection )
+    {
+        std::vector<RimSummaryCaseCollection*> summaryGroups = RimProject::summaryGroups();
+        for ( RimSummaryCaseCollection* s : summaryGroups )
+        {
+            m_nextValidEnsembleId = std::max( m_nextValidEnsembleId, s->ensembleId() + 1 );
+        }
+
+        summaryCaseCollection->setEnsembleId( m_nextValidEnsembleId );
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimProject.h

@@ -124,6 +124,7 @@ public:
     void assignPlotIdToPlotWindow( RimPlotWindow* plotWindow );
     void assignCalculationIdToCalculation( RimSummaryCalculation* calculation );
     void assignCaseIdToSummaryCase( RimSummaryCase* summaryCase );
+    void assignIdToEnsemble( RimSummaryCaseCollection* summaryCaseCollection );
 
     void allCases( std::vector<RimCase*>& cases ) const;
 
@@ -218,6 +219,7 @@ private:
     int m_nextValidPlotId;
     int m_nextValidCalculationId;
     int m_nextValidSummaryCaseId;
+    int m_nextValidEnsembleId;
 
     caf::PdmChildArrayField<RimEclipseCase*>            casesObsolete; // obsolete
     caf::PdmChildArrayField<RimIdenticalGridCaseGroup*> caseGroupsObsolete; // obsolete

ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp

@@ -18,9 +18,11 @@
 
 #include "RimSummaryCaseCollection.h"
 
+#include "RiaApplication.h"
 #include "RiaFieldHandleTools.h"
 
-#include "RifReaderEnsembleStatisticsRft.h"
+#include "RicfCommandObject.h"
+
 #include "RimDerivedEnsembleCaseCollection.h"
 #include "RimEnsembleCurveSet.h"
 #include "RimGridSummaryCase.h"
@@ -28,8 +30,11 @@
 #include "RimSummaryCase.h"
 
 #include "RifReaderEclipseRft.h"
+#include "RifReaderEnsembleStatisticsRft.h"
 #include "RifSummaryReaderInterface.h"
 
+#include "cafPdmFieldIOScriptability.h"
+
 #include <QFileDialog>
 #include <QMessageBox>
 
@@ -157,20 +162,25 @@ QString EnsembleParameter::uiName( const NameParameterPair& paramPair )
 //--------------------------------------------------------------------------------------------------
 RimSummaryCaseCollection::RimSummaryCaseCollection()
 {
-    CAF_PDM_InitObject( "Summary Case Group", ":/SummaryGroup16x16.png", "", "" );
+    CAF_PDM_InitScriptableObject( "Summary Case Group", ":/SummaryGroup16x16.png", "", "" );
 
     CAF_PDM_InitFieldNoDefault( &m_cases, "SummaryCases", "", "", "", "" );
     m_cases.uiCapability()->setUiHidden( true );
 
-    CAF_PDM_InitField( &m_name, "SummaryCollectionName", QString( "Group" ), "Name", "", "", "" );
+    CAF_PDM_InitScriptableFieldWithIO( &m_name, "SummaryCollectionName", QString( "Group" ), "Name", "", "", "" );
 
-    CAF_PDM_InitFieldNoDefault( &m_nameAndItemCount, "NameCount", "Name", "", "", "" );
+    CAF_PDM_InitScriptableFieldWithIONoDefault( &m_nameAndItemCount, "NameCount", "Name", "", "", "" );
     m_nameAndItemCount.registerGetMethod( this, &RimSummaryCaseCollection::nameAndItemCount );
     RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_nameAndItemCount );
 
-    CAF_PDM_InitField( &m_isEnsemble, "IsEnsemble", false, "Is Ensemble", "", "", "" );
+    CAF_PDM_InitScriptableFieldWithIO( &m_isEnsemble, "IsEnsemble", false, "Is Ensemble", "", "", "" );
     m_isEnsemble.uiCapability()->setUiHidden( true );
 
+    CAF_PDM_InitScriptableFieldWithIO( &m_ensembleId, "Id", -1, "Ensemble ID", "", "", "" );
+    m_ensembleId.registerKeywordAlias( "EnsembleId" );
+    m_ensembleId.uiCapability()->setUiReadOnly( true );
+    m_ensembleId.capability<caf::PdmFieldScriptability>()->setIOWriteable( false );
+
     m_statisticsEclipseRftReader = new RifReaderEnsembleStatisticsRft( this );
 
     m_commonAddressCount = 0;
@@ -678,6 +688,12 @@ void RimSummaryCaseCollection::updateIcon()
 //--------------------------------------------------------------------------------------------------
 void RimSummaryCaseCollection::initAfterRead()
 {
+    if ( m_ensembleId() == -1 )
+    {
+        RimProject* project = RiaApplication::instance()->project();
+        project->assignIdToEnsemble( this );
+    }
+
     updateIcon();
 }
 
@@ -700,6 +716,10 @@ void RimSummaryCaseCollection::fieldChangedByUi( const caf::PdmFieldHandle* chan
 void RimSummaryCaseCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
 {
     uiOrdering.add( &m_name );
+    if ( m_isEnsemble() )
+    {
+        uiOrdering.add( &m_ensembleId );
+    }
     uiOrdering.skipRemainingFields( true );
 }
 
@@ -710,3 +730,19 @@ void RimSummaryCaseCollection::setNameAsReadOnly()
 {
     m_name.uiCapability()->setUiReadOnly( true );
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimSummaryCaseCollection::setEnsembleId( int ensembleId )
+{
+    m_ensembleId = ensembleId;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+int RimSummaryCaseCollection::ensembleId() const
+{
+    return m_ensembleId();
+}

ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h

@@ -108,6 +108,8 @@ public:
     std::set<QString>                          wellsWithRftData() const;
     std::set<QDateTime>                        rftTimeStepsForWell( const QString& wellName ) const;
     RifReaderRftInterface*                     rftStatisticsReader();
+    void                                       setEnsembleId( int ensembleId );
+    int                                        ensembleId() const;
 
     EnsembleParameter ensembleParameter( const QString& paramName ) const;
     void              calculateEnsembleParametersIntersectionHash();
@@ -141,6 +143,7 @@ private:
     caf::PdmProxyValueField<QString>         m_nameAndItemCount;
     caf::PdmField<bool>                      m_isEnsemble;
     cvf::ref<RifReaderEnsembleStatisticsRft> m_statisticsEclipseRftReader;
+    caf::PdmField<int>                       m_ensembleId;
 
     size_t m_commonAddressCount; // if different address count among cases, set to 0
 };

ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp

@@ -260,6 +260,12 @@ RimSummaryCaseCollection*
     RimSummaryCaseCollection* summaryCaseCollection = allocator();
     if ( !collectionName.isEmpty() ) summaryCaseCollection->setName( collectionName );
 
+    if ( summaryCaseCollection->ensembleId() == -1 )
+    {
+        RimProject* project = RiaApplication::instance()->project();
+        project->assignIdToEnsemble( summaryCaseCollection );
+    }
+
     for ( RimSummaryCase* summaryCase : summaryCases )
     {
         RimSummaryCaseCollection* currentSummaryCaseCollection = nullptr;