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

Renamed enum type for Cell Sets (previously called ReservoirGeometryType)

Browse Source
This commit is contained in:
Jacob Støren 2015-06-18 12:39:10 +02:00
parent 09152ad363
commit 8bf90ec27c
5 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -55,7 +55,7 @@ m_reservoirView(resv)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Clears the geometry cache for the given, and the dependent geometryTypes (from a visibility standpoint) /// Clears the geometry cache for the given, and the dependent geometryTypes (from a visibility standpoint)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::scheduleGeometryRegen(ReservoirGeometryCacheType geometryType) void RivReservoirViewPartMgr::scheduleGeometryRegen(RivCellSetEnum geometryType)
{ {
switch (geometryType) switch (geometryType)
{ {
@ -139,7 +139,7 @@ void RivReservoirViewPartMgr::scheduleGeometryRegen(ReservoirGeometryCacheType g
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::clearGeometryCache(ReservoirGeometryCacheType geomType) void RivReservoirViewPartMgr::clearGeometryCache(RivCellSetEnum geomType)
{ {
RigCaseData* eclipseCase = NULL; RigCaseData* eclipseCase = NULL;
if (m_reservoirView != NULL && m_reservoirView->eclipseCase()) if (m_reservoirView != NULL && m_reservoirView->eclipseCase())
@ -201,7 +201,7 @@ void RivReservoirViewPartMgr::clearGeometryCache()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::appendStaticGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, void RivReservoirViewPartMgr::appendStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType,
const std::vector<size_t>& gridIndices) const std::vector<size_t>& gridIndices)
{ {
if (m_geometriesNeedsRegen[geometryType]) if (m_geometriesNeedsRegen[geometryType])
@ -214,7 +214,7 @@ void RivReservoirViewPartMgr::appendStaticGeometryPartsToModel(cvf::ModelBasicLi
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, void RivReservoirViewPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType,
size_t frameIndex, const std::vector<size_t>& gridIndices) size_t frameIndex, const std::vector<size_t>& gridIndices)
{ {
if (geometryType == PROPERTY_FILTERED) if (geometryType == PROPERTY_FILTERED)
@ -238,7 +238,7 @@ void RivReservoirViewPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicL
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::createGeometry(ReservoirGeometryCacheType geometryType) void RivReservoirViewPartMgr::createGeometry(RivCellSetEnum geometryType)
{ {
RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData();
m_geometries[geometryType].clearAndSetReservoir(res, m_reservoirView); m_geometries[geometryType].clearAndSetReservoir(res, m_reservoirView);
@ -261,7 +261,7 @@ void RivReservoirViewPartMgr::createGeometry(ReservoirGeometryCacheType geometry
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::computeVisibility(cvf::UByteArray* cellVisibility, ReservoirGeometryCacheType geometryType, RigGridBase* grid, size_t gridIdx) void RivReservoirViewPartMgr::computeVisibility(cvf::UByteArray* cellVisibility, RivCellSetEnum geometryType, RigGridBase* grid, size_t gridIdx)
{ {
RigCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData(); RigCaseData* eclipseCase = m_reservoirView->eclipseCase()->reservoirData();
RigActiveCellInfo* activeCellInfo = m_reservoirView->currentActiveCellInfo(); RigActiveCellInfo* activeCellInfo = m_reservoirView->currentActiveCellInfo();
@ -608,7 +608,7 @@ void RivReservoirViewPartMgr::copyByteArray(cvf::UByteArray* destination, const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::computeRangeVisibility(ReservoirGeometryCacheType geometryType, void RivReservoirViewPartMgr::computeRangeVisibility(RivCellSetEnum geometryType,
cvf::UByteArray* cellVisibility, cvf::UByteArray* cellVisibility,
const RigGridBase* grid, const RigGridBase* grid,
const cvf::UByteArray* nativeVisibility, const cvf::UByteArray* nativeVisibility,
@ -769,7 +769,7 @@ void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVis
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::updateCellColor(ReservoirGeometryCacheType geometryType, size_t timeStepIndex, cvf::Color4f color) void RivReservoirViewPartMgr::updateCellColor(RivCellSetEnum geometryType, size_t timeStepIndex, cvf::Color4f color)
{ {
RivReservoirPartMgr * pmgr = reservoirPartManager( geometryType, timeStepIndex ); RivReservoirPartMgr * pmgr = reservoirPartManager( geometryType, timeStepIndex );
pmgr->updateCellColor(color); pmgr->updateCellColor(color);
@ -778,7 +778,7 @@ void RivReservoirViewPartMgr::updateCellColor(ReservoirGeometryCacheType geometr
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::updateCellColor(ReservoirGeometryCacheType geometryType, cvf::Color4f color) void RivReservoirViewPartMgr::updateCellColor(RivCellSetEnum geometryType, cvf::Color4f color)
{ {
//CVF_ASSERT(geometryType != PROPERTY_FILTERED); //CVF_ASSERT(geometryType != PROPERTY_FILTERED);
//CVF_ASSERT(geometryType != PROPERTY_FILTERED_WELL_CELLS); //CVF_ASSERT(geometryType != PROPERTY_FILTERED_WELL_CELLS);
@ -789,7 +789,7 @@ void RivReservoirViewPartMgr::updateCellColor(ReservoirGeometryCacheType geometr
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::updateCellResultColor(ReservoirGeometryCacheType geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot) void RivReservoirViewPartMgr::updateCellResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot)
{ {
RivReservoirPartMgr * pmgr = reservoirPartManager( geometryType, timeStepIndex ); RivReservoirPartMgr * pmgr = reservoirPartManager( geometryType, timeStepIndex );
pmgr->updateCellResultColor(timeStepIndex, cellResultSlot); pmgr->updateCellResultColor(timeStepIndex, cellResultSlot);
@ -798,7 +798,7 @@ void RivReservoirViewPartMgr::updateCellResultColor(ReservoirGeometryCacheType g
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::updateCellEdgeResultColor(ReservoirGeometryCacheType geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot) void RivReservoirViewPartMgr::updateCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
{ {
RivReservoirPartMgr * pmgr = reservoirPartManager( geometryType, timeStepIndex ); RivReservoirPartMgr * pmgr = reservoirPartManager( geometryType, timeStepIndex );
pmgr->updateCellEdgeResultColor(timeStepIndex, cellResultSlot, cellEdgeResultSlot); pmgr->updateCellEdgeResultColor(timeStepIndex, cellResultSlot, cellEdgeResultSlot);
@ -807,7 +807,7 @@ void RivReservoirViewPartMgr::updateCellEdgeResultColor(ReservoirGeometryCacheTy
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::updateFaultCellEdgeResultColor(ReservoirGeometryCacheType geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot) void RivReservoirViewPartMgr::updateFaultCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
{ {
RivReservoirPartMgr * pmgr = reservoirPartManager(geometryType, timeStepIndex); RivReservoirPartMgr * pmgr = reservoirPartManager(geometryType, timeStepIndex);
pmgr->updateFaultCellEdgeResultColor(timeStepIndex, cellResultSlot, cellEdgeResultSlot); pmgr->updateFaultCellEdgeResultColor(timeStepIndex, cellResultSlot, cellEdgeResultSlot);
@ -816,13 +816,13 @@ void RivReservoirViewPartMgr::updateFaultCellEdgeResultColor(ReservoirGeometryCa
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::cref<cvf::UByteArray> RivReservoirViewPartMgr::cellVisibility(ReservoirGeometryCacheType geometryType, size_t gridIndex, size_t timeStepIndex) const cvf::cref<cvf::UByteArray> RivReservoirViewPartMgr::cellVisibility(RivCellSetEnum geometryType, size_t gridIndex, size_t timeStepIndex) const
{ {
RivReservoirPartMgr * pmgr = (const_cast<RivReservoirViewPartMgr*>(this))->reservoirPartManager( geometryType, timeStepIndex ); RivReservoirPartMgr * pmgr = (const_cast<RivReservoirViewPartMgr*>(this))->reservoirPartManager( geometryType, timeStepIndex );
return pmgr->cellVisibility(gridIndex).p(); return pmgr->cellVisibility(gridIndex).p();
} }
RivReservoirPartMgr * RivReservoirViewPartMgr::reservoirPartManager(ReservoirGeometryCacheType geometryType, size_t timeStepIndex ) RivReservoirPartMgr * RivReservoirViewPartMgr::reservoirPartManager(RivCellSetEnum geometryType, size_t timeStepIndex )
{ {
if (geometryType == PROPERTY_FILTERED) if (geometryType == PROPERTY_FILTERED)
{ {
@ -841,7 +841,7 @@ RivReservoirPartMgr * RivReservoirViewPartMgr::reservoirPartManager(ReservoirGeo
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::updateFaultColors(ReservoirGeometryCacheType geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot) void RivReservoirViewPartMgr::updateFaultColors(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot)
{ {
if (geometryType == PROPERTY_FILTERED && timeStepIndex >= m_propFilteredGeometryFrames.size()) if (geometryType == PROPERTY_FILTERED && timeStepIndex >= m_propFilteredGeometryFrames.size())
{ {
@ -860,7 +860,7 @@ void RivReservoirViewPartMgr::updateFaultColors(ReservoirGeometryCacheType geome
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::appendFaultsStaticGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType) void RivReservoirViewPartMgr::appendFaultsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType)
{ {
if (m_geometriesNeedsRegen[geometryType]) if (m_geometriesNeedsRegen[geometryType])
{ {
@ -872,7 +872,7 @@ void RivReservoirViewPartMgr::appendFaultsStaticGeometryPartsToModel(cvf::ModelB
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::appendFaultsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, size_t frameIndex) void RivReservoirViewPartMgr::appendFaultsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex)
{ {
if (geometryType == PROPERTY_FILTERED) if (geometryType == PROPERTY_FILTERED)
{ {
@ -887,7 +887,7 @@ void RivReservoirViewPartMgr::appendFaultsDynamicGeometryPartsToModel(cvf::Model
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RivReservoirViewPartMgr::ReservoirGeometryCacheType RivReservoirViewPartMgr::geometryTypeForFaultLabels(const std::vector<ReservoirGeometryCacheType>& geometryTypes) const RivReservoirViewPartMgr::RivCellSetEnum RivReservoirViewPartMgr::geometryTypeForFaultLabels(const std::vector<RivCellSetEnum>& geometryTypes) const
{ {
bool hasInactive = false; bool hasInactive = false;
for (size_t i = 0; i < geometryTypes.size(); i++) for (size_t i = 0; i < geometryTypes.size(); i++)
@ -919,7 +919,7 @@ RivReservoirViewPartMgr::ReservoirGeometryCacheType RivReservoirViewPartMgr::geo
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::appendFaultLabelsStaticGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType) void RivReservoirViewPartMgr::appendFaultLabelsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType)
{ {
if (m_geometriesNeedsRegen[geometryType]) if (m_geometriesNeedsRegen[geometryType])
{ {
@ -931,7 +931,7 @@ void RivReservoirViewPartMgr::appendFaultLabelsStaticGeometryPartsToModel(cvf::M
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, size_t frameIndex) void RivReservoirViewPartMgr::appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex)
{ {
m_propFilteredGeometryFrames[frameIndex]->appendFaultLabelPartsToModel(model); m_propFilteredGeometryFrames[frameIndex]->appendFaultLabelPartsToModel(model);
} }
@ -939,7 +939,7 @@ void RivReservoirViewPartMgr::appendFaultLabelsDynamicGeometryPartsToModel(cvf::
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::setFaultForceVisibilityForGeometryType(ReservoirGeometryCacheType geometryType, bool forceVisibility) void RivReservoirViewPartMgr::setFaultForceVisibilityForGeometryType(RivCellSetEnum geometryType, bool forceVisibility)
{ {
if (m_geometriesNeedsRegen[geometryType]) if (m_geometriesNeedsRegen[geometryType])
{ {

44
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
View File

@ -38,7 +38,7 @@ public:
cvf::Transform* scaleTransform() { return m_scaleTransform.p();} cvf::Transform* scaleTransform() { return m_scaleTransform.p();}
enum ReservoirGeometryCacheType enum RivCellSetEnum
{ {
ACTIVE, ///< All Active cells without ALL_WELL_CELLS ACTIVE, ///< All Active cells without ALL_WELL_CELLS
ALL_WELL_CELLS, ///< All cells ever having a connection to a well (Might be inactive cells as well. Wellhead cells typically) ALL_WELL_CELLS, ///< All cells ever having a connection to a well (Might be inactive cells as well. Wellhead cells typically)
@ -55,52 +55,52 @@ public:
}; };
void clearGeometryCache(); void clearGeometryCache();
void scheduleGeometryRegen(ReservoirGeometryCacheType geometryType); void scheduleGeometryRegen(RivCellSetEnum geometryType);
cvf::cref<cvf::UByteArray> cellVisibility(ReservoirGeometryCacheType geometryType, size_t gridIndex, size_t frameIndex) const; cvf::cref<cvf::UByteArray> cellVisibility(RivCellSetEnum geometryType, size_t gridIndex, size_t frameIndex) const;
void appendStaticGeometryPartsToModel (cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, const std::vector<size_t>& gridIndices); void appendStaticGeometryPartsToModel (cvf::ModelBasicList* model, RivCellSetEnum geometryType, const std::vector<size_t>& gridIndices);
void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, size_t frameIndex, const std::vector<size_t>& gridIndices); void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex, const std::vector<size_t>& gridIndices);
void updateCellColor (ReservoirGeometryCacheType geometryType, cvf::Color4f color); void updateCellColor (RivCellSetEnum geometryType, cvf::Color4f color);
void updateCellColor (ReservoirGeometryCacheType geometryType, size_t timeStepIndex, void updateCellColor (RivCellSetEnum geometryType, size_t timeStepIndex,
cvf::Color4f color); cvf::Color4f color);
void updateCellResultColor (ReservoirGeometryCacheType geometryType, size_t timeStepIndex, void updateCellResultColor (RivCellSetEnum geometryType, size_t timeStepIndex,
RimResultSlot* cellResultSlot); RimResultSlot* cellResultSlot);
void updateCellEdgeResultColor(ReservoirGeometryCacheType geometryType, size_t timeStepIndex, void updateCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex,
RimResultSlot* cellResultSlot, RimResultSlot* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot); RimCellEdgeResultSlot* cellEdgeResultSlot);
// Faults // Faults
void appendFaultsStaticGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType); void appendFaultsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType);
void appendFaultsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, size_t frameIndex); void appendFaultsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex);
void updateFaultColors(ReservoirGeometryCacheType geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot); void updateFaultColors(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot);
void updateFaultCellEdgeResultColor( ReservoirGeometryCacheType geometryType, size_t timeStepIndex, void updateFaultCellEdgeResultColor( RivCellSetEnum geometryType, size_t timeStepIndex,
RimResultSlot* cellResultSlot, RimResultSlot* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot); RimCellEdgeResultSlot* cellEdgeResultSlot);
// Fault labels // Fault labels
ReservoirGeometryCacheType geometryTypeForFaultLabels(const std::vector<ReservoirGeometryCacheType>& geometryTypes) const; RivCellSetEnum geometryTypeForFaultLabels(const std::vector<RivCellSetEnum>& geometryTypes) const;
void appendFaultLabelsStaticGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType); void appendFaultLabelsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType);
void appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, size_t frameIndex); void appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex);
void setFaultForceVisibilityForGeometryType(ReservoirGeometryCacheType geometryType, bool forceVisibility); void setFaultForceVisibilityForGeometryType(RivCellSetEnum geometryType, bool forceVisibility);
private: private:
void createGeometry(ReservoirGeometryCacheType geometryType); void createGeometry(RivCellSetEnum geometryType);
void computeVisibility(cvf::UByteArray* cellVisibility, ReservoirGeometryCacheType geometryType, RigGridBase* grid, size_t gridIdx); void computeVisibility(cvf::UByteArray* cellVisibility, RivCellSetEnum geometryType, RigGridBase* grid, size_t gridIdx);
void createPropertyFilteredNoneWellCellGeometry(size_t frameIndex); void createPropertyFilteredNoneWellCellGeometry(size_t frameIndex);
void createPropertyFilteredWellGeometry(size_t frameIndex); void createPropertyFilteredWellGeometry(size_t frameIndex);
void clearGeometryCache(ReservoirGeometryCacheType geomType); void clearGeometryCache(RivCellSetEnum geomType);
static void computeNativeVisibility (cvf::UByteArray* cellVisibilities, const RigGridBase* grid, const RigActiveCellInfo* activeCellInfo, const cvf::UByteArray* cellIsInWellStatuses, bool invalidCellsIsVisible, bool inactiveCellsIsVisible, bool activeCellsIsVisible, bool mainGridIsVisible); static void computeNativeVisibility (cvf::UByteArray* cellVisibilities, const RigGridBase* grid, const RigActiveCellInfo* activeCellInfo, const cvf::UByteArray* cellIsInWellStatuses, bool invalidCellsIsVisible, bool inactiveCellsIsVisible, bool activeCellsIsVisible, bool mainGridIsVisible);
void computeRangeVisibility (ReservoirGeometryCacheType geometryType, cvf::UByteArray* cellVisibilities, const RigGridBase* grid, const cvf::UByteArray* nativeVisibility, const RimCellRangeFilterCollection* rangeFilterColl); void computeRangeVisibility (RivCellSetEnum geometryType, cvf::UByteArray* cellVisibilities, const RigGridBase* grid, const cvf::UByteArray* nativeVisibility, const RimCellRangeFilterCollection* rangeFilterColl);
static void computePropertyVisibility(cvf::UByteArray* cellVisibilities, const RigGridBase* grid, size_t timeStepIndex, const cvf::UByteArray* rangeFilterVisibility, RimCellPropertyFilterCollection* propFilterColl); static void computePropertyVisibility(cvf::UByteArray* cellVisibilities, const RigGridBase* grid, size_t timeStepIndex, const cvf::UByteArray* rangeFilterVisibility, RimCellPropertyFilterCollection* propFilterColl);
static void copyByteArray(cvf::UByteArray* cellVisibilities, const cvf::UByteArray* cellIsWellStatuses ); static void copyByteArray(cvf::UByteArray* cellVisibilities, const cvf::UByteArray* cellIsWellStatuses );
RivReservoirPartMgr * reservoirPartManager(ReservoirGeometryCacheType geometryType, size_t timeStepIndex ); RivReservoirPartMgr * reservoirPartManager(RivCellSetEnum geometryType, size_t timeStepIndex );
private: private:

22
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -331,7 +331,7 @@ void RimEclipseView::createDisplayModel()
if (!this->propertyFilterCollection()->hasActiveFilters()) if (!this->propertyFilterCollection()->hasActiveFilters())
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> geometryTypesToAdd; std::vector<RivReservoirViewPartMgr::RivCellSetEnum> geometryTypesToAdd;
if (this->rangeFilterCollection()->hasActiveFilters() && this->wellCollection()->hasVisibleWellCells()) if (this->rangeFilterCollection()->hasActiveFilters() && this->wellCollection()->hasVisibleWellCells())
{ {
@ -388,9 +388,9 @@ void RimEclipseView::createDisplayModel()
{ {
updateFaultForcedVisibility(); updateFaultForcedVisibility();
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAppend = visibleFaultGeometryTypes(); std::vector<RivReservoirViewPartMgr::RivCellSetEnum> faultGeometryTypesToAppend = visibleFaultGeometryTypes();
RivReservoirViewPartMgr::ReservoirGeometryCacheType faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend); RivReservoirViewPartMgr::RivCellSetEnum faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend);
for (size_t frameIdx = 0; frameIdx < frameModels.size(); ++frameIdx) for (size_t frameIdx = 0; frameIdx < frameModels.size(); ++frameIdx)
{ {
@ -478,7 +478,7 @@ void RimEclipseView::updateCurrentTimeStep()
{ {
updateLegends(); // To make sure the scalar mappers are set up correctly updateLegends(); // To make sure the scalar mappers are set up correctly
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> geometriesToRecolor; std::vector<RivReservoirViewPartMgr::RivCellSetEnum> geometriesToRecolor;
if (this->propertyFilterCollection()->hasActiveFilters()) if (this->propertyFilterCollection()->hasActiveFilters())
{ {
@ -495,14 +495,14 @@ void RimEclipseView::updateCurrentTimeStep()
if (faultCollection()->showFaultsOutsideFilters()) if (faultCollection()->showFaultsOutsideFilters())
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAppend = visibleFaultGeometryTypes(); std::vector<RivReservoirViewPartMgr::RivCellSetEnum> faultGeometryTypesToAppend = visibleFaultGeometryTypes();
for (size_t i = 0; i < faultGeometryTypesToAppend.size(); i++) for (size_t i = 0; i < faultGeometryTypesToAppend.size(); i++)
{ {
m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), faultGeometryTypesToAppend[i]); m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), faultGeometryTypesToAppend[i]);
} }
RivReservoirViewPartMgr::ReservoirGeometryCacheType faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend); RivReservoirViewPartMgr::RivCellSetEnum faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend);
m_reservoirGridPartManager->appendFaultLabelsStaticGeometryPartsToModel(frameParts.p(), faultLabelType); m_reservoirGridPartManager->appendFaultLabelsStaticGeometryPartsToModel(frameParts.p(), faultLabelType);
} }
else else
@ -753,7 +753,7 @@ void RimEclipseView::updateStaticCellColors(unsigned short geometryType)
case RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE: color = cvf::Color4f(cvf::Color3::LIGHT_GRAY); break; case RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE: color = cvf::Color4f(cvf::Color3::LIGHT_GRAY); break;
} }
m_reservoirGridPartManager->updateCellColor(static_cast<RivReservoirViewPartMgr::ReservoirGeometryCacheType>(geometryType), color); m_reservoirGridPartManager->updateCellColor(static_cast<RivReservoirViewPartMgr::RivCellSetEnum>(geometryType), color);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -837,7 +837,7 @@ RigActiveCellInfo* RimEclipseView::currentActiveCellInfo()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEclipseView::scheduleGeometryRegen(unsigned short geometryType) void RimEclipseView::scheduleGeometryRegen(unsigned short geometryType)
{ {
m_reservoirGridPartManager->scheduleGeometryRegen(static_cast<RivReservoirViewPartMgr::ReservoirGeometryCacheType>(geometryType)); m_reservoirGridPartManager->scheduleGeometryRegen(static_cast<RivReservoirViewPartMgr::RivCellSetEnum>(geometryType));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -1291,9 +1291,9 @@ void RimEclipseView::updateFaultForcedVisibility()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> RimEclipseView::visibleFaultGeometryTypes() const std::vector<RivReservoirViewPartMgr::RivCellSetEnum> RimEclipseView::visibleFaultGeometryTypes() const
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultParts; std::vector<RivReservoirViewPartMgr::RivCellSetEnum> faultParts;
if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters()) if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters())
{ {
@ -1369,7 +1369,7 @@ std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> RimEclipseView:
void RimEclipseView::updateFaultColors() void RimEclipseView::updateFaultColors()
{ {
// Update all fault geometry // Update all fault geometry
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometriesToRecolor = visibleFaultGeometryTypes(); std::vector<RivReservoirViewPartMgr::RivCellSetEnum> faultGeometriesToRecolor = visibleFaultGeometryTypes();
RimResultSlot* faultResultSlot = currentFaultResultSlot(); RimResultSlot* faultResultSlot = currentFaultResultSlot();

6
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -118,7 +118,7 @@ public:
void schedulePipeGeometryRegen(); void schedulePipeGeometryRegen();
void updateDisplayModelForWellResults(); void updateDisplayModelForWellResults();
const std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType>& const std::vector<RivReservoirViewPartMgr::RivCellSetEnum>&
visibleGridParts() const { return m_visibleGridParts;} visibleGridParts() const { return m_visibleGridParts;}
cvf::cref<RivReservoirViewPartMgr> reservoirGridPartManager() const { return m_reservoirGridPartManager.p(); } cvf::cref<RivReservoirViewPartMgr> reservoirGridPartManager() const { return m_reservoirGridPartManager.p(); }
@ -147,7 +147,7 @@ private:
virtual void resetLegendsInViewer(); virtual void resetLegendsInViewer();
virtual void updateViewerWidgetWindowTitle(); virtual void updateViewerWidgetWindowTitle();
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> std::vector<RivReservoirViewPartMgr::RivCellSetEnum>
visibleFaultGeometryTypes() const; visibleFaultGeometryTypes() const;
void updateFaultForcedVisibility(); void updateFaultForcedVisibility();
void updateFaultColors(); void updateFaultColors();
@ -162,7 +162,7 @@ private:
cvf::ref<RivReservoirViewPartMgr> m_reservoirGridPartManager; cvf::ref<RivReservoirViewPartMgr> m_reservoirGridPartManager;
cvf::ref<RivReservoirPipesPartMgr> m_pipesPartManager; cvf::ref<RivReservoirPipesPartMgr> m_pipesPartManager;
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> std::vector<RivReservoirViewPartMgr::RivCellSetEnum>
m_visibleGridParts; m_visibleGridParts;
}; };

2
ApplicationCode/ProjectDataModel/RimWell.cpp
View File

@ -182,7 +182,7 @@ bool RimWell::calculateWellPipeVisibility(size_t frameIndex)
if (m_reservoirView->wellCollection()->wellPipeVisibility() == RimWellCollection::PIPES_OPEN_IN_VISIBLE_CELLS) if (m_reservoirView->wellCollection()->wellPipeVisibility() == RimWellCollection::PIPES_OPEN_IN_VISIBLE_CELLS)
{ {
const std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType>& visGridParts = m_reservoirView->visibleGridParts(); const std::vector<RivReservoirViewPartMgr::RivCellSetEnum>& visGridParts = m_reservoirView->visibleGridParts();
cvf::cref<RivReservoirViewPartMgr> rvMan = m_reservoirView->reservoirGridPartManager(); cvf::cref<RivReservoirViewPartMgr> rvMan = m_reservoirView->reservoirGridPartManager();
for (size_t gpIdx = 0; gpIdx < visGridParts.size(); ++gpIdx) for (size_t gpIdx = 0; gpIdx < visGridParts.size(); ++gpIdx)