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

#2431 : Remove RivWellPathPartMgr from RimWellPath

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-05 14:25:44 +01:00
parent cd575ef9c1
commit df231ab50a
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -42,8 +42,6 @@
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "RivWellPathPartMgr.h"
#include "cafPdmUiTreeOrdering.h" #include "cafPdmUiTreeOrdering.h"
#include "cafUtils.h" #include "cafUtils.h"
@@ -300,24 +298,6 @@ const RigWellPath* RimWellPath::wellPathGeometry() const
return m_wellPath.p(); 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;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

6
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@@ -42,7 +42,6 @@ class RigWellPath;
class RimProject; class RimProject;
class RimWellLogFile; class RimWellLogFile;
class RimFishboneWellPathCollection; class RimFishboneWellPathCollection;
class RivWellPathPartMgr;
class RimFishbonesCollection; class RimFishbonesCollection;
class RimPerforationCollection; class RimPerforationCollection;
@@ -119,8 +118,6 @@ public:
RigWellPath* wellPathGeometry(); RigWellPath* wellPathGeometry();
const RigWellPath* wellPathGeometry() const; const RigWellPath* wellPathGeometry() const;
RivWellPathPartMgr* partMgr();
bool readWellPathFile(QString * errorMessage, RifWellPathImporter* wellPathImporter); bool readWellPathFile(QString * errorMessage, RifWellPathImporter* wellPathImporter);
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath); void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
@@ -172,15 +169,12 @@ private:
cvf::ref<RigWellPath> m_wellPath; cvf::ref<RigWellPath> m_wellPath;
cvf::ref<RigWellPathFormations> m_wellPathFormations; cvf::ref<RigWellPathFormations> m_wellPathFormations;
cvf::ref<RivWellPathPartMgr> m_wellPathPartMgr;
caf::PdmField<QString> m_name; caf::PdmField<QString> m_name;
caf::PdmField<QString> m_wellPathFormationFilePath; caf::PdmField<QString> m_wellPathFormationFilePath;
caf::PdmField<QString> m_formationKeyInFile; caf::PdmField<QString> m_formationKeyInFile;
caf::PdmChildArrayField<RimWellLogFile*> m_wellLogFiles; caf::PdmChildArrayField<RimWellLogFile*> m_wellLogFiles;
caf::PdmChildField<RimWellLogFile*> m_wellLogFile_OBSOLETE; caf::PdmChildField<RimWellLogFile*> m_wellLogFile_OBSOLETE;
}; };