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

#4317 Add default ellipse fracture template

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-04-16 13:30:03 +02:00
parent a8bcfefca2
commit 4439f7609b
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/Commands/FractureCommands/RicNewEllipseFractureTemplateFeature.cpp
View File

@ -81,14 +81,7 @@ RimEllipseFractureTemplate* RicNewEllipseFractureTemplateFeature::createNewTempl
if (fracDefColl) if (fracDefColl)
{ {
RimEllipseFractureTemplate* ellipseFractureTemplate = new RimEllipseFractureTemplate(); return fracDefColl->addDefaultEllipseTemplate();
fracDefColl->addFractureTemplate(ellipseFractureTemplate);
ellipseFractureTemplate->setName("Ellipse Fracture Template");
ellipseFractureTemplate->setUnitSystem(fracDefColl->defaultUnitSystemType());
ellipseFractureTemplate->setDefaultValuesFromUnit();
return ellipseFractureTemplate;
} }
return nullptr; return nullptr;
} }

2
ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp
View File

@ -36,7 +36,7 @@ RimCompletionTemplateCollection::RimCompletionTemplateCollection()
CAF_PDM_InitFieldNoDefault(&m_fractureTemplates, "FractureTemplates", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_fractureTemplates, "FractureTemplates", "", "", "", "");
m_fractureTemplates = new RimFractureTemplateCollection; m_fractureTemplates = new RimFractureTemplateCollection;
m_fractureTemplates->addDefaultEllipseTemplate();
CAF_PDM_InitFieldNoDefault(&m_valveTemplates, "ValveTemplates", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_valveTemplates, "ValveTemplates", "", "", "", "");
m_valveTemplates = new RimValveTemplateCollection; m_valveTemplates = new RimValveTemplateCollection;
} }

16
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
View File

@ -99,6 +99,22 @@ std::vector<RimFractureTemplate*> RimFractureTemplateCollection::fractureTemplat
return templates; return templates;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEllipseFractureTemplate* RimFractureTemplateCollection::addDefaultEllipseTemplate()
{
RimEllipseFractureTemplate* ellipseFractureTemplate = new RimEllipseFractureTemplate();
addFractureTemplate(ellipseFractureTemplate);
ellipseFractureTemplate->setName("Ellipse Fracture Template");
ellipseFractureTemplate->setUnitSystem(defaultUnitSystemType());
ellipseFractureTemplate->setDefaultValuesFromUnit();
return ellipseFractureTemplate;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h
View File

@ -24,6 +24,7 @@
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafPdmChildArrayField.h" #include "cafPdmChildArrayField.h"
class RimEllipseFractureTemplate;
class RimFractureTemplate; class RimFractureTemplate;
//================================================================================================== //==================================================================================================
@ -40,6 +41,7 @@ public:
RimFractureTemplate* fractureTemplate(int id) const; RimFractureTemplate* fractureTemplate(int id) const;
std::vector<RimFractureTemplate*> fractureTemplates() const; std::vector<RimFractureTemplate*> fractureTemplates() const;
RimEllipseFractureTemplate* addDefaultEllipseTemplate();
void addFractureTemplate(RimFractureTemplate* templ); void addFractureTemplate(RimFractureTemplate* templ);
RiaEclipseUnitTools::UnitSystemType defaultUnitSystemType() const; RiaEclipseUnitTools::UnitSystemType defaultUnitSystemType() const;