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

#3322 Well Path Creation: Use positive depth in UTM reference point

Browse Source 
Obsoleted the original field to facilitate conversion in a transition period. Should be removed before release.
Also removed output of unused fields.
This commit is contained in:
Jacob Støren
2018-09-11 09:31:50 +02:00
parent 98dbc4946c
commit b9a2a382b1
3 changed files with 79 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.h
View File

@@ -43,8 +43,8 @@ public:
enum WellStartType { START_AT_FIRST_TARGET, START_AT_SURFACE, START_FROM_OTHER_WELL, START_AT_AUTO_SURFACE };
cvf::Vec3d referencePointXyz() { return m_referencePointXyz;}
void setReferencePoint(const cvf::Vec3d& refPointXyz ) {m_referencePointXyz = refPointXyz;}
cvf::Vec3d referencePointXyz() const;
void setReferencePointXyz(const cvf::Vec3d& refPointXyz );
cvf::ref<RigWellPath> createWellPathGeometry();
@@ -73,7 +73,9 @@ protected:
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute) override;
private:
private:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue) override;
@@ -81,20 +83,24 @@ private:
caf::PdmUiOrdering& uiOrdering) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering,
QString uiConfigName) override;
void initAfterRead() override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
std::vector<cvf::Vec3d> lineArcEndpoints() const;
cvf::Vec3d startTangent() const;
private:
caf::PdmField<caf::AppEnum<WellStartType> > m_wellStartType;
caf::PdmField<cvf::Vec3d> m_referencePointXyz;
caf::PdmField<double> m_kickoffDepthOrMD;
caf::PdmPtrField<RimWellPath*> m_parentWell;
caf::PdmField< bool > m_pickPointsEnabled;
caf::PdmField<cvf::Vec3d> m_referencePointUtmXyd;
caf::PdmField<cvf::Vec3d> m_referencePointXyz_OBSOLETE;
caf::PdmChildArrayField<RimWellPathTarget*> m_wellTargets;
caf::PdmField< bool > m_pickPointsEnabled;
RicCreateWellTargetsPickEventHandler* m_pickTargetsEventHandler;
// Unused for now. Remove when dust settles
caf::PdmField<caf::AppEnum<WellStartType> > m_wellStartType;
caf::PdmField<double> m_kickoffDepthOrMD;
caf::PdmPtrField<RimWellPath*> m_parentWell;
};