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

Use the new RigCellSetEnum instead of unsigned char

Browse Source 
Preparing for property filter
This commit is contained in:
Jacob Støren
2015-06-18 19:22:24 +02:00
parent 0377461da0
commit 74efc8da1a
9 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -835,7 +835,7 @@ RigActiveCellInfo* RimEclipseView::currentActiveCellInfo()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseView::scheduleGeometryRegen(unsigned short geometryType)
void RimEclipseView::scheduleGeometryRegen(RivCellSetEnum geometryType)
{
m_reservoirGridPartManager->scheduleGeometryRegen(static_cast<RivCellSetEnum>(geometryType));
}

2
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@@ -113,7 +113,7 @@ public:
virtual void loadDataAndUpdate();
bool isTimeStepDependentDataVisible() const;
virtual void scheduleGeometryRegen(unsigned short geometryType);
virtual void scheduleGeometryRegen(RivCellSetEnum geometryType);
void scheduleReservoirGridGeometryRegen();
void schedulePipeGeometryRegen();
void updateDisplayModelForWellResults();

2
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@@ -507,7 +507,7 @@ RimCase* RimGeoMechView::ownerCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechView::scheduleGeometryRegen(unsigned short geometryType)
void RimGeoMechView::scheduleGeometryRegen(RivCellSetEnum geometryType)
{
m_vizLogic->scheduleGeometryRegen(geometryType);
}

2
ApplicationCode/ProjectDataModel/RimGeoMechView.h
View File

@@ -70,7 +70,7 @@ public:
virtual cvf::Transform* scaleTransform();
private:
virtual void scheduleGeometryRegen(unsigned short geometryType);
virtual void scheduleGeometryRegen(RivCellSetEnum geometryType);
virtual void createDisplayModel();
virtual void updateDisplayModelVisibility();
virtual void updateScaleTransform();

3
ApplicationCode/ProjectDataModel/RimView.h
View File

@@ -24,6 +24,7 @@
#include "cafPdmFieldCvfColor.h"
#include "cafPdmFieldCvfMat4d.h"
#include "cafAppEnum.h"
#include "RivCellSetEnum.h"
class RiuViewer;
class Rim3dOverlayInfoConfig;
@@ -100,7 +101,7 @@ public:
void updateCurrentTimeStepAndRedraw();
void endAnimation();
virtual void scheduleGeometryRegen(unsigned short geometryType) = 0;
virtual void scheduleGeometryRegen(RivCellSetEnum geometryType) = 0;
void scheduleCreateDisplayModelAndRedraw();
void createDisplayModelAndRedraw();