diff --git a/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp b/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp index f44b564d86..8217f4c147 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp @@ -83,7 +83,6 @@ RimWellPathGeometryDef::RimWellPathGeometryDef() CAF_PDM_InitField( &m_mdAtFirstTarget, "MdAtFirstTarget", 0.0, "MD at First Target", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_wellTargets, "WellPathTargets", "Well Targets", "", "", "" ); m_wellTargets.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); - // m_wellTargets.uiCapability()->setUiTreeHidden(true); m_wellTargets.uiCapability()->setUiTreeChildrenHidden( true ); m_wellTargets.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_wellTargets.uiCapability()->setCustomContextMenuEnabled( true ); @@ -91,21 +90,7 @@ RimWellPathGeometryDef::RimWellPathGeometryDef() CAF_PDM_InitField( &m_pickPointsEnabled, "m_pickPointsEnabled", false, "", "", "", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_pickPointsEnabled ); - // Temp conversion field. - CAF_PDM_InitField( &m_referencePointXyz_OBSOLETE, - "ReferencePos", - cvf::Vec3d( 0, 0, 0 ), - "UTM Reference Point", - "", - "", - "" ); - RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_referencePointXyz_OBSOLETE ); - CAF_PDM_InitFieldNoDefault( &m_wellStartType, "WellStartType", "Start Type", "", "", "" ); - - /// To be removed ? - CAF_PDM_InitFieldNoDefault( &m_parentWell, "ParentWell", "Parent Well", "", "", "" ); - m_parentWell.xmlCapability()->disableIO(); } //-------------------------------------------------------------------------------------------------- @@ -571,15 +556,6 @@ void RimWellPathGeometryDef::defineObjectEditorAttribute( QString uiConfigName, //-------------------------------------------------------------------------------------------------- void RimWellPathGeometryDef::initAfterRead() { - // To be removed before release 2018.11 - - if ( m_referencePointXyz_OBSOLETE != cvf::Vec3d::ZERO && m_referencePointUtmXyd == cvf::Vec3d::ZERO ) - { - m_referencePointUtmXyd = cvf::Vec3d( m_referencePointXyz_OBSOLETE().x(), - m_referencePointXyz_OBSOLETE().y(), - -m_referencePointXyz_OBSOLETE().z() ); - } - if ( RiaApplication::instance()->project()->isProjectFileVersionEqualOrOlderThan( "2019.12.1" ) ) { m_wellStartType = START_AT_FIRST_TARGET; diff --git a/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.h b/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.h index 360af87958..5ef5e6c519 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.h +++ b/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.h @@ -100,7 +100,6 @@ private: private: caf::PdmField m_referencePointUtmXyd; - caf::PdmField m_referencePointXyz_OBSOLETE; caf::PdmField m_airGap; @@ -110,8 +109,6 @@ private: caf::PdmField m_pickPointsEnabled; caf::PdmField> m_wellStartType; - // TODO: Unused for now. Remove when dust settles - caf::PdmPtrField m_parentWell; std::shared_ptr m_pickTargetsEventHandler; };