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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ModelVisualization/RivGeoMechPartMgrCache.cpp
View File

@ -61,7 +61,7 @@ RivGeoMechPartMgr* RivGeoMechPartMgrCache::partMgr(const Key& key)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivGeoMechPartMgrCache::Key::set(unsigned short aGeometryType, int aFrameIndex) void RivGeoMechPartMgrCache::Key::set(RivCellSetEnum aGeometryType, int aFrameIndex)
{ {
m_frameIndex = aFrameIndex; m_frameIndex = aFrameIndex;
m_geometryType = aGeometryType; m_geometryType = aGeometryType;
@ -82,7 +82,7 @@ bool RivGeoMechPartMgrCache::Key::operator<(const Key& other) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RivGeoMechPartMgrCache::Key::Key(unsigned short aGeometryType, int aFrameIndex) RivGeoMechPartMgrCache::Key::Key(RivCellSetEnum aGeometryType, int aFrameIndex)
: m_geometryType(aGeometryType), m_frameIndex(aFrameIndex) : m_geometryType(aGeometryType), m_frameIndex(aFrameIndex)
{ {

5
ApplicationCode/ModelVisualization/RivGeoMechPartMgrCache.h
View File

@ -2,6 +2,7 @@
#include <cstddef> #include <cstddef>
#include "cvfObject.h" #include "cvfObject.h"
#include <map> #include <map>
#include "RivCellSetEnum.h"
class RivGeoMechPartMgr; class RivGeoMechPartMgr;
@ -16,9 +17,9 @@ public:
public: public:
Key() : m_geometryType(-1), m_frameIndex(-1) {} Key() : m_geometryType(-1), m_frameIndex(-1) {}
Key( unsigned short aGeometryType, int aFrameIndex); Key(RivCellSetEnum aGeometryType, int aFrameIndex);
void set(unsigned short aGeometryType, int aFrameIndex); void set(RivCellSetEnum aGeometryType, int aFrameIndex);
int frameIndex() const { return m_frameIndex;} int frameIndex() const { return m_frameIndex;}
unsigned short geometryType() const { return m_geometryType; } unsigned short geometryType() const { return m_geometryType; }

2
ApplicationCode/ModelVisualization/RivGeoMechVizLogic.cpp
View File

@ -125,7 +125,7 @@ void RivGeoMechVizLogic::updateStaticCellColors()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivGeoMechVizLogic::scheduleGeometryRegen(unsigned short geometryType) void RivGeoMechVizLogic::scheduleGeometryRegen(RivCellSetEnum geometryType)
{ {
switch (geometryType) switch (geometryType)
{ {

5
ApplicationCode/ModelVisualization/RivGeoMechVizLogic.h
View File

@ -23,7 +23,8 @@
#include "cvfObject.h" #include "cvfObject.h"
#include "cvfColor4.h" #include "cvfColor4.h"
#include "RivGeoMechPartMgrCache.h" #include "RivGeoMechPartMgrCache.h"
#include "RivCellSetEnum.h"
class RimGeoMechView; class RimGeoMechView;
class RimGeoMechResultSlot; class RimGeoMechResultSlot;
@ -43,7 +44,7 @@ public:
void appendPartsToModel(int timeStepIndex, cvf::ModelBasicList* model); void appendPartsToModel(int timeStepIndex, cvf::ModelBasicList* model);
void updateCellResultColor(size_t timeStepIndex, RimGeoMechResultSlot* cellResultSlot); void updateCellResultColor(size_t timeStepIndex, RimGeoMechResultSlot* cellResultSlot);
void updateStaticCellColors(); void updateStaticCellColors();
void scheduleGeometryRegen(unsigned short geometryType); void scheduleGeometryRegen(RivCellSetEnum geometryType);
private: private:
RivGeoMechPartMgrCache::Key currentPartMgrKey(); RivGeoMechPartMgrCache::Key currentPartMgrKey();

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)); m_reservoirGridPartManager->scheduleGeometryRegen(static_cast<RivCellSetEnum>(geometryType));
} }

2
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -113,7 +113,7 @@ public:
virtual void loadDataAndUpdate(); virtual void loadDataAndUpdate();
bool isTimeStepDependentDataVisible() const; bool isTimeStepDependentDataVisible() const;
virtual void scheduleGeometryRegen(unsigned short geometryType); virtual void scheduleGeometryRegen(RivCellSetEnum geometryType);
void scheduleReservoirGridGeometryRegen(); void scheduleReservoirGridGeometryRegen();
void schedulePipeGeometryRegen(); void schedulePipeGeometryRegen();
void updateDisplayModelForWellResults(); 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); m_vizLogic->scheduleGeometryRegen(geometryType);
} }

2
ApplicationCode/ProjectDataModel/RimGeoMechView.h
View File

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

3
ApplicationCode/ProjectDataModel/RimView.h
View File

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