Move RimEclipseInputPropertyCollection to make it available in RimEclipseResultCase.

Ref #82.

ApplicationCode/ProjectDataModel/RimEclipseCase.cpp

@@ -43,6 +43,7 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipseContourMapView.h"
 #include "RimEclipseContourMapViewCollection.h"
+#include "RimEclipseInputPropertyCollection.h"
 #include "RimEclipsePropertyFilter.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseStatisticsCase.h"
@@ -95,6 +96,10 @@ RimEclipseCase::RimEclipseCase()
     m_contourMapCollection = new RimEclipseContourMapViewCollection;
     m_contourMapCollection.uiCapability()->setUiTreeHidden( true );
 
+    CAF_PDM_InitFieldNoDefault( &m_inputPropertyCollection, "InputPropertyCollection", "", "", "", "" );
+    m_inputPropertyCollection = new RimEclipseInputPropertyCollection;
+    m_inputPropertyCollection->parentField()->uiCapability()->setUiHidden( true );
+
     // Obsolete fields
     CAF_PDM_InitFieldNoDefault( &m_filesContainingFaults_OBSOLETE, "FilesContainingFaults", "", "", "", "" );
     RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_filesContainingFaults_OBSOLETE );
@@ -124,6 +129,7 @@ RimEclipseCase::~RimEclipseCase()
 
     delete m_matrixModelResults();
     delete m_fractureModelResults();
+    delete m_inputPropertyCollection;
 
     RimProject* project = RiaApplication::instance()->project();
     if ( project )
@@ -544,6 +550,8 @@ void RimEclipseCase::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
         uiTreeOrdering.add( &m_contourMapCollection );
     }
 
+    uiTreeOrdering.add( &m_inputPropertyCollection );
+
     uiTreeOrdering.skipRemainingChildren( true );
 }
 
@@ -602,6 +610,14 @@ RimEclipseContourMapViewCollection* RimEclipseCase::contourMapCollection()
     return m_contourMapCollection;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimEclipseInputPropertyCollection* RimEclipseCase::inputPropertyCollection()
+{
+    return m_inputPropertyCollection();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimEclipseCase.h

@@ -48,6 +48,7 @@ class RimEclipseContourMapView;
 class RimEclipseContourMapViewCollection;
 class RimEclipseView;
 class RigVirtualPerforationTransmissibilities;
+class RimEclipseInputPropertyCollection;
 
 //==================================================================================================
 //
@@ -101,6 +102,7 @@ public:
 
     RimCaseCollection*                  parentCaseCollection();
     RimEclipseContourMapViewCollection* contourMapCollection();
+    RimEclipseInputPropertyCollection*  inputPropertyCollection();
 
     QStringList            timeStepStrings() const override;
     QString                timeStepName( int frameIdx ) const override;
@@ -139,6 +141,7 @@ private:
 protected:
     caf::PdmField<bool>                                    m_flipXAxis;
     caf::PdmField<bool>                                    m_flipYAxis;
+    caf::PdmChildField<RimEclipseInputPropertyCollection*> m_inputPropertyCollection;
 
 private:
     caf::PdmField<QString> m_filesContainingFaultsSemColSeparated;

ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp

@@ -42,7 +42,6 @@
 #include "RimReservoirCellResultsStorage.h"
 #include "RimTools.h"
 
-#include "cafPdmUiTreeOrdering.h"
 #include "cafProgressInfo.h"
 
 #include <QDir>
@@ -59,10 +58,6 @@ RimEclipseInputCase::RimEclipseInputCase()
     CAF_PDM_InitField( &m_gridFileName, "GridFileName", QString(), "Case File Name", "", "", "" );
     m_gridFileName.uiCapability()->setUiReadOnly( true );
 
-    CAF_PDM_InitFieldNoDefault( &m_inputPropertyCollection, "InputPropertyCollection", "", "", "", "" );
-    m_inputPropertyCollection = new RimEclipseInputPropertyCollection;
-    m_inputPropertyCollection->parentField()->uiCapability()->setUiHidden( true );
-
     CAF_PDM_InitFieldNoDefault( &m_additionalFiles, "AdditionalFileNamesProxy", "Additional Files", "", "", "" );
     m_additionalFiles.registerGetMethod( this, &RimEclipseInputCase::additionalFiles );
     m_additionalFiles.uiCapability()->setUiReadOnly( true );
@@ -76,10 +71,7 @@ RimEclipseInputCase::RimEclipseInputCase()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimEclipseInputCase::~RimEclipseInputCase()
+RimEclipseInputCase::~RimEclipseInputCase() {}
-{
-    delete m_inputPropertyCollection;
-}
 
 //--------------------------------------------------------------------------------------------------
 /// Open the supplied file set. If no grid data has been read, it will first find the possible
@@ -264,14 +256,6 @@ void RimEclipseInputCase::loadAndSyncronizeInputProperties()
                                                                      filenames );
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-RimEclipseInputPropertyCollection* RimEclipseInputCase::inputPropertyCollection()
-{
-    return m_inputPropertyCollection();
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -334,16 +318,6 @@ void RimEclipseInputCase::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde
     group->add( &m_flipYAxis );
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RimEclipseInputCase::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ )
-{
-    uiTreeOrdering.add( &m_inputPropertyCollection );
-
-    RimEclipseCase::defineUiTreeOrdering( uiTreeOrdering, uiConfigName );
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimEclipseInputCase.h

@@ -48,8 +48,6 @@ public:
     bool openDataFileSet( const QStringList& fileNames );
     void loadAndSyncronizeInputProperties();
 
-    RimEclipseInputPropertyCollection* inputPropertyCollection();
-
     // RimCase overrides
     bool openEclipseGridFile() override;
     void reloadEclipseGridFile() override;
@@ -70,14 +68,12 @@ private:
 
 protected:
     void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
-    void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
 
 private:
     cvf::ref<RifReaderInterface> createMockModel( QString modelName );
 
 private:
     // Fields
-    caf::PdmChildField<RimEclipseInputPropertyCollection*> m_inputPropertyCollection;
     caf::PdmField<QString>                        m_gridFileName;
     caf::PdmProxyValueField<std::vector<QString>> m_additionalFiles;