OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 15:36:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renaming and cleaning as preparations for GeoMech property filters

Browse Source 
#314
This commit is contained in:
Jacob Støren 2015-06-18 09:13:45 +02:00
parent 2136c1b64c
commit 919f2b61f3
3 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/ModelVisualization/RivGeoMechPartMgrCache.cpp
View File

@ -57,3 +57,33 @@ RivGeoMechPartMgr* RivGeoMechPartMgrCache::partMgr(const Key& key)
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivGeoMechPartMgrCache::Key::set(unsigned short aGeometryType, int aFrameIndex)
{
m_frameIndex = aFrameIndex;
m_geometryType = aGeometryType;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RivGeoMechPartMgrCache::Key::operator<(const Key& other) const
{
if (m_frameIndex != other.m_frameIndex)
{
return (m_frameIndex < other.m_frameIndex);
}
return (m_geometryType < other.m_geometryType);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivGeoMechPartMgrCache::Key::Key(unsigned short aGeometryType, int aFrameIndex)
: m_geometryType(aGeometryType), m_frameIndex(aFrameIndex)
{
}

39
ApplicationCode/ModelVisualization/RivGeoMechPartMgrCache.h
View File

@ -14,37 +14,26 @@ public:
class Key
{
public:
Key()
: geometryType(-1), frameIndex(-1)
{}
Key() : m_geometryType(-1), m_frameIndex(-1) {}
Key(unsigned short aGeometryType, int aFrameIndex)
: geometryType(aGeometryType), frameIndex(aFrameIndex)
{}
Key( unsigned short aGeometryType, int aFrameIndex);
void set(unsigned short aGeometryType, int aFrameIndex)
{
frameIndex = aFrameIndex;
geometryType = aGeometryType;
}
void set(unsigned short aGeometryType, int aFrameIndex);
int frameIndex;
unsigned short geometryType;
int frameIndex() const { return m_frameIndex;}
unsigned short geometryType() const { return m_geometryType; }
bool operator< (const Key& other) const
{
if (frameIndex != other.frameIndex)
{
return (frameIndex < other.frameIndex);
}
return (geometryType < other.geometryType);
}
bool operator< (const Key& other) const;
private:
int m_frameIndex;
unsigned short m_geometryType;
};
bool needsRegeneration (const Key& key);
void scheduleRegeneration(const Key& key);
void generationFinished (const Key& key);
RivGeoMechPartMgr* partMgr (const Key& key);
bool needsRegeneration (const Key& key);
void scheduleRegeneration (const Key& key);
void generationFinished (const Key& key);
RivGeoMechPartMgr* partMgr (const Key& key);
private:
class CacheEntry

16
ApplicationCode/ModelVisualization/RivGeoMechVizLogic.cpp
View File

@ -56,23 +56,23 @@ void RivGeoMechVizLogic::appendNoAnimPartsToModel(cvf::ModelBasicList* model)
{
RivGeoMechPartMgrCache::Key pMgrKey = currentPartMgrKey();
RivGeoMechPartMgr* m_geoMechFullModel = m_partMgrCache->partMgr(pMgrKey);
RivGeoMechPartMgr* currentGeoMechPartMgr = m_partMgrCache->partMgr(pMgrKey);
RigGeoMechCaseData* caseData = m_geomechView->geoMechCase()->geoMechData();
int partCount = caseData->femParts()->partCount();
if (m_partMgrCache->needsRegeneration(pMgrKey))
{
if (m_geoMechFullModel->initializedFemPartCount() != partCount)
if (currentGeoMechPartMgr->initializedFemPartCount() != partCount)
{
m_geoMechFullModel->clearAndSetReservoir(caseData);
currentGeoMechPartMgr->clearAndSetReservoir(caseData);
}
for (int femPartIdx = 0; femPartIdx < partCount; ++femPartIdx)
{
cvf::ref<cvf::UByteArray> elmVisibility = m_geoMechFullModel->cellVisibility(femPartIdx);
m_geoMechFullModel->setTransform(m_geomechView->scaleTransform());
cvf::ref<cvf::UByteArray> elmVisibility = currentGeoMechPartMgr->cellVisibility(femPartIdx);
currentGeoMechPartMgr->setTransform(m_geomechView->scaleTransform());
if (pMgrKey.geometryType == RANGE_FILTERED)
if (pMgrKey.geometryType() == RANGE_FILTERED)
{
cvf::CellRangeFilter cellRangeFilter;
m_geomechView->rangeFilterCollection()->compoundCellRangeFilter(&cellRangeFilter, femPartIdx);
@ -83,13 +83,13 @@ void RivGeoMechVizLogic::appendNoAnimPartsToModel(cvf::ModelBasicList* model)
RivElmVisibilityCalculator::computeAllVisible(elmVisibility.p(), caseData->femParts()->part(femPartIdx));
}
m_geoMechFullModel->setCellVisibility(femPartIdx, elmVisibility.p());
currentGeoMechPartMgr->setCellVisibility(femPartIdx, elmVisibility.p());
}
m_partMgrCache->generationFinished(pMgrKey);
}
m_geoMechFullModel->appendGridPartsToModel(model);
currentGeoMechPartMgr->appendGridPartsToModel(model);
}
//--------------------------------------------------------------------------------------------------