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 'fishbones' into pre-proto

Browse Source
This commit is contained in:
Magne Sjaastad
2017-05-23 10:28:42 +02:00
parent 0b0747a8ec 2898884c0b
commit a45aee0cc2
3995 changed files with 17802 additions and 174762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@@ -29,14 +29,20 @@
// Include to make Pdm work for cvf::Color
#include "cafPdmFieldCvfColor.h"
#include "cafPdmChildArrayField.h"
#include "cvfObject.h"
class RifWellPathAsciiFileReader;
class RifWellPathImporter;
class RigWellPath;
class RimProject;
class RimWellLogFile;
class RimFishboneWellPathCollection;
class RivWellPathPartMgr;
class RimFishbonesCollection;
class RimPerforationCollection;
class RimWellPathCompletions;
class RimWellPathFractureCollection;
//==================================================================================================
@@ -71,6 +77,9 @@ public:
caf::PdmChildField<RimWellLogFile*> m_wellLogFile;
RimFishbonesCollection* fishbonesCollection();
RimPerforationCollection* perforationIntervalCollection();
RigWellPath* wellPathGeometry();
const RigWellPath* wellPathGeometry() const;
@@ -80,21 +89,19 @@ public:
RivWellPathPartMgr* partMgr();
bool readWellPathFile(QString * errorMessage, RifWellPathAsciiFileReader* asciiReader);
bool readWellPathFile(QString * errorMessage, RifWellPathImporter* wellPathImporter);
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
protected:
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
double combinedScaleFactor() const;
private:
void setWellPathGeometry(RigWellPath* wellPathModel);
void readJsonWellPathFile();
void readAsciiWellPathFile(RifWellPathAsciiFileReader* asciiReader);
QString surveyType() { return m_surveyType; }
void setSurveyType(QString surveyType);
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
bool isStoredInCache();
QString getCacheFileName();
@@ -109,6 +116,8 @@ private:
caf::PdmField<QString> m_surveyType;
caf::PdmField<double> m_datumElevation;
caf::PdmChildField<RimWellPathCompletions*> m_completions;
cvf::ref<RigWellPath> m_wellPath;
cvf::ref<RivWellPathPartMgr> m_wellPathPartMgr;