OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Major modularization adjustments

Browse Source 
Use uiField() when issuing setUi....() commands
Use PdmChildArrayField instead of PdmPointersFielc
Use PdmChildField instead of PdmField to pdm pointer objects
Use PdmChildArrayField instead of PdmField< std::list< caf::PdmPointer<
type > > >
Use PdmObjectHandle instead of PdmObject
Replaced parentFields(std::vector)  with parentField()
Use PdmUiPropertyViewDialog instead of PdmUiPropertyDialog
This commit is contained in:
Magne Sjaastad
2015-07-31 18:58:23 +02:00
parent d56cde087f
commit 737936d846
85 changed files with 710 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/ProjectDataModel/RimProject.h
View File

@@ -20,18 +20,19 @@
#pragma once
#include "cafPdmChildField.h"
#include "cafPdmDocument.h"
class RimOilField;
class RimEclipseCase;
class RimCase;
class RigGridManager;
class RimScriptCollection;
class RimIdenticalGridCaseGroup;
class RigMainGrid;
class RigCaseData;
class RimWellPathImport;
class RigGridManager;
class RigMainGrid;
class RimCase;
class RimCommandObject;
class RimEclipseCase;
class RimIdenticalGridCaseGroup;
class RimOilField;
class RimScriptCollection;
class RimWellPathImport;
//==================================================================================================
///
@@ -45,10 +46,10 @@ public:
RimProject(void);
virtual ~RimProject(void);
caf::PdmPointersField<RimOilField*> oilFields;
caf::PdmField<RimScriptCollection*> scriptCollection;
caf::PdmField<RimWellPathImport*> wellPathImport;
caf::PdmPointersField<RimCommandObject*> commandObjects;
caf::PdmChildArrayField<RimOilField*> oilFields;
caf::PdmChildField<RimScriptCollection*> scriptCollection;
caf::PdmChildField<RimWellPathImport*> wellPathImport;
caf::PdmChildArrayField<RimCommandObject*> commandObjects;
caf::PdmField<QString> treeViewState;
caf::PdmField<QString> currentModelIndexPath;
@@ -80,7 +81,7 @@ private:
caf::PdmField<int> nextValidCaseId; // Unique case ID within a project, used to identify a case from Octave scripts
caf::PdmField<int> nextValidCaseGroupId; // Unique case group ID within a project, used to identify a case group from Octave scripts
caf::PdmPointersField<RimEclipseCase*> casesObsolete; // obsolete
caf::PdmPointersField<RimIdenticalGridCaseGroup*> caseGroupsObsolete; // obsolete
caf::PdmChildArrayField<RimEclipseCase*> casesObsolete; // obsolete
caf::PdmChildArrayField<RimIdenticalGridCaseGroup*> caseGroupsObsolete; // obsolete
};