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

Merge branch 'dev' into pre-proto

Browse Source
This commit is contained in:
Magne Sjaastad
2017-06-08 14:09:03 +02:00
parent 42563ac813 e1f4dbfcf8
commit dd912b4f97
80 changed files with 913 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@
#pragma once
#include "RimDefines.h"
#include "RimUnitSystem.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
@@ -39,7 +39,7 @@ public:
virtual ~RimFractureTemplateCollection(void);
caf::PdmChildArrayField<RimFractureTemplate*> fractureDefinitions;
caf::PdmField< caf::AppEnum< RimDefines::UnitSystem > > defaultUnitsForFracTemplates;
caf::PdmField< RimUnitSystem::UnitSystemType > defaultUnitsForFracTemplates;
std::vector<std::pair<QString, QString> > stimPlanResultNamesAndUnits() const;
std::vector<QString> stimPlanResultNames() const;