Remove unused code from RimWellPathGeometryDef

This commit is contained in:
Gaute Lindkvist 2020-02-11 08:24:16 +01:00
parent 56a65742c4
commit e69f3afc88
2 changed files with 0 additions and 27 deletions

View File

@ -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;

View File

@ -100,7 +100,6 @@ private:
private:
caf::PdmField<cvf::Vec3d> m_referencePointUtmXyd;
caf::PdmField<cvf::Vec3d> m_referencePointXyz_OBSOLETE;
caf::PdmField<double> m_airGap;
@ -110,8 +109,6 @@ private:
caf::PdmField<bool> m_pickPointsEnabled;
caf::PdmField<caf::AppEnum<WellStartType>> m_wellStartType;
// TODO: Unused for now. Remove when dust settles
caf::PdmPtrField<RimWellPath*> m_parentWell;
std::shared_ptr<RicCreateWellTargetsPickEventHandler> m_pickTargetsEventHandler;
};