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

Renamed class RimWell to RimEclipseWell

Browse Source
This commit is contained in:
Pål Hagen 2015-06-25 12:08:00 +02:00
parent b8d425a010
commit 7f516172cf
9 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
View File

@ -61,7 +61,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RivWellHeadPartMgr::RivWellHeadPartMgr(RimEclipseView* reservoirView, RimWell* well) RivWellHeadPartMgr::RivWellHeadPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well)
{ {
m_rimReservoirView = reservoirView; m_rimReservoirView = reservoirView;
m_rimWell = well; m_rimWell = well;
@ -87,7 +87,7 @@ void RivWellHeadPartMgr::buildWellHeadParts(size_t frameIndex)
RigCaseData* rigReservoir = m_rimReservoirView->eclipseCase()->reservoirData(); RigCaseData* rigReservoir = m_rimReservoirView->eclipseCase()->reservoirData();
RimWell* well = m_rimWell; RimEclipseWell* well = m_rimWell;
RigSingleWellResultsData* wellResults = well->wellResults(); RigSingleWellResultsData* wellResults = well->wellResults();

6
ApplicationCode/ModelVisualization/RivWellHeadPartMgr.h
View File

@ -32,13 +32,13 @@ namespace cvf
class Font; class Font;
} }
class RimWell; class RimEclipseWell;
class RimEclipseView; class RimEclipseView;
class RivWellHeadPartMgr : public cvf::Object class RivWellHeadPartMgr : public cvf::Object
{ {
public: public:
RivWellHeadPartMgr(RimEclipseView* reservoirView, RimWell* well); RivWellHeadPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well);
~RivWellHeadPartMgr(); ~RivWellHeadPartMgr();
void setScaleTransform(cvf::Transform * scaleTransform) { m_scaleTransform = scaleTransform;} void setScaleTransform(cvf::Transform * scaleTransform) { m_scaleTransform = scaleTransform;}
@ -52,7 +52,7 @@ private:
private: private:
caf::PdmPointer<RimEclipseView> m_rimReservoirView; caf::PdmPointer<RimEclipseView> m_rimReservoirView;
caf::PdmPointer<RimWell> m_rimWell; caf::PdmPointer<RimEclipseWell> m_rimWell;
cvf::ref<cvf::Transform> m_scaleTransform; cvf::ref<cvf::Transform> m_scaleTransform;
cvf::Collection< cvf::Part > m_wellHeadParts; cvf::Collection< cvf::Part > m_wellHeadParts;

2
ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp
View File

@ -53,7 +53,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RivWellPipesPartMgr::RivWellPipesPartMgr(RimEclipseView* reservoirView, RimWell* well) RivWellPipesPartMgr::RivWellPipesPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well)
{ {
m_rimReservoirView = reservoirView; m_rimReservoirView = reservoirView;
m_rimWell = well; m_rimWell = well;

6
ApplicationCode/ModelVisualization/RivWellPipesPartMgr.h
View File

@ -38,12 +38,12 @@ namespace cvf
class RivPipeGeometryGenerator; class RivPipeGeometryGenerator;
class RimEclipseView; class RimEclipseView;
class RimWell; class RimEclipseWell;
class RivWellPipesPartMgr : public cvf::Object class RivWellPipesPartMgr : public cvf::Object
{ {
public: public:
RivWellPipesPartMgr(RimEclipseView* reservoirView, RimWell* well); RivWellPipesPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well);
~RivWellPipesPartMgr(); ~RivWellPipesPartMgr();
void setScaleTransform(cvf::Transform * scaleTransform) { m_scaleTransform = scaleTransform; scheduleGeometryRegen();} void setScaleTransform(cvf::Transform * scaleTransform) { m_scaleTransform = scaleTransform; scheduleGeometryRegen();}
@ -56,7 +56,7 @@ public:
private: private:
caf::PdmPointer<RimEclipseView> m_rimReservoirView; caf::PdmPointer<RimEclipseView> m_rimReservoirView;
caf::PdmPointer<RimWell> m_rimWell; caf::PdmPointer<RimEclipseWell> m_rimWell;
cvf::ref<cvf::Transform> m_scaleTransform; cvf::ref<cvf::Transform> m_scaleTransform;
bool m_needsTransformUpdate; bool m_needsTransformUpdate;

12
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -1065,12 +1065,12 @@ void RimEclipseView::syncronizeWellsWithResults()
cvf::Collection<RigSingleWellResultsData> wellResults = m_reservoir->reservoirData()->wellResults(); cvf::Collection<RigSingleWellResultsData> wellResults = m_reservoir->reservoirData()->wellResults();
std::vector<caf::PdmPointer<RimWell> > newWells; std::vector<caf::PdmPointer<RimEclipseWell> > newWells;
// Clear the possible well results data present // Clear the possible well results data present
for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx) for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx)
{ {
RimWell* well = this->wellCollection()->wells()[wIdx]; RimEclipseWell* well = this->wellCollection()->wells()[wIdx];
well->setWellResults(NULL); well->setWellResults(NULL);
} }
@ -1078,11 +1078,11 @@ void RimEclipseView::syncronizeWellsWithResults()
for (size_t wIdx = 0; wIdx < wellResults.size(); ++wIdx) for (size_t wIdx = 0; wIdx < wellResults.size(); ++wIdx)
{ {
RimWell* well = this->wellCollection()->findWell(wellResults[wIdx]->m_wellName); RimEclipseWell* well = this->wellCollection()->findWell(wellResults[wIdx]->m_wellName);
if (!well) if (!well)
{ {
well = new RimWell; well = new RimEclipseWell;
well->name = wellResults[wIdx]->m_wellName; well->name = wellResults[wIdx]->m_wellName;
} }
@ -1095,7 +1095,7 @@ void RimEclipseView::syncronizeWellsWithResults()
for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx) for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx)
{ {
RimWell* well = this->wellCollection()->wells()[wIdx]; RimEclipseWell* well = this->wellCollection()->wells()[wIdx];
RigSingleWellResultsData* wellRes = well->wellResults(); RigSingleWellResultsData* wellRes = well->wellResults();
if (wellRes == NULL) if (wellRes == NULL)
{ {
@ -1140,7 +1140,7 @@ void RimEclipseView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibleC
// Loop over the wells and find their contribution // Loop over the wells and find their contribution
for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx) for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx)
{ {
RimWell* well = this->wellCollection()->wells()[wIdx]; RimEclipseWell* well = this->wellCollection()->wells()[wIdx];
if (this->wellCollection()->wellCellsToRangeFilterMode() == RimWellCollection::RANGE_ADD_ALL || (well->showWell() && well->showWellCells()) ) if (this->wellCollection()->wellCellsToRangeFilterMode() == RimWellCollection::RANGE_ADD_ALL || (well->showWell() && well->showWellCells()) )
{ {
RigSingleWellResultsData* wres = well->wellResults(); RigSingleWellResultsData* wres = well->wellResults();

20
ApplicationCode/ProjectDataModel/RimWell.cpp
View File

@ -26,12 +26,12 @@
#include "cvfMath.h" #include "cvfMath.h"
CAF_PDM_SOURCE_INIT(RimWell, "Well"); CAF_PDM_SOURCE_INIT(RimEclipseWell, "Well");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimWell::RimWell() RimEclipseWell::RimEclipseWell()
{ {
CAF_PDM_InitObject("Well", ":/Well.png", "", ""); CAF_PDM_InitObject("Well", ":/Well.png", "", "");
@ -59,14 +59,14 @@ RimWell::RimWell()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimWell::~RimWell() RimEclipseWell::~RimEclipseWell()
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimWell::userDescriptionField() caf::PdmFieldHandle* RimEclipseWell::userDescriptionField()
{ {
return &name; return &name;
} }
@ -74,7 +74,7 @@ caf::PdmFieldHandle* RimWell::userDescriptionField()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWell::setReservoirView(RimEclipseView* ownerReservoirView) void RimEclipseWell::setReservoirView(RimEclipseView* ownerReservoirView)
{ {
m_reservoirView = ownerReservoirView; m_reservoirView = ownerReservoirView;
} }
@ -82,7 +82,7 @@ void RimWell::setReservoirView(RimEclipseView* ownerReservoirView)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWell::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimEclipseWell::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
if (&showWellLabel == changedField) if (&showWellLabel == changedField)
{ {
@ -138,7 +138,7 @@ void RimWell::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimWell::objectToggleField() caf::PdmFieldHandle* RimEclipseWell::objectToggleField()
{ {
return &showWell; return &showWell;
} }
@ -146,7 +146,7 @@ caf::PdmFieldHandle* RimWell::objectToggleField()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimWell::calculateWellPipeVisibility(size_t frameIndex) bool RimEclipseWell::calculateWellPipeVisibility(size_t frameIndex)
{ {
if (m_reservoirView == NULL) return false; if (m_reservoirView == NULL) return false;
if (this->wellResults() == NULL) return false; if (this->wellResults() == NULL) return false;
@ -237,7 +237,7 @@ bool RimWell::calculateWellPipeVisibility(size_t frameIndex)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWell::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimEclipseWell::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
caf::PdmUiGroup* pipeGroup = uiOrdering.addNewGroup("Appearance"); caf::PdmUiGroup* pipeGroup = uiOrdering.addNewGroup("Appearance");
pipeGroup->add(&showWellPipes); pipeGroup->add(&showWellPipes);
@ -253,7 +253,7 @@ void RimWell::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrder
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimWell::isWellPipeVisible(size_t frameIndex) bool RimEclipseWell::isWellPipeVisible(size_t frameIndex)
{ {
CVF_ASSERT(m_wellIndex != cvf::UNDEFINED_SIZE_T); CVF_ASSERT(m_wellIndex != cvf::UNDEFINED_SIZE_T);

6
ApplicationCode/ProjectDataModel/RimWell.h
View File

@ -37,13 +37,13 @@ class RimEclipseView;
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimWell : public caf::PdmObject class RimEclipseWell : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimWell(); RimEclipseWell();
virtual ~RimWell(); virtual ~RimEclipseWell();
void setReservoirView(RimEclipseView* ownerReservoirView); void setReservoirView(RimEclipseView* ownerReservoirView);
void setWellIndex(size_t val) { m_wellIndex = val; } void setWellIndex(size_t val) { m_wellIndex = val; }

4
ApplicationCode/ProjectDataModel/RimWellCollection.cpp
View File

@ -124,7 +124,7 @@ RimWellCollection::~RimWellCollection()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimWell* RimWellCollection::findWell(QString name) RimEclipseWell* RimWellCollection::findWell(QString name)
{ {
for (size_t i = 0; i < this->wells().size(); ++i) for (size_t i = 0; i < this->wells().size(); ++i)
{ {
@ -148,7 +148,7 @@ bool RimWellCollection::hasVisibleWellCells()
bool hasCells = false; bool hasCells = false;
for (size_t i = 0 ; !hasCells && i < this->wells().size(); ++i) for (size_t i = 0 ; !hasCells && i < this->wells().size(); ++i)
{ {
RimWell* well = this->wells()[i]; RimEclipseWell* well = this->wells()[i];
if ( well && well->wellResults() && ((well->showWell() && well->showWellCells()) || this->wellCellsToRangeFilterMode() == RANGE_ADD_ALL) ) if ( well && well->wellResults() && ((well->showWell() && well->showWellCells()) || this->wellCellsToRangeFilterMode() == RANGE_ADD_ALL) )
{ {
for (size_t tIdx = 0; !hasCells && tIdx < well->wellResults()->m_wellCellsTimeSteps.size(); ++tIdx ) for (size_t tIdx = 0; !hasCells && tIdx < well->wellResults()->m_wellCellsTimeSteps.size(); ++tIdx )

6
ApplicationCode/ProjectDataModel/RimWellCollection.h
View File

@ -31,7 +31,7 @@
#include <QString> #include <QString>
class RimEclipseView; class RimEclipseView;
class RimWell; class RimEclipseWell;
//================================================================================================== //==================================================================================================
/// ///
@ -101,9 +101,9 @@ public:
caf::PdmField<bool> isAutoDetectingBranches; caf::PdmField<bool> isAutoDetectingBranches;
caf::PdmPointersField<RimWell*> wells; caf::PdmPointersField<RimEclipseWell*> wells;
RimWell* findWell(QString name); RimEclipseWell* findWell(QString name);
bool hasVisibleWellCells(); bool hasVisibleWellCells();
bool hasVisibleWellPipes(); bool hasVisibleWellPipes();