From 92f0d64eafa87e7fbd7d438b8c16f828aa3c7ba9 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Sat, 1 Aug 2015 23:04:04 +0200 Subject: [PATCH] PdmDocument inherits directly from PdmObject and not PdmObjectGroup --- .../ProjectDataModel/RimCommandObject.cpp | 2 +- .../ProjectDataModel/RimProject.cpp | 15 ++- ApplicationCode/ProjectDataModel/RimProject.h | 1 + .../ProjectDataModel/RimUiTreeModelPdm.cpp | 25 +++-- .../ProjectDataModel/RimUiTreeView.cpp | 105 +++++++++--------- .../UserInterface/RiuMainWindow.cpp | 1 + .../RiuWellImportWizard.cpp | 24 ++-- .../cafProjectDataModel/cafPdmDocument.h | 3 +- .../cafPdmUiListViewEditor.cpp | 6 +- .../cafPdmUiTableViewEditor.cpp | 5 +- 10 files changed, 97 insertions(+), 90 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimCommandObject.cpp b/ApplicationCode/ProjectDataModel/RimCommandObject.cpp index 614b1cf082..0f350093fb 100644 --- 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" diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 4dd2084c22..f9413c49b2 100644 --- 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 -#include "RimGeoMechModels.h" -#include "RimGeoMechCase.h" CAF_PDM_SOURCE_INIT(RimProject, "ResInsightProject"); //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimProject.h b/ApplicationCode/ProjectDataModel/RimProject.h index ac0a5e1bdd..6a9a3e8979 100644 --- 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" diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp index 97a631f04a..81dfffd5dc 100644 --- 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 #include -#include "RimGeoMechCase.h" diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp index 88fc504538..a62e3658b9 100644 --- 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 +#include +#include +#include +#include +#include +#include + // MODTODO //#include "cafPdmUiPropertyDialog.h" -#include -#include -#include -#include -#include -#include -#include - -#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" - - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index d4bef04392..e23b45f224 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -59,6 +59,7 @@ #include "cafAboutDialog.h" #include "cafAnimationToolBar.h" #include "cafPdmFieldCvfMat4d.h" +#include "cafPdmObjectGroup.h" // MODTODO //#include "cafPdmUiPropertyDialog.h" diff --git a/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp b/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp index 32df71ab1c..afe2cd4283 100644 --- a/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp +++ b/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp @@ -18,22 +18,22 @@ #include "RiuWellImportWizard.h" +#include "RifJsonEncodeDecode.h" +#include "RimWellPathImport.h" + +#include "cafPdmDocument.h" +#include "cafPdmObjectGroup.h" +#include "cafPdmUiListView.h" +#include "cafPdmUiListViewEditor.h" +#include "cafPdmUiPropertyView.h" +#include "cafPdmUiTreeView.h" +#include "cafPdmUiTreeViewEditor.h" +#include "cafUiTreeModelPdm.h" + #include #include #include -#include "cafPdmUiPropertyView.h" -#include "cafPdmUiTreeView.h" -#include "cafPdmDocument.h" -#include "cafPdmUiListViewEditor.h" -#include "cafPdmUiListView.h" -#include "cafUiTreeModelPdm.h" - -#include "RimWellPathImport.h" - -#include "RifJsonEncodeDecode.h" -#include "cafPdmUiTreeViewEditor.h" - //-------------------------------------------------------------------------------------------------- /// diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h index 7de35d01ee..a6ae77def3 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h @@ -39,7 +39,6 @@ #include "cafPdmField.h" #include "cafPdmObject.h" #include "cafPdmPointer.h" -#include "cafPdmObjectGroup.h" namespace caf { @@ -48,7 +47,7 @@ namespace caf /// The PdmDocument class is the main class to do file based IO, /// and is also supposed to act as the overall container of the objects read. //================================================================================================== -class PdmDocument: public PdmObjectGroup +class PdmDocument: public PdmObject { CAF_PDM_HEADER_INIT; public: diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp index 87dafa5373..de8e5eba0d 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp @@ -37,14 +37,14 @@ #include "cafPdmUiListViewEditor.h" -#include "cafPdmObject.h" #include "cafPdmField.h" +#include "cafPdmObject.h" +#include "cafPdmObjectGroup.h" #include "cafPdmUiEditorHandle.h" -#include "cafPdmDocument.h" -#include #include #include +#include diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp index 9f6e95340c..8e3278e403 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp @@ -37,21 +37,22 @@ #include "cafPdmUiTableViewEditor.h" +#include "cafPdmChildArrayField.h" #include "cafPdmField.h" #include "cafPdmObject.h" #include "cafPdmUiCheckBoxDelegate.h" -#include "cafPdmUiEditorHandle.h" #include "cafPdmUiCommandSystemProxy.h" +#include "cafPdmUiEditorHandle.h" #include "cafPdmUiTableViewDelegate.h" #include "cafPdmUiTableViewModel.h" #include +#include #include #include #include #include #include -#include