From 8bf90ec27c91f88386311e7e26700aede8506579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Thu, 18 Jun 2015 12:39:10 +0200 Subject: [PATCH] Renamed enum type for Cell Sets (previously called ReservoirGeometryType) --- .../RivReservoirViewPartMgr.cpp | 42 +++++++++--------- .../RivReservoirViewPartMgr.h | 44 +++++++++---------- .../ProjectDataModel/RimEclipseView.cpp | 22 +++++----- .../ProjectDataModel/RimEclipseView.h | 6 +-- ApplicationCode/ProjectDataModel/RimWell.cpp | 2 +- 5 files changed, 58 insertions(+), 58 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp index 42c5a19815..b9273eb856 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp @@ -55,7 +55,7 @@ m_reservoirView(resv) //-------------------------------------------------------------------------------------------------- /// 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) { @@ -139,7 +139,7 @@ void RivReservoirViewPartMgr::scheduleGeometryRegen(ReservoirGeometryCacheType g //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivReservoirViewPartMgr::clearGeometryCache(ReservoirGeometryCacheType geomType) +void RivReservoirViewPartMgr::clearGeometryCache(RivCellSetEnum geomType) { RigCaseData* eclipseCase = NULL; 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& gridIndices) { 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& gridIndices) { 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(); 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(); 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, const RigGridBase* grid, 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 ); 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_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 ); 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 ); 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); pmgr->updateFaultCellEdgeResultColor(timeStepIndex, cellResultSlot, cellEdgeResultSlot); @@ -816,13 +816,13 @@ void RivReservoirViewPartMgr::updateFaultCellEdgeResultColor(ReservoirGeometryCa //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::cref RivReservoirViewPartMgr::cellVisibility(ReservoirGeometryCacheType geometryType, size_t gridIndex, size_t timeStepIndex) const +cvf::cref RivReservoirViewPartMgr::cellVisibility(RivCellSetEnum geometryType, size_t gridIndex, size_t timeStepIndex) const { RivReservoirPartMgr * pmgr = (const_cast(this))->reservoirPartManager( geometryType, timeStepIndex ); 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) { @@ -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()) { @@ -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]) { @@ -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) { @@ -887,7 +887,7 @@ void RivReservoirViewPartMgr::appendFaultsDynamicGeometryPartsToModel(cvf::Model //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RivReservoirViewPartMgr::ReservoirGeometryCacheType RivReservoirViewPartMgr::geometryTypeForFaultLabels(const std::vector& geometryTypes) const +RivReservoirViewPartMgr::RivCellSetEnum RivReservoirViewPartMgr::geometryTypeForFaultLabels(const std::vector& geometryTypes) const { bool hasInactive = false; 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]) { @@ -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); } @@ -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]) { diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h index 5731b2f83c..16dd2d8405 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h @@ -38,7 +38,7 @@ public: cvf::Transform* scaleTransform() { return m_scaleTransform.p();} - enum ReservoirGeometryCacheType + enum RivCellSetEnum { 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) @@ -55,52 +55,52 @@ public: }; void clearGeometryCache(); - void scheduleGeometryRegen(ReservoirGeometryCacheType geometryType); - cvf::cref cellVisibility(ReservoirGeometryCacheType geometryType, size_t gridIndex, size_t frameIndex) const; + void scheduleGeometryRegen(RivCellSetEnum geometryType); + cvf::cref cellVisibility(RivCellSetEnum geometryType, size_t gridIndex, size_t frameIndex) const; - void appendStaticGeometryPartsToModel (cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, const std::vector& gridIndices); - void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, size_t frameIndex, const std::vector& gridIndices); + void appendStaticGeometryPartsToModel (cvf::ModelBasicList* model, RivCellSetEnum geometryType, const std::vector& gridIndices); + void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex, const std::vector& gridIndices); - void updateCellColor (ReservoirGeometryCacheType geometryType, cvf::Color4f color); - void updateCellColor (ReservoirGeometryCacheType geometryType, size_t timeStepIndex, + void updateCellColor (RivCellSetEnum geometryType, cvf::Color4f color); + void updateCellColor (RivCellSetEnum geometryType, size_t timeStepIndex, cvf::Color4f color); - void updateCellResultColor (ReservoirGeometryCacheType geometryType, size_t timeStepIndex, + void updateCellResultColor (RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot); - void updateCellEdgeResultColor(ReservoirGeometryCacheType geometryType, size_t timeStepIndex, + void updateCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot); // Faults - void appendFaultsStaticGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType); - void appendFaultsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, size_t frameIndex); - void updateFaultColors(ReservoirGeometryCacheType geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot); - void updateFaultCellEdgeResultColor( ReservoirGeometryCacheType geometryType, size_t timeStepIndex, + void appendFaultsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType); + void appendFaultsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex); + void updateFaultColors(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot); + void updateFaultCellEdgeResultColor( RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot); // Fault labels - ReservoirGeometryCacheType geometryTypeForFaultLabels(const std::vector& geometryTypes) const; - void appendFaultLabelsStaticGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType); - void appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, size_t frameIndex); + RivCellSetEnum geometryTypeForFaultLabels(const std::vector& geometryTypes) const; + void appendFaultLabelsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType); + void appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex); - void setFaultForceVisibilityForGeometryType(ReservoirGeometryCacheType geometryType, bool forceVisibility); + void setFaultForceVisibilityForGeometryType(RivCellSetEnum geometryType, bool forceVisibility); private: - void createGeometry(ReservoirGeometryCacheType geometryType); - void computeVisibility(cvf::UByteArray* cellVisibility, ReservoirGeometryCacheType geometryType, RigGridBase* grid, size_t gridIdx); + void createGeometry(RivCellSetEnum geometryType); + void computeVisibility(cvf::UByteArray* cellVisibility, RivCellSetEnum geometryType, RigGridBase* grid, size_t gridIdx); void createPropertyFilteredNoneWellCellGeometry(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); - 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 copyByteArray(cvf::UByteArray* cellVisibilities, const cvf::UByteArray* cellIsWellStatuses ); - RivReservoirPartMgr * reservoirPartManager(ReservoirGeometryCacheType geometryType, size_t timeStepIndex ); + RivReservoirPartMgr * reservoirPartManager(RivCellSetEnum geometryType, size_t timeStepIndex ); private: diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index a77e802d62..31467fef36 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -331,7 +331,7 @@ void RimEclipseView::createDisplayModel() if (!this->propertyFilterCollection()->hasActiveFilters()) { - std::vector geometryTypesToAdd; + std::vector geometryTypesToAdd; if (this->rangeFilterCollection()->hasActiveFilters() && this->wellCollection()->hasVisibleWellCells()) { @@ -388,9 +388,9 @@ void RimEclipseView::createDisplayModel() { updateFaultForcedVisibility(); - std::vector faultGeometryTypesToAppend = visibleFaultGeometryTypes(); + std::vector 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) { @@ -478,7 +478,7 @@ void RimEclipseView::updateCurrentTimeStep() { updateLegends(); // To make sure the scalar mappers are set up correctly - std::vector geometriesToRecolor; + std::vector geometriesToRecolor; if (this->propertyFilterCollection()->hasActiveFilters()) { @@ -495,14 +495,14 @@ void RimEclipseView::updateCurrentTimeStep() if (faultCollection()->showFaultsOutsideFilters()) { - std::vector faultGeometryTypesToAppend = visibleFaultGeometryTypes(); + std::vector faultGeometryTypesToAppend = visibleFaultGeometryTypes(); for (size_t i = 0; i < faultGeometryTypesToAppend.size(); 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); } else @@ -753,7 +753,7 @@ void RimEclipseView::updateStaticCellColors(unsigned short geometryType) case RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE: color = cvf::Color4f(cvf::Color3::LIGHT_GRAY); break; } - m_reservoirGridPartManager->updateCellColor(static_cast(geometryType), color); + m_reservoirGridPartManager->updateCellColor(static_cast(geometryType), color); } //-------------------------------------------------------------------------------------------------- @@ -837,7 +837,7 @@ RigActiveCellInfo* RimEclipseView::currentActiveCellInfo() //-------------------------------------------------------------------------------------------------- void RimEclipseView::scheduleGeometryRegen(unsigned short geometryType) { - m_reservoirGridPartManager->scheduleGeometryRegen(static_cast(geometryType)); + m_reservoirGridPartManager->scheduleGeometryRegen(static_cast(geometryType)); } //-------------------------------------------------------------------------------------------------- @@ -1291,9 +1291,9 @@ void RimEclipseView::updateFaultForcedVisibility() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimEclipseView::visibleFaultGeometryTypes() const +std::vector RimEclipseView::visibleFaultGeometryTypes() const { - std::vector faultParts; + std::vector faultParts; if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters()) { @@ -1369,7 +1369,7 @@ std::vector RimEclipseView: void RimEclipseView::updateFaultColors() { // Update all fault geometry - std::vector faultGeometriesToRecolor = visibleFaultGeometryTypes(); + std::vector faultGeometriesToRecolor = visibleFaultGeometryTypes(); RimResultSlot* faultResultSlot = currentFaultResultSlot(); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.h b/ApplicationCode/ProjectDataModel/RimEclipseView.h index 3881714886..5306cf9a4d 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.h @@ -118,7 +118,7 @@ public: void schedulePipeGeometryRegen(); void updateDisplayModelForWellResults(); - const std::vector& + const std::vector& visibleGridParts() const { return m_visibleGridParts;} cvf::cref reservoirGridPartManager() const { return m_reservoirGridPartManager.p(); } @@ -147,7 +147,7 @@ private: virtual void resetLegendsInViewer(); virtual void updateViewerWidgetWindowTitle(); - std::vector + std::vector visibleFaultGeometryTypes() const; void updateFaultForcedVisibility(); void updateFaultColors(); @@ -162,7 +162,7 @@ private: cvf::ref m_reservoirGridPartManager; cvf::ref m_pipesPartManager; - std::vector + std::vector m_visibleGridParts; }; diff --git a/ApplicationCode/ProjectDataModel/RimWell.cpp b/ApplicationCode/ProjectDataModel/RimWell.cpp index ccdc789ef2..164274ef45 100644 --- a/ApplicationCode/ProjectDataModel/RimWell.cpp +++ b/ApplicationCode/ProjectDataModel/RimWell.cpp @@ -182,7 +182,7 @@ bool RimWell::calculateWellPipeVisibility(size_t frameIndex) if (m_reservoirView->wellCollection()->wellPipeVisibility() == RimWellCollection::PIPES_OPEN_IN_VISIBLE_CELLS) { - const std::vector& visGridParts = m_reservoirView->visibleGridParts(); + const std::vector& visGridParts = m_reservoirView->visibleGridParts(); cvf::cref rvMan = m_reservoirView->reservoirGridPartManager(); for (size_t gpIdx = 0; gpIdx < visGridParts.size(); ++gpIdx)