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 remote-tracking branch 'refs/remotes/origin/dev'

Browse Source
This commit is contained in:
Magne Sjaastad
2017-02-27 07:13:06 +01:00
parent 83a1d97f33 a29f6abc32
commit 10f14aee8e
75 changed files with 1034 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
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,14 @@
// 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;
class RimWellPathFractureCollection;
//==================================================================================================
@@ -70,10 +71,11 @@ public:
caf::PdmChildField<RimWellLogFile*> m_wellLogFile;
RigWellPath* wellPathGeometry();
caf::PdmChildField<RimWellPathFractureCollection*> fractureCollection;
RigWellPath* wellPathGeometry() { return m_wellPath.p(); }
RivWellPathPartMgr* partMgr();
bool readWellPathFile(QString * errorMessage, RifWellPathAsciiFileReader* asciiReader);
@@ -84,7 +86,7 @@ protected:
private:
void setWellPathGeometry(RigWellPath* wellPathModel) { m_wellPath = wellPathModel; }
void setWellPathGeometry(RigWellPath* wellPathModel);
void readJsonWellPathFile();
void readAsciiWellPathFile(RifWellPathAsciiFileReader* asciiReader);
QString surveyType() { return m_surveyType; }