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

#1255 Removed includes from RimWellPath

Browse Source
This commit is contained in:
Magne Sjaastad 2017-02-24 14:31:06 +01:00
parent 1af3df6c6c
commit 85228ee39c
6 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivWellPathSourceInfo.cpp
View File

@ -19,6 +19,8 @@
#include "RivWellPathSourceInfo.h"
#include "RigWellPath.h"
#include "RimCase.h"
#include "RimWellPath.h"
#include "RimWellPathCollection.h"

1
ApplicationCode/ProjectDataModel/RimIntersection.cpp
View File

@ -22,6 +22,7 @@
#include "RiaApplication.h"
#include "RigSimulationWellCenterLineCalculator.h"
#include "RigWellPath.h"
#include "RimCase.h"
#include "RimEclipseView.h"

1
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@ -29,6 +29,7 @@
#include "RigGeoMechWellLogExtractor.h"
#include "RigResultAccessorFactory.h"
#include "RigWellLogCurveData.h"
#include "RigWellPath.h"
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"

29
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -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 <QDateTime>
#include <QDir>
#include <QFileInfo>
#include <QMessageBox>
#include <QDateTime>
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
//--------------------------------------------------------------------------------------------------

12
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@ -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<RimWellLogFile*> 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; }

8
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

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