#1018 Snapshot : Added RimMultiSnapshotDefinition

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -82,6 +82,7 @@ ${CEE_CURRENT_LIST_DIR}RimGridCollection.h
 ${CEE_CURRENT_LIST_DIR}RimPlotCurve.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseInputCaseOpm.h
 ${CEE_CURRENT_LIST_DIR}RimIntersectionBox.h
+${CEE_CURRENT_LIST_DIR}RimMultiSnapshotDefinition.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -162,6 +163,7 @@ ${CEE_CURRENT_LIST_DIR}RimGridCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimPlotCurve.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseInputCaseOpm.cpp
 ${CEE_CURRENT_LIST_DIR}RimIntersectionBox.cpp
+${CEE_CURRENT_LIST_DIR}RimMultiSnapshotDefinition.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp

@@ -0,0 +1,59 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2016-     Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RimMultiSnapshotDefinition.h"
+
+/*
+#include "RifJsonEncodeDecode.h"
+#include "RimProject.h"
+#include "RimTools.h"
+#include "RimWellLogFile.h"
+#include "RimProject.h"
+#include "RimMainPlotCollection.h"
+#include "RimWellLogPlotCollection.h"
+#include "RivWellPathPartMgr.h"
+
+#include "RiuMainWindow.h"
+
+#include <QDir>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QDateTime>
+*/
+
+CAF_PDM_SOURCE_INIT(RimMultiSnapshotDefinition, "MultiSnapshotDefinition");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimMultiSnapshotDefinition::RimMultiSnapshotDefinition()
+{
+    //CAF_PDM_InitObject("MultiSnapshotDefinition", ":/Well.png", "", "");
+    CAF_PDM_InitObject("MultiSnapshotDefinition", "", "", "");
+
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimMultiSnapshotDefinition::~RimMultiSnapshotDefinition()
+{
+}
+
+

ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.h

@@ -0,0 +1,45 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2016-     Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "cafPdmField.h"
+#include "cafPdmObject.h"
+#include "cafPdmPtrField.h"
+
+class RimCase;
+class RimView;
+
+//==================================================================================================
+///  
+///  
+//==================================================================================================
+class RimMultiSnapshotDefinition : public caf::PdmObject
+{
+    CAF_PDM_HEADER_INIT;
+public:
+    RimMultiSnapshotDefinition();
+    virtual ~RimMultiSnapshotDefinition();
+
+    caf::PdmPtrField<RimCase*>  caseObject;
+    caf::PdmPtrField<RimView*>  viewObject;
+
+    caf::PdmField<int>       timeStepStart;
+    caf::PdmField<int>       timeStepEnd;
+
+};

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -807,10 +807,6 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
                 uiTreeOrdering.add(mainPlotCollection->summaryPlotCollection());
             }
         }
-
-        uiTreeOrdering.setForgetRemainingFields(true);
-
-        return;
     }
     else
     {
@@ -830,8 +826,8 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
         }
 
         uiTreeOrdering.add(scriptCollection());
-
-        uiTreeOrdering.setForgetRemainingFields(true);
     }
+        
+    uiTreeOrdering.setForgetRemainingFields(true);
 }
 

ApplicationCode/ProjectDataModel/RimProject.h

@@ -29,17 +29,19 @@
 class RigCaseData;
 class RigGridManager;
 class RigMainGrid;
+
 class RimCase;
 class RimCommandObject;
 class RimEclipseCase;
 class RimIdenticalGridCaseGroup;
-class RimViewLinker;
-class RimViewLinkerCollection;
 class RimMainPlotCollection;
+class RimMultiSnapshotDefinition;
 class RimOilField;
 class RimScriptCollection;
 class RimSummaryCase;
 class RimView;
+class RimViewLinker;
+class RimViewLinkerCollection;
 class RimWellPathImport;
 
 namespace caf
@@ -70,6 +72,8 @@ public:
     caf::PdmChildField<RimViewLinkerCollection*>        viewLinkerCollection;
     caf::PdmChildArrayField<RimCommandObject*>          commandObjects;
     
+    caf::PdmChildArrayField<RimMultiSnapshotDefinition*> multiSnapshotDefinitions;
+    
     caf::PdmField<QString>                              mainWindowTreeViewState;
     caf::PdmField<QString>                              mainWindowCurrentModelIndexPath;