PdmDocument inherits directly from PdmObject and not PdmObjectGroup

2025-02-25 18:55:39 -06:00 · 2015-08-01 23:04:04 +02:00
parent 453ee2e4ea
commit 92f0d64eaf
10 changed files with 97 additions and 90 deletions
--- a/ApplicationCode/ProjectDataModel/RimCommandObject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCommandObject.cpp
@@ -25,7 +25,7 @@
 #include "RimProject.h"
 #include "RimEclipseStatisticsCase.h"

-#include "cafPdmDocument.h"
+#include "cafPdmObjectGroup.h"
 #include "cafPdmUiPushButtonEditor.h"
 #include "cafPdmUiTextEditor.h"

--- a/ApplicationCode/ProjectDataModel/RimProject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimProject.cpp
@@ -20,23 +20,26 @@

 #include "RimProject.h"

+
 #include "RiaApplication.h"
 #include "RiaVersionInfo.h"
+
 #include "RigCaseData.h"
-#include "RimEclipseCaseCollection.h"
-#include "RimEclipseCase.h"
+
 #include "RimCaseCollection.h"
+#include "RimCommandObject.h"
+#include "RimEclipseCase.h"
+#include "RimEclipseCaseCollection.h"
+#include "RimEclipseView.h"
+#include "RimGeoMechCase.h"
+#include "RimGeoMechModels.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimOilField.h"
-#include "RimEclipseView.h"
 #include "RimScriptCollection.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathImport.h"
-#include "RimCommandObject.h"

 #include <QDir>
-#include "RimGeoMechModels.h"
-#include "RimGeoMechCase.h"

 CAF_PDM_SOURCE_INIT(RimProject, "ResInsightProject");
 //--------------------------------------------------------------------------------------------------
--- a/ApplicationCode/ProjectDataModel/RimProject.h
+++ b/ApplicationCode/ProjectDataModel/RimProject.h
@@ -20,6 +20,7 @@

 #pragma once

+#include "cafPdmChildArrayField.h"
 #include "cafPdmChildField.h"
 #include "cafPdmDocument.h"

--- a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
+++ b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
@@ -22,34 +22,35 @@

 #include "RiaApplication.h"
 #include "RigGridManager.h"
-#include "RimEclipseCaseCollection.h"
-#include "RimEclipseCase.h"
 #include "RimCaseCollection.h"
-#include "RimEclipsePropertyFilterCollection.h"
 #include "RimCellRangeFilterCollection.h"
-#include "RimGeoMechPropertyFilterCollection.h"
-#include "RimGeoMechPropertyFilter.h"
-#include "RimIdenticalGridCaseGroup.h"
+#include "RimEclipseCase.h"
+#include "RimEclipseCaseCollection.h"
 #include "RimEclipseInputCase.h"
 #include "RimEclipseInputProperty.h"
 #include "RimEclipseInputPropertyCollection.h"
+#include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseResultCase.h"
+#include "RimEclipseStatisticsCase.h"
+#include "RimEclipseView.h"
+#include "RimEclipseWellCollection.h"
+#include "RimGeoMechCase.h"
+#include "RimGeoMechPropertyFilter.h"
+#include "RimGeoMechPropertyFilterCollection.h"
+#include "RimGeoMechView.h"
+#include "RimIdenticalGridCaseGroup.h"
 #include "RimMimeData.h"
 #include "RimOilField.h"
 #include "RimProject.h"
-#include "RimEclipseView.h"
-#include "RimEclipseResultCase.h"
 #include "RimScriptCollection.h"
-#include "RimEclipseStatisticsCase.h"
 #include "RimUiTreeView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimWellPathCollection.h"
-#include "RimGeoMechView.h"

+#include "cafPdmObjectGroup.h"
 #include "cvfAssert.h"

 #include <QClipboard>
 #include <QFileSystemWatcher>
-#include "RimGeoMechCase.h"



--- a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
@@ -20,64 +20,65 @@

 //#include "RiaStdInclude.h"

-#include "cafPdmDocument.h"
+#include "RimUiTreeView.h"
+
+
+#include "RiaApplication.h"
+#include "RiaPreferences.h"
+#include "RifEclipseInputFileTools.h"
+#include "RigCaseCellResultsData.h"
+#include "RigSingleWellResultsData.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimBinaryExportSettings.h"
+#include "RimCalcScript.h"
+#include "RimCaseCollection.h"
+#include "RimCellEdgeColors.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimEclipseCaseCollection.h"
+#include "RimEclipseCellColors.h"
+#include "RimEclipseInputCase.h"
+#include "RimEclipseInputProperty.h"
+#include "RimEclipseInputPropertyCollection.h"
+#include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseResultCase.h"
+#include "RimEclipseStatisticsCase.h"
+#include "RimEclipseStatisticsCaseCollection.h"
+#include "RimEclipseView.h"
+#include "RimEclipseWell.h"
+#include "RimEclipseWellCollection.h"
+#include "RimExportInputPropertySettings.h"
+#include "RimGeoMechCase.h"
+#include "RimGeoMechPropertyFilter.h"
+#include "RimGeoMechPropertyFilterCollection.h"
+#include "RimGeoMechView.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimMimeData.h"
+#include "RimOilField.h"
+#include "RimProject.h"
+#include "RimReservoirCellResultsStorage.h"
+#include "RimScriptCollection.h"
+#include "RimUiTreeModelPdm.h"
+#include "RimWellPathCollection.h"
+#include "RiuMainWindow.h"
+
 #include "cafPdmFieldCvfColor.h"
 #include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmObjectGroup.h"
+#include "cafPdmUiPropertyViewDialog.h"
+
+#include <QAction>
+#include <QClipboard>
+#include <QContextMenuEvent>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QMenu>
+#include <QMessageBox>
+

 // MODTODO
 //#include "cafPdmUiPropertyDialog.h"

-#include <QAction>
-#include <QMenu>
-#include <QContextMenuEvent>
-#include <QMessageBox>
-#include <QFileInfo>
-#include <QFileDialog>
-#include <QClipboard>
-
-#include "RimUiTreeView.h"
-#include "RimUiTreeModelPdm.h"
-#include "RimEclipseView.h"
-#include "RimCalcScript.h"
-#include "RiaApplication.h"
-#include "RiuMainWindow.h"
-#include "RimEclipseInputPropertyCollection.h"
-#include "RimExportInputPropertySettings.h"
-#include "RiaPreferences.h"
-#include "RifEclipseInputFileTools.h"
-#include "RimEclipseInputCase.h"
-#include "RimBinaryExportSettings.h"
-#include "RigCaseCellResultsData.h"
-#include "RimEclipseStatisticsCase.h"
-#include "RimEclipseResultCase.h"
-#include "RimMimeData.h"
-
-#include "RimCellRangeFilterCollection.h"
-#include "RimEclipsePropertyFilterCollection.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimGeoMechPropertyFilter.h"
-#include "RimGeoMechPropertyFilterCollection.h"
-#include "RimEclipseCellColors.h"
-#include "RimEclipseStatisticsCaseCollection.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimCaseCollection.h"
-#include "RimScriptCollection.h"
-#include "RimEclipseWell.h"
-#include "RimCellEdgeColors.h"
-#include "RimEclipseWellCollection.h"
-#include "RimWellPathCollection.h"
-#include "RimReservoirCellResultsStorage.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimProject.h"
-#include "RimOilField.h"
-#include "RimEclipseCaseCollection.h"
-#include "RimEclipseInputProperty.h"
-#include "RigSingleWellResultsData.h"
-#include "RimGeoMechView.h"
-#include "RimGeoMechCase.h"
-#include "cafPdmUiPropertyViewDialog.h"
-
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------