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

#1255 Removed includes from RimWellPath

Browse Source
This commit is contained in:
Magne Sjaastad
2017-02-24 14:31:06 +01:00
parent 1af3df6c6c
commit 85228ee39c
6 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@@ -20,9 +20,6 @@
#pragma once
#include "RigWellPath.h"
#include "RimWellPathCollection.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmPointer.h"
@@ -32,10 +29,13 @@
// Include to make Pdm work for cvf::Color
#include "cafPdmFieldCvfColor.h"
#include "cvfObject.h"
class RifWellPathAsciiFileReader;
class RigWellPath;
class RimProject;
class RivWellPathPartMgr;
class RimWellLogFile;
class RivWellPathPartMgr;
//==================================================================================================
///
@@ -69,7 +69,7 @@ public:
caf::PdmChildField<RimWellLogFile*> m_wellLogFile;
RigWellPath* wellPathGeometry() { return m_wellPath.p(); }
RigWellPath* wellPathGeometry();
RivWellPathPartMgr* partMgr();
bool readWellPathFile(QString * errorMessage, RifWellPathAsciiFileReader* asciiReader);
@@ -79,7 +79,7 @@ public:
private:
void setWellPathGeometry(RigWellPath* wellPathModel) { m_wellPath = wellPathModel; }
void setWellPathGeometry(RigWellPath* wellPathModel);
void readJsonWellPathFile();
void readAsciiWellPathFile(RifWellPathAsciiFileReader* asciiReader);
QString surveyType() { return m_surveyType; }