diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake index b83d9968a3..3e9e80ef74 100644 --- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake @@ -85,6 +85,7 @@ ${CEE_CURRENT_LIST_DIR}RimEclipseInputCaseOpm.h ${CEE_CURRENT_LIST_DIR}RimIntersectionBox.h ${CEE_CURRENT_LIST_DIR}RimMultiSnapshotDefinition.h ${CEE_CURRENT_LIST_DIR}RimFractureDefinition.h +${CEE_CURRENT_LIST_DIR}RimFractureDefinitionCollection.h ${CEE_CURRENT_LIST_DIR}RimFracture.h ${CEE_CURRENT_LIST_DIR}RimFractureCollection.h ) @@ -170,6 +171,7 @@ ${CEE_CURRENT_LIST_DIR}RimEclipseInputCaseOpm.cpp ${CEE_CURRENT_LIST_DIR}RimIntersectionBox.cpp ${CEE_CURRENT_LIST_DIR}RimMultiSnapshotDefinition.cpp ${CEE_CURRENT_LIST_DIR}RimFractureDefinition.cpp +${CEE_CURRENT_LIST_DIR}RimFractureDefinitionCollection.cpp ${CEE_CURRENT_LIST_DIR}RimFracture.cpp ${CEE_CURRENT_LIST_DIR}RimFractureCollection.cpp ) diff --git a/ApplicationCode/ProjectDataModel/RimFractureCollection.cpp b/ApplicationCode/ProjectDataModel/RimFractureCollection.cpp index 58983e922c..f1e84ea626 100644 --- a/ApplicationCode/ProjectDataModel/RimFractureCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFractureCollection.cpp @@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimFractureCollection, "FractureCollection"); //-------------------------------------------------------------------------------------------------- RimFractureCollection::RimFractureCollection(void) { - CAF_PDM_InitObject("Fracture collection", "", "", ""); + CAF_PDM_InitObject("Fracture Collection", "", "", ""); CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", ""); @@ -47,23 +47,3 @@ RimFractureCollection::~RimFractureCollection() fractures.deleteAllChildObjects(); } - - -//TODO: Trenger vi en sånn for å legge til fractures??? -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -// void RimIntersectionCollection::appendIntersection(RimIntersection* intersection) -// { -// m_intersections.push_back(intersection); -// -// updateConnectedEditors(); -// RiuMainWindow::instance()->selectAsCurrentItem(intersection); -// -// RimView* rimView = NULL; -// firstAncestorOrThisOfType(rimView); -// if (rimView) -// { -// rimView->scheduleCreateDisplayModelAndRedraw(); -// } -// } diff --git a/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp b/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp new file mode 100644 index 0000000000..a74700bd8a --- /dev/null +++ b/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp @@ -0,0 +1,50 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// 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 +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RimFractureDefinitionCollection.h" + +#include "RimFractureDefinition.h" +#include "cafPdmObject.h" + + + + +CAF_PDM_SOURCE_INIT(RimFractureDefinitionCollection, "FractureDefinitionCollection"); + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RimFractureDefinitionCollection::RimFractureDefinitionCollection(void) +{ + CAF_PDM_InitObject("Fracture Definition Collection", "", "", ""); + + CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", ""); + + CAF_PDM_InitFieldNoDefault(&fractureDefinitions, "Fracture Definitions", "", "", "", ""); + +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RimFractureDefinitionCollection::~RimFractureDefinitionCollection() +{ + fractureDefinitions.deleteAllChildObjects(); + +} + diff --git a/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.h b/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.h new file mode 100644 index 0000000000..e303555123 --- /dev/null +++ b/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.h @@ -0,0 +1,42 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// 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 +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafPdmField.h" +#include "cafPdmObject.h" +#include "cafPdmChildArrayField.h" + +class RimFractureDefinition; + +//================================================================================================== +/// +/// +//================================================================================================== +class RimFractureDefinitionCollection : public caf::PdmObject +{ + CAF_PDM_HEADER_INIT; + +public: + RimFractureDefinitionCollection(void); + virtual ~RimFractureDefinitionCollection(void); + + caf::PdmChildArrayField fractureDefinitions; + caf::PdmField isActive; + +}; diff --git a/ApplicationCode/ProjectDataModel/RimOilField.cpp b/ApplicationCode/ProjectDataModel/RimOilField.cpp index 307fab7cca..e0117f90d5 100644 --- a/ApplicationCode/ProjectDataModel/RimOilField.cpp +++ b/ApplicationCode/ProjectDataModel/RimOilField.cpp @@ -22,7 +22,7 @@ #include "RimEclipseCaseCollection.h" #include "RimFormationNamesCollection.h" -#include "RimFractureDefinition.h" +#include "RimFractureDefinitionCollection.h" #include "RimFractureCollection.h" #include "RimGeoMechModels.h" #include "RimSummaryCaseCollection.h" @@ -40,12 +40,12 @@ RimOilField::RimOilField(void) CAF_PDM_InitFieldNoDefault(&analysisModels, "AnalysisModels", "Grid Models", ":/GridModels.png", "", ""); CAF_PDM_InitFieldNoDefault(&geoMechModels, "GeoMechModels", "Geo Mech Models", ":/GridModels.png", "", ""); CAF_PDM_InitFieldNoDefault(&wellPathCollection, "WellPathCollection", "Well Paths", ":/WellCollection.png", "", ""); - CAF_PDM_InitFieldNoDefault(&fractureDefinition, "FractureDefinition", "Defenition of fractures", "", "", ""); + CAF_PDM_InitFieldNoDefault(&fractureDefinitionCollection, "FractureDefinitionCollection", "Defenition of fractures", "", "", ""); CAF_PDM_InitFieldNoDefault(&summaryCaseCollection,"SummaryCaseCollection","Summary Cases",":/GridModels.png","",""); CAF_PDM_InitFieldNoDefault(&fractureCollection, "FractureCollection", "Fractures", "", "", ""); CAF_PDM_InitFieldNoDefault(&formationNamesCollection,"FormationNamesCollection","Formations","","",""); - fractureDefinition = new RimFractureDefinition(); + fractureDefinitionCollection = new RimFractureDefinitionCollection(); fractureCollection = new RimFractureCollection(); analysisModels = new RimEclipseCaseCollection(); wellPathCollection = new RimWellPathCollection(); @@ -58,7 +58,7 @@ RimOilField::RimOilField(void) RimOilField::~RimOilField(void) { if (wellPathCollection()) delete wellPathCollection(); - if (fractureDefinition()) delete fractureDefinition(); + if (fractureDefinitionCollection()) delete fractureDefinitionCollection(); if (fractureCollection()) delete fractureCollection(); if (geoMechModels()) delete geoMechModels(); if (analysisModels()) delete analysisModels(); diff --git a/ApplicationCode/ProjectDataModel/RimOilField.h b/ApplicationCode/ProjectDataModel/RimOilField.h index e81b77a262..d4118691c6 100644 --- a/ApplicationCode/ProjectDataModel/RimOilField.h +++ b/ApplicationCode/ProjectDataModel/RimOilField.h @@ -28,7 +28,7 @@ class RimEclipseCaseCollection; class RimGeoMechModels; class RimWellPathCollection; -class RimFractureDefinition; +class RimFractureDefinitionCollection; class RimFractureCollection; class RimSummaryCaseCollection; class RimFormationNamesCollection; @@ -48,7 +48,7 @@ public: caf::PdmChildField analysisModels; caf::PdmChildField geoMechModels; caf::PdmChildField wellPathCollection; - caf::PdmChildField fractureDefinition; + caf::PdmChildField fractureDefinitionCollection; caf::PdmChildField fractureCollection; caf::PdmChildField summaryCaseCollection; caf::PdmChildField formationNamesCollection; diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 51693bc985..93f3d3f224 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -33,7 +33,7 @@ #include "RimEclipseCase.h" #include "RimEclipseCaseCollection.h" #include "RimFormationNamesCollection.h" -#include "RimFractureDefinition.h" +#include "RimFractureDefinitionCollection.h" #include "RimFractureCollection.h" #include "RimGeoMechCase.h" #include "RimGeoMechModels.h" @@ -824,12 +824,12 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS RimOilField* oilField = activeOilField(); if (oilField) { - if (oilField->analysisModels()) uiTreeOrdering.add(oilField->analysisModels()); - if (oilField->geoMechModels()) uiTreeOrdering.add(oilField->geoMechModels()); - if (oilField->wellPathCollection()) uiTreeOrdering.add(oilField->wellPathCollection()); - if (oilField->fractureDefinition()) uiTreeOrdering.add(oilField->fractureDefinition()); - if (oilField->fractureCollection()) uiTreeOrdering.add(oilField->fractureCollection()); - if (oilField->formationNamesCollection()) uiTreeOrdering.add(oilField->formationNamesCollection()); + if (oilField->analysisModels()) uiTreeOrdering.add(oilField->analysisModels()); + if (oilField->geoMechModels()) uiTreeOrdering.add(oilField->geoMechModels()); + if (oilField->wellPathCollection()) uiTreeOrdering.add(oilField->wellPathCollection()); + if (oilField->fractureDefinitionCollection()) uiTreeOrdering.add(oilField->fractureDefinitionCollection()); + if (oilField->fractureCollection()) uiTreeOrdering.add(oilField->fractureCollection()); + if (oilField->formationNamesCollection()) uiTreeOrdering.add(oilField->formationNamesCollection()); } uiTreeOrdering.add(scriptCollection());