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

#2969 Add const to currentActiveCellInfo

Browse Source
This commit is contained in:
Magne Sjaastad
2018-05-30 10:22:45 +02:00
parent 76c24a5c8d
commit 54f5ab66b4
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@@ -298,7 +298,7 @@ void RivReservoirViewPartMgr::createGeometry(RivCellSetEnum geometryType)
void RivReservoirViewPartMgr::computeVisibility(cvf::UByteArray* cellVisibility, RivCellSetEnum geometryType, RigGridBase* grid, size_t gridIdx)
{
RigEclipseCaseData* eclipseCase = m_reservoirView->eclipseCase()->eclipseCaseData();
RigActiveCellInfo* activeCellInfo = m_reservoirView->currentActiveCellInfo();
auto activeCellInfo = m_reservoirView->currentActiveCellInfo();
switch (geometryType)
{

4
ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
View File

@@ -151,7 +151,7 @@ void RimCellRangeFilter::setDefaultValues()
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfTypeAsserted(rimView);
RigActiveCellInfo* actCellInfo = RigReservoirGridTools::activeCellInfo(rimView);
auto actCellInfo = RigReservoirGridTools::activeCellInfo(rimView);
RimCase* rimCase = nullptr;
this->firstAncestorOrThisOfTypeAsserted(rimCase);
@@ -252,7 +252,7 @@ void RimCellRangeFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfTypeAsserted(rimView);
RigActiveCellInfo* actCellInfo = RigReservoirGridTools::activeCellInfo(rimView);
auto actCellInfo = RigReservoirGridTools::activeCellInfo(rimView);
if (grid == mainGrid && actCellInfo)
{

4
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -954,7 +954,7 @@ RigCaseCellResultsData* RimEclipseView::currentGridCellResults()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigActiveCellInfo* RimEclipseView::currentActiveCellInfo()
const RigActiveCellInfo* RimEclipseView::currentActiveCellInfo() const
{
if (m_eclipseCase &&
m_eclipseCase->eclipseCaseData()
@@ -1270,7 +1270,7 @@ void RimEclipseView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibleC
}
visibleCells->setAll(false);
RigActiveCellInfo* activeCellInfo = this->currentActiveCellInfo();
const RigActiveCellInfo* activeCellInfo = this->currentActiveCellInfo();
CVF_ASSERT(activeCellInfo);

2
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@@ -99,7 +99,7 @@ public:
void setOverridePropertyFilterCollection(RimEclipsePropertyFilterCollection* pfc);
RigCaseCellResultsData* currentGridCellResults();
RigActiveCellInfo* currentActiveCellInfo();
const RigActiveCellInfo* currentActiveCellInfo() const;
RimEclipseCellColors* currentFaultResultColors();
void setEclipseCase(RimEclipseCase* reservoir);

2
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp
View File

@@ -175,7 +175,7 @@ void RimMultiSnapshotDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
else if (changedField == &sliceDirection)
{
const cvf::StructGridInterface* mainGrid = nullptr;
RigActiveCellInfo* actCellInfo = nullptr;
const RigActiveCellInfo* actCellInfo = nullptr;
if (view())
{

2
ApplicationCode/ReservoirDataModel/RigReservoirGridTools.cpp
View File

@@ -103,7 +103,7 @@ QString RigReservoirGridTools::gridName(RimCase* rimCase, int gridIndex)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigActiveCellInfo* RigReservoirGridTools::activeCellInfo(Rim3dView* rimView)
const RigActiveCellInfo* RigReservoirGridTools::activeCellInfo(Rim3dView* rimView)
{
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>(rimView);
if (eclipseView)

2
ApplicationCode/ReservoirDataModel/RigReservoirGridTools.h
View File

@@ -43,7 +43,7 @@ public:
static const cvf::StructGridInterface* gridByIndex(RimCase* rimCase, int gridIndex);
static QString gridName(RimCase* rimCase, int gridIndex);
static RigActiveCellInfo* activeCellInfo(Rim3dView* rimView);
static const RigActiveCellInfo* activeCellInfo(Rim3dView* rimView);
private:
static RigMainGrid* eclipseMainGrid(RimCase* rimCase);