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

Rename of RimReservoirView to RimEclipseView

Browse Source 
To make the separation to geomech clearer, and alligning it to the
RigCaseNaming
This commit is contained in:
Jacob Støren
2015-05-21 10:05:33 +02:00
parent caa835331f
commit ed74116376
52 changed files with 154 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@@ -37,7 +37,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivReservoirFaultsPartMgr::RivReservoirFaultsPartMgr(const RigMainGrid* grid, RimReservoirView* reservoirView)
RivReservoirFaultsPartMgr::RivReservoirFaultsPartMgr(const RigMainGrid* grid, RimEclipseView* reservoirView)
: m_reservoirView(reservoirView)
{
CVF_ASSERT(grid);

6
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h
View File

@@ -32,7 +32,7 @@ namespace cvf
class RimResultSlot;
class RimCellEdgeResultSlot;
class RimReservoirView;
class RimEclipseView;
//==================================================================================================
///
@@ -40,7 +40,7 @@ class RimReservoirView;
class RivReservoirFaultsPartMgr : public cvf::Object
{
public:
RivReservoirFaultsPartMgr(const RigMainGrid* grid, RimReservoirView* reservoirView);
RivReservoirFaultsPartMgr(const RigMainGrid* grid, RimEclipseView* reservoirView);
~RivReservoirFaultsPartMgr();
void setTransform(cvf::Transform* scaleTransform);
@@ -60,7 +60,7 @@ public:
private:
cvf::ref<cvf::Transform> m_scaleTransform;
caf::PdmPointer<RimReservoirView> m_reservoirView;
caf::PdmPointer<RimEclipseView> m_reservoirView;
cvf::Collection<RivFaultPartMgr> m_faultParts;
bool m_forceVisibility;
};

2
ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
View File

@@ -30,7 +30,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirPartMgr::clearAndSetReservoir(const RigCaseData* eclipseCase, RimReservoirView* reservoirView)
void RivReservoirPartMgr::clearAndSetReservoir(const RigCaseData* eclipseCase, RimEclipseView* reservoirView)
{
m_allGrids.clear();

4
ApplicationCode/ModelVisualization/RivReservoirPartMgr.h
View File

@@ -35,7 +35,7 @@ namespace cvf
class RimResultSlot;
class RimCellEdgeResultSlot;
class RigCaseData;
class RimReservoirView;
class RimEclipseView;
//==================================================================================================
///
@@ -47,7 +47,7 @@ class RimReservoirView;
class RivReservoirPartMgr: public cvf::Object
{
public:
void clearAndSetReservoir(const RigCaseData* eclipseCase, RimReservoirView* reservoirView);
void clearAndSetReservoir(const RigCaseData* eclipseCase, RimEclipseView* reservoirView);
void setTransform(cvf::Transform* scaleTransform);
void setCellVisibility(size_t gridIndex, cvf::UByteArray* cellVisibilities );
void setFaultForceVisibility(bool isGeneratedByFilter);

2
ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.cpp
View File

@@ -38,7 +38,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivReservoirPipesPartMgr::RivReservoirPipesPartMgr(RimReservoirView* reservoirView)
RivReservoirPipesPartMgr::RivReservoirPipesPartMgr(RimEclipseView* reservoirView)
{
m_reservoirView = reservoirView;

6
ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.h
View File

@@ -23,14 +23,14 @@
#include "cvfCollection.h"
class RimReservoirView;
class RimEclipseView;
class RivWellPipesPartMgr;
class RivWellHeadPartMgr;
class RivReservoirPipesPartMgr : public cvf::Object
{
public:
RivReservoirPipesPartMgr(RimReservoirView* reservoirView);
RivReservoirPipesPartMgr(RimEclipseView* reservoirView);
~RivReservoirPipesPartMgr();
void clearGeometryCache();
@@ -42,7 +42,7 @@ public:
void updatePipeResultColor(size_t frameIndex);
private:
caf::PdmPointer<RimReservoirView> m_reservoirView;
caf::PdmPointer<RimEclipseView> m_reservoirView;
cvf::ref<cvf::Transform> m_scaleTransform;
cvf::Collection< RivWellPipesPartMgr > m_wellPipesPartMgrs;

2
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@@ -44,7 +44,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivReservoirViewPartMgr::RivReservoirViewPartMgr(RimReservoirView * resv) :
RivReservoirViewPartMgr::RivReservoirViewPartMgr(RimEclipseView * resv) :
m_reservoirView(resv)
{
m_scaleTransform = new cvf::Transform();

6
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
View File

@@ -25,7 +25,7 @@
#include "cvfArray.h"
#include "cafPdmObject.h"
class RimReservoirView;
class RimEclipseView;
class RigGridBase;
class RimCellRangeFilterCollection;
class RimCellPropertyFilterCollection;
@@ -34,7 +34,7 @@ class RigActiveCellInfo;
class RivReservoirViewPartMgr: public cvf::Object
{
public:
RivReservoirViewPartMgr(RimReservoirView * resv);
RivReservoirViewPartMgr(RimEclipseView * resv);
cvf::Transform* scaleTransform() { return m_scaleTransform.p();}
@@ -114,6 +114,6 @@ private:
std::vector<uchar> m_propFilteredWellGeometryFramesNeedsRegen;
cvf::ref<cvf::Transform> m_scaleTransform;
caf::PdmPointer<RimReservoirView> m_reservoirView;
caf::PdmPointer<RimEclipseView> m_reservoirView;
};

2
ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
View File

@@ -61,7 +61,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivWellHeadPartMgr::RivWellHeadPartMgr(RimReservoirView* reservoirView, RimWell* well)
RivWellHeadPartMgr::RivWellHeadPartMgr(RimEclipseView* reservoirView, RimWell* well)
{
m_rimReservoirView = reservoirView;
m_rimWell = well;

6
ApplicationCode/ModelVisualization/RivWellHeadPartMgr.h
View File

@@ -33,12 +33,12 @@ namespace cvf
}
class RimWell;
class RimReservoirView;
class RimEclipseView;
class RivWellHeadPartMgr : public cvf::Object
{
public:
RivWellHeadPartMgr(RimReservoirView* reservoirView, RimWell* well);
RivWellHeadPartMgr(RimEclipseView* reservoirView, RimWell* well);
~RivWellHeadPartMgr();
void setScaleTransform(cvf::Transform * scaleTransform) { m_scaleTransform = scaleTransform;}
@@ -51,7 +51,7 @@ private:
private:
caf::PdmPointer<RimReservoirView> m_rimReservoirView;
caf::PdmPointer<RimEclipseView> m_rimReservoirView;
caf::PdmPointer<RimWell> m_rimWell;
cvf::ref<cvf::Transform> m_scaleTransform;

2
ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp
View File

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

6
ApplicationCode/ModelVisualization/RivWellPipesPartMgr.h
View File

@@ -37,13 +37,13 @@ namespace cvf
}
class RivPipeGeometryGenerator;
class RimReservoirView;
class RimEclipseView;
class RimWell;
class RivWellPipesPartMgr : public cvf::Object
{
public:
RivWellPipesPartMgr(RimReservoirView* reservoirView, RimWell* well);
RivWellPipesPartMgr(RimEclipseView* reservoirView, RimWell* well);
~RivWellPipesPartMgr();
void setScaleTransform(cvf::Transform * scaleTransform) { m_scaleTransform = scaleTransform; scheduleGeometryRegen();}
@@ -55,7 +55,7 @@ public:
private:
caf::PdmPointer<RimReservoirView> m_rimReservoirView;
caf::PdmPointer<RimEclipseView> m_rimReservoirView;
caf::PdmPointer<RimWell> m_rimWell;
cvf::ref<cvf::Transform> m_scaleTransform;