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

8
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@@ -20,7 +20,7 @@
#pragma once
#include "RimUnitSystem.h"
#include "RiaEclipseUnitTools.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
@@ -95,8 +95,8 @@ public:
double combinedScaleFactor() const;
void setUnitSystem(RimUnitSystem::UnitSystem unitSystem);
RimUnitSystem::UnitSystem unitSystem() const;
void setUnitSystem(RiaEclipseUnitTools::UnitSystem unitSystem);
RiaEclipseUnitTools::UnitSystem unitSystem() const;
private:
@@ -121,7 +121,7 @@ private:
caf::PdmField<QString> m_surveyType;
caf::PdmField<double> m_datumElevation;
caf::PdmField<RimUnitSystem::UnitSystemType> m_unitSystem;
caf::PdmField<RiaEclipseUnitTools::UnitSystemType> m_unitSystem;
caf::PdmChildField<RimWellPathCompletions*> m_completions;