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

(#404) Cleaned up includes and removed collection from constructor

Browse Source
This commit is contained in:
Magne Sjaastad
2015-12-03 19:31:34 +01:00
parent c4eee507a8
commit 27db48a336
3 changed files with 37 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -129,7 +129,6 @@ caf::PdmFieldHandle* RimWellPath::userDescriptionField()
return &name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -142,20 +141,21 @@ void RimWellPath::setSurveyType(QString surveyType)
wellPathColor = cvf::Color3f(0.0f, 0.333f, 0.999f);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivWellPathPartMgr* RimWellPath::partMgr()
{
if (m_wellPathPartMgr.isNull())
{
RimWellPathCollection* wpColl;
this->firstAnchestorOrThisOfType(wpColl);
if (wpColl) m_wellPathPartMgr = new RivWellPathPartMgr(wpColl, this);
if (wpColl) m_wellPathPartMgr = new RivWellPathPartMgr(this);
}
return m_wellPathPartMgr.p();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -168,7 +168,6 @@ void RimWellPath::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
if (proj) proj->createDisplayModelAndRedrawAllViews();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -177,7 +176,6 @@ caf::PdmFieldHandle* RimWellPath::objectToggleField()
return &showWellPath;
}
//--------------------------------------------------------------------------------------------------
/// Read JSON or ascii file containing well path data
//--------------------------------------------------------------------------------------------------