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

#1596 Merge dev into pre-proto

Browse Source
This commit is contained in:
Magne Sjaastad
2017-06-14 07:25:34 +02:00
parent d7ce607000 5a6c3638ee
commit a8b8e061d7
139 changed files with 1154 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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