From df231ab50afa74db9d27ef357a0371c6af326653 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 5 Feb 2018 14:25:44 +0100 Subject: [PATCH] #2431 : Remove RivWellPathPartMgr from RimWellPath --- .../ProjectDataModel/RimWellPath.cpp | 20 ------------------- .../ProjectDataModel/RimWellPath.h | 6 ------ 2 files changed, 26 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.cpp b/ApplicationCode/ProjectDataModel/RimWellPath.cpp index d5fa25138e..13a3114346 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPath.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPath.cpp @@ -42,8 +42,6 @@ #include "RiuMainWindow.h" -#include "RivWellPathPartMgr.h" - #include "cafPdmUiTreeOrdering.h" #include "cafUtils.h" @@ -300,24 +298,6 @@ const RigWellPath* RimWellPath::wellPathGeometry() const return m_wellPath.p(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RivWellPathPartMgr* RimWellPath::partMgr() -{ -/* - if (m_wellPathPartMgr.isNull()) - { - RimWellPathCollection* wpColl; - this->firstAncestorOrThisOfType(wpColl); - if (wpColl) m_wellPathPartMgr = new RivWellPathPartMgr(this); - } - - return m_wellPathPartMgr.p(); -*/ - return nullptr; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.h b/ApplicationCode/ProjectDataModel/RimWellPath.h index 13f1c6e5ba..e8ae84c308 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPath.h +++ b/ApplicationCode/ProjectDataModel/RimWellPath.h @@ -42,7 +42,6 @@ class RigWellPath; class RimProject; class RimWellLogFile; class RimFishboneWellPathCollection; -class RivWellPathPartMgr; class RimFishbonesCollection; class RimPerforationCollection; @@ -119,8 +118,6 @@ public: RigWellPath* wellPathGeometry(); const RigWellPath* wellPathGeometry() const; - RivWellPathPartMgr* partMgr(); - bool readWellPathFile(QString * errorMessage, RifWellPathImporter* wellPathImporter); void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath); @@ -172,15 +169,12 @@ private: cvf::ref m_wellPath; cvf::ref m_wellPathFormations; - cvf::ref m_wellPathPartMgr; caf::PdmField m_name; caf::PdmField m_wellPathFormationFilePath; caf::PdmField m_formationKeyInFile; caf::PdmChildArrayField m_wellLogFiles; - caf::PdmChildField m_wellLogFile_OBSOLETE; - };