Use the new RigCellSetEnum instead of unsigned char

Preparing for property filter
This commit is contained in:
Jacob Støren committed 2015-06-22 08:18:42 +02:00
1 parent 0377461da0
commit 74efc8da1a
9 files changed
+15 -12

No files matched your search

@@ -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_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)
{
@@ -2,6 +2,7 @@
#include <cstddef>
#include "cvfObject.h"
#include <map>
#include "RivCellSetEnum.h"
class RivGeoMechPartMgr;
@@ -16,9 +17,9 @@ public:
public:
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;}
unsigned short geometryType() const { return m_geometryType; }
@@ -125,7 +125,7 @@ void RivGeoMechVizLogic::updateStaticCellColors()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivGeoMechVizLogic::scheduleGeometryRegen(unsigned short geometryType)
void RivGeoMechVizLogic::scheduleGeometryRegen(RivCellSetEnum geometryType)
{
switch (geometryType)
{
@@ -23,7 +23,8 @@
#include "cvfObject.h"
#include "cvfColor4.h"
#include "RivGeoMechPartMgrCache.h"
#include "RivCellSetEnum.h"
class RimGeoMechView;
class RimGeoMechResultSlot;
@@ -43,7 +44,7 @@ public:
void appendPartsToModel(int timeStepIndex, cvf::ModelBasicList* model);
void updateCellResultColor(size_t timeStepIndex, RimGeoMechResultSlot* cellResultSlot);
void updateStaticCellColors();
void scheduleGeometryRegen(unsigned short geometryType);
void scheduleGeometryRegen(RivCellSetEnum geometryType);
private:
RivGeoMechPartMgrCache::Key currentPartMgrKey();