From 85228ee39c207aab3cd59103ba25b650d8371314 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 24 Feb 2017 14:31:06 +0100 Subject: [PATCH] #1255 Removed includes from RimWellPath --- .../RivWellPathSourceInfo.cpp | 2 ++ .../ProjectDataModel/RimIntersection.cpp | 1 + .../RimWellLogExtractionCurve.cpp | 1 + .../ProjectDataModel/RimWellPath.cpp | 29 ++++++++++++++++--- .../ProjectDataModel/RimWellPath.h | 12 ++++---- .../RimWellPathCollection.cpp | 8 +++-- 6 files changed, 41 insertions(+), 12 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.cpp b/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.cpp index 97fe54a4e6..41b008e230 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.cpp +++ b/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.cpp @@ -19,6 +19,8 @@ #include "RivWellPathSourceInfo.h" +#include "RigWellPath.h" + #include "RimCase.h" #include "RimWellPath.h" #include "RimWellPathCollection.h" diff --git a/ApplicationCode/ProjectDataModel/RimIntersection.cpp b/ApplicationCode/ProjectDataModel/RimIntersection.cpp index c771680fd8..7d4d249de2 100644 --- a/ApplicationCode/ProjectDataModel/RimIntersection.cpp +++ b/ApplicationCode/ProjectDataModel/RimIntersection.cpp @@ -22,6 +22,7 @@ #include "RiaApplication.h" #include "RigSimulationWellCenterLineCalculator.h" +#include "RigWellPath.h" #include "RimCase.h" #include "RimEclipseView.h" diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp index 7561182594..29e0ec72b7 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp @@ -29,6 +29,7 @@ #include "RigGeoMechWellLogExtractor.h" #include "RigResultAccessorFactory.h" #include "RigWellLogCurveData.h" +#include "RigWellPath.h" #include "RimEclipseCase.h" #include "RimEclipseCellColors.h" diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.cpp b/ApplicationCode/ProjectDataModel/RimWellPath.cpp index 2612ef6004..b64df06551 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPath.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPath.cpp @@ -21,20 +21,25 @@ #include "RimWellPath.h" #include "RifJsonEncodeDecode.h" + +#include "RigWellPath.h" + +#include "RimMainPlotCollection.h" +#include "RimProject.h" #include "RimProject.h" #include "RimTools.h" #include "RimWellLogFile.h" -#include "RimProject.h" -#include "RimMainPlotCollection.h" #include "RimWellLogPlotCollection.h" -#include "RivWellPathPartMgr.h" +#include "RimWellPathCollection.h" #include "RiuMainWindow.h" +#include "RivWellPathPartMgr.h" + +#include #include #include #include -#include CAF_PDM_SOURCE_INIT(RimWellPath, "WellPath"); @@ -147,6 +152,14 @@ void RimWellPath::setSurveyType(QString surveyType) wellPathColor = cvf::Color3f(0.0f, 0.333f, 0.999f); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RigWellPath* RimWellPath::wellPathGeometry() +{ + return m_wellPath.p(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -210,6 +223,14 @@ bool RimWellPath::readWellPathFile(QString* errorMessage, RifWellPathAsciiFileRe } } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimWellPath::setWellPathGeometry(RigWellPath* wellPathModel) +{ + m_wellPath = wellPathModel; +} + //-------------------------------------------------------------------------------------------------- /// Read JSON file containing well path data //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.h b/ApplicationCode/ProjectDataModel/RimWellPath.h index 7483b658e5..253ffaeaab 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPath.h +++ b/ApplicationCode/ProjectDataModel/RimWellPath.h @@ -20,9 +20,6 @@ #pragma once -#include "RigWellPath.h" -#include "RimWellPathCollection.h" - #include "cafPdmField.h" #include "cafPdmObject.h" #include "cafPdmPointer.h" @@ -32,10 +29,13 @@ // Include to make Pdm work for cvf::Color #include "cafPdmFieldCvfColor.h" +#include "cvfObject.h" +class RifWellPathAsciiFileReader; +class RigWellPath; class RimProject; -class RivWellPathPartMgr; class RimWellLogFile; +class RivWellPathPartMgr; //================================================================================================== /// @@ -69,7 +69,7 @@ public: caf::PdmChildField m_wellLogFile; - RigWellPath* wellPathGeometry() { return m_wellPath.p(); } + RigWellPath* wellPathGeometry(); RivWellPathPartMgr* partMgr(); bool readWellPathFile(QString * errorMessage, RifWellPathAsciiFileReader* asciiReader); @@ -79,7 +79,7 @@ public: private: - void setWellPathGeometry(RigWellPath* wellPathModel) { m_wellPath = wellPathModel; } + void setWellPathGeometry(RigWellPath* wellPathModel); void readJsonWellPathFile(); void readAsciiWellPathFile(RifWellPathAsciiFileReader* asciiReader); QString surveyType() { return m_surveyType; } diff --git a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp index 5d77b67e80..2b3d3082e4 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp @@ -22,13 +22,17 @@ #include "RiaApplication.h" #include "RiaPreferences.h" + +#include "RigWellPath.h" + #include "RimProject.h" -#include "RimWellPath.h" #include "RimWellLogFile.h" -#include "RivWellPathCollectionPartMgr.h" +#include "RimWellPath.h" #include "RiuMainWindow.h" +#include "RivWellPathCollectionPartMgr.h" + #include "cafPdmUiEditorHandle.h" #include "cafProgressInfo.h"