From 323f8d77eb9454db5b9201b519001432424da335 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 4 Sep 2014 09:14:01 +0200 Subject: [PATCH] Rename --- .../ModelVisualization/RivFaultPartMgr.cpp | 4 ++-- .../ProjectDataModel/Rim3dOverlayInfoConfig.cpp | 4 ++-- .../ProjectDataModel/RimReservoirView.cpp | 14 +++++++------- .../ProjectDataModel/RimResultDefinition.cpp | 6 +++--- .../ProjectDataModel/RimResultDefinition.h | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp index 7e80037e67..0a3c973992 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp @@ -99,7 +99,7 @@ void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* updateNNCColors(cellResultSlot); - size_t scalarSetIndex = cellResultSlot->gridScalarIndex(); + size_t scalarSetIndex = cellResultSlot->scalarResultIndex(); // If the result is static, only read that. size_t resTimeStepIdx = timeStepIndex; @@ -656,7 +656,7 @@ void RivFaultPartMgr::updateNNCColors(RimResultSlot* cellResultSlot) || cellResultSlot->resultVariable() == RimDefines::combinedRiAreaNormTransResultName() )) { - size_t scalarSetIndex = cellResultSlot->gridScalarIndex(); + size_t scalarSetIndex = cellResultSlot->scalarResultIndex(); const cvf::ScalarMapper* mapper = cellResultSlot->legendConfig()->scalarMapper(); diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index 40a464e9f8..501fc2d9e2 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -150,7 +150,7 @@ void Rim3dOverlayInfoConfig::update3DInfo() double min, max; double p10, p90; double mean; - size_t scalarIndex = m_reservoirView->cellResult()->gridScalarIndex(); + size_t scalarIndex = m_reservoirView->cellResult()->scalarResultIndex(); m_reservoirView->currentGridCellResults()->cellResults()->minMaxCellScalarValues(scalarIndex, min, max); m_reservoirView->currentGridCellResults()->cellResults()->p10p90CellScalarValues(scalarIndex, p10, p90); m_reservoirView->currentGridCellResults()->cellResults()->meanCellScalarValues(scalarIndex, mean); @@ -224,7 +224,7 @@ void Rim3dOverlayInfoConfig::update3DInfo() double p10, p90; double mean; - size_t scalarIndex = m_reservoirView->cellResult()->gridScalarIndex(); + size_t scalarIndex = m_reservoirView->cellResult()->scalarResultIndex(); m_reservoirView->currentGridCellResults()->cellResults()->minMaxCellScalarValues(scalarIndex, min, max); m_reservoirView->currentGridCellResults()->cellResults()->p10p90CellScalarValues(scalarIndex, p10, p90); m_reservoirView->currentGridCellResults()->cellResults()->meanCellScalarValues(scalarIndex, mean); diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index 40723dfa28..7c1accee08 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -1354,15 +1354,15 @@ void RimReservoirView::updateMinMaxValuesAndAddLegendToView(QString legendLabel, { double globalMin, globalMax; double globalPosClosestToZero, globalNegClosestToZero; - cellResultsData->minMaxCellScalarValues(resultSlot->gridScalarIndex(), globalMin, globalMax); - cellResultsData->posNegClosestToZero(resultSlot->gridScalarIndex(), globalPosClosestToZero, globalNegClosestToZero); + cellResultsData->minMaxCellScalarValues(resultSlot->scalarResultIndex(), globalMin, globalMax); + cellResultsData->posNegClosestToZero(resultSlot->scalarResultIndex(), globalPosClosestToZero, globalNegClosestToZero); double localMin, localMax; double localPosClosestToZero, localNegClosestToZero; if (resultSlot->hasDynamicResult()) { - cellResultsData->minMaxCellScalarValues(resultSlot->gridScalarIndex(), m_currentTimeStep, localMin, localMax); - cellResultsData->posNegClosestToZero(resultSlot->gridScalarIndex(), m_currentTimeStep, localPosClosestToZero, localNegClosestToZero); + cellResultsData->minMaxCellScalarValues(resultSlot->scalarResultIndex(), m_currentTimeStep, localMin, localMax); + cellResultsData->posNegClosestToZero(resultSlot->scalarResultIndex(), m_currentTimeStep, localPosClosestToZero, localNegClosestToZero); } else { @@ -1820,7 +1820,7 @@ void RimReservoirView::appendNNCResultInfo(size_t nncIndex, QString* resultInfo) cvf::StructGridInterface::FaceEnum face(conn.m_c1Face); // Print result value for the NNC - size_t scalarResultIdx = this->cellResult()->gridScalarIndex(); + size_t scalarResultIdx = this->cellResult()->scalarResultIndex(); const std::vector* nncValues = nncData->connectionScalarResult(scalarResultIdx); if (nncValues) { @@ -2176,12 +2176,12 @@ void RimReservoirView::appendTextFromResultSlot(RigCaseData* eclipseCase, size_t } else { - resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, 0, resultSlot->gridScalarIndex()); + resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, 0, resultSlot->scalarResultIndex()); } } else { - resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultSlot->gridScalarIndex()); + resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultSlot->scalarResultIndex()); } if (resultAccessor.notNull()) diff --git a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp index 5c8507d041..1a5a3bb12b 100644 --- a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp @@ -178,7 +178,7 @@ QList RimResultDefinition::calculateValueOptions(const c //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RimResultDefinition::gridScalarIndex() const +size_t RimResultDefinition::scalarResultIndex() const { size_t gridScalarResultIndex = cvf::UNDEFINED_SIZE_T; @@ -210,7 +210,7 @@ void RimResultDefinition::loadResult() bool RimResultDefinition::hasStaticResult() const { const RimReservoirCellResultsStorage* gridCellResults = this->currentGridCellResults(); - size_t gridScalarResultIndex = this->gridScalarIndex(); + size_t gridScalarResultIndex = this->scalarResultIndex(); if (hasResult() && gridCellResults->cellResults()->timeStepCount(gridScalarResultIndex) == 1 ) { @@ -253,7 +253,7 @@ bool RimResultDefinition::hasDynamicResult() const if (this->currentGridCellResults() && this->currentGridCellResults()->cellResults()) { const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults()->cellResults(); - size_t gridScalarResultIndex = this->gridScalarIndex(); + size_t gridScalarResultIndex = this->scalarResultIndex(); if (gridCellResults->timeStepCount(gridScalarResultIndex) > 1 ) { return true; diff --git a/ApplicationCode/ProjectDataModel/RimResultDefinition.h b/ApplicationCode/ProjectDataModel/RimResultDefinition.h index 462709a898..7af2322a17 100644 --- a/ApplicationCode/ProjectDataModel/RimResultDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimResultDefinition.h @@ -51,7 +51,7 @@ public: virtual void setResultVariable(const QString& val); void loadResult(); - size_t gridScalarIndex() const; + size_t scalarResultIndex() const; bool hasStaticResult() const; bool hasDynamicResult() const; bool hasResult() const;