From 09011862cd67fecfc77883a572690bb7c74a1df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 23 Jan 2019 14:24:12 +0100 Subject: [PATCH] #3958 Refactoreing: Rename --- .../ModelVisualization/RivFaultPartMgr.cpp | 4 ++-- .../ModelVisualization/RivReservoirFaultsPartMgr.cpp | 4 ++-- .../ProjectDataModel/Rim3dOverlayInfoConfig.cpp | 4 ++-- .../ProjectDataModel/RimCellEdgeColors.cpp | 2 +- .../ProjectDataModel/RimEclipseCellColors.cpp | 12 ++++++------ .../RimEclipseContourMapProjection.cpp | 2 +- .../ProjectDataModel/RimEclipsePropertyFilter.cpp | 2 +- .../ProjectDataModel/RimEclipseResultDefinition.cpp | 6 +++--- .../ProjectDataModel/RimEclipseResultDefinition.h | 2 +- ApplicationCode/ProjectDataModel/RimEclipseView.cpp | 2 +- .../UserInterface/RiuResultTextBuilder.cpp | 6 +++--- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp index 2e0fecc935..adc7804978 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp @@ -691,7 +691,7 @@ void RivFaultPartMgr::updateNNCColors(size_t timeStepIndex, RimEclipseCellColors if (cellResultColors) { - RigEclipseResultAddress scalarSetIndex = cellResultColors->scalarResultIndex(); + RigEclipseResultAddress scalarSetIndex = cellResultColors->eclipseResultAddress(); if (m_grid->mainGrid()->nncData()->hasScalarValues(scalarSetIndex.scalarResultIndex)) { @@ -702,7 +702,7 @@ void RivFaultPartMgr::updateNNCColors(size_t timeStepIndex, RimEclipseCellColors if (showNncsWithScalarMappedColor) { - RigEclipseResultAddress scalarSetIndex = cellResultColors->scalarResultIndex(); + RigEclipseResultAddress scalarSetIndex = cellResultColors->eclipseResultAddress(); RiaDefines::ResultCatType resultType = cellResultColors->resultType(); const cvf::ScalarMapper* mapper = cellResultColors->legendConfig()->scalarMapper(); diff --git a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp index 4f9f226850..c26795bf81 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp @@ -162,11 +162,11 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model) RigEclipseResultAddress scalarResultIndex; if (faultResultColors->showCustomFaultResult()) { - scalarResultIndex = faultResultColors->customFaultResult()->scalarResultIndex(); + scalarResultIndex = faultResultColors->customFaultResult()->eclipseResultAddress(); } else { - scalarResultIndex = cellResultColors->scalarResultIndex(); + scalarResultIndex = cellResultColors->eclipseResultAddress(); } RigMainGrid* mainGrid = m_reservoirView->mainGrid(); diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index 9806d720b1..d1504f3d31 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -337,7 +337,7 @@ Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimE if (isResultsInfoRelevant) { - RigEclipseResultAddress eclResAddr = eclipseView->cellResult()->scalarResultIndex(); + RigEclipseResultAddress eclResAddr = eclipseView->cellResult()->eclipseResultAddress(); if (eclResAddr.isValid()) { @@ -1095,7 +1095,7 @@ void Rim3dOverlayInfoConfig::updateVisCellStatsIfNeeded() } else { - RigEclipseResultAddress scalarIndex = eclipseView->cellResult()->scalarResultIndex(); + RigEclipseResultAddress scalarIndex = eclipseView->cellResult()->eclipseResultAddress(); calc = new RigEclipseNativeVisibleCellsStatCalc(eclipseView->currentGridCellResults(), scalarIndex, eclipseView->currentTotalCellVisibility().p()); diff --git a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp index d10558d447..67f1f1f12b 100644 --- a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp @@ -105,7 +105,7 @@ void RimCellEdgeColors::loadResult() { m_singleVarEdgeResultColors->loadResult();; - RigEclipseResultAddress resultindex = m_singleVarEdgeResultColors->scalarResultIndex(); + RigEclipseResultAddress resultindex = m_singleVarEdgeResultColors->eclipseResultAddress(); for (int cubeFaceIdx = 0; cubeFaceIdx < 6; ++cubeFaceIdx) { m_resultNameToIndexPairs[cubeFaceIdx] = std::make_pair(m_singleVarEdgeResultColors->resultVariable(), resultindex); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp index 8c0de92f75..939c997a89 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp @@ -361,15 +361,15 @@ void RimEclipseCellColors::updateLegendData(size_t currentTimeStep, double globalMin, globalMax; double globalPosClosestToZero, globalNegClosestToZero; - cellResultsData->minMaxCellScalarValues(this->scalarResultIndex(), globalMin, globalMax); - cellResultsData->posNegClosestToZero(this->scalarResultIndex(), globalPosClosestToZero, globalNegClosestToZero); + cellResultsData->minMaxCellScalarValues(this->eclipseResultAddress(), globalMin, globalMax); + cellResultsData->posNegClosestToZero(this->eclipseResultAddress(), globalPosClosestToZero, globalNegClosestToZero); double localMin, localMax; double localPosClosestToZero, localNegClosestToZero; if ( this->hasDynamicResult() ) { - cellResultsData->minMaxCellScalarValues(this->scalarResultIndex(), currentTimeStep, localMin, localMax); - cellResultsData->posNegClosestToZero(this->scalarResultIndex(), currentTimeStep, localPosClosestToZero, localNegClosestToZero); + cellResultsData->minMaxCellScalarValues(this->eclipseResultAddress(), currentTimeStep, localMin, localMax); + cellResultsData->posNegClosestToZero(this->eclipseResultAddress(), currentTimeStep, localPosClosestToZero, localNegClosestToZero); } else { @@ -395,7 +395,7 @@ void RimEclipseCellColors::updateLegendData(size_t currentTimeStep, } else if ( this->resultType() == RiaDefines::DYNAMIC_NATIVE && this->resultVariable() == RiaDefines::completionTypeResultName() ) { - const std::vector& visibleCategories = cellResultsData->uniqueCellScalarValues(this->scalarResultIndex()); + const std::vector& visibleCategories = cellResultsData->uniqueCellScalarValues(this->eclipseResultAddress()); std::vector supportedCompletionTypes = { RiaDefines::WELL_PATH, RiaDefines::FISHBONES, RiaDefines::PERFORATION_INTERVAL, RiaDefines::FRACTURE }; @@ -416,7 +416,7 @@ void RimEclipseCellColors::updateLegendData(size_t currentTimeStep, } else { - legendConfig->setIntegerCategories(cellResultsData->uniqueCellScalarValues(this->scalarResultIndex())); + legendConfig->setIntegerCategories(cellResultsData->uniqueCellScalarValues(this->eclipseResultAddress())); } } } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp b/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp index a4beed252d..214db10b90 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp @@ -324,7 +324,7 @@ std::vector RimEclipseContourMapProjection::retrieveParameterWeights() std::vector weights; if (m_weightByParameter()) { - RigEclipseResultAddress gridScalarResultIdx = m_weightingResult->scalarResultIndex(); + RigEclipseResultAddress gridScalarResultIdx = m_weightingResult->eclipseResultAddress(); if (gridScalarResultIdx.isValid()) { m_weightingResult->loadResult(); diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp index 42b9c9a57f..b79dfd4786 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp @@ -372,7 +372,7 @@ void RimEclipsePropertyFilter::computeResultValueRange() } else { - RigEclipseResultAddress scalarIndex = resultDefinition->scalarResultIndex(); + RigEclipseResultAddress scalarIndex = resultDefinition->eclipseResultAddress(); if ( scalarIndex.isValid() ) { RigCaseCellResultsData* results = resultDefinition->currentGridCellResults(); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index b264248397..de81b1f9d0 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -625,7 +625,7 @@ QList RimEclipseResultDefinition::calculateValueOptions( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigEclipseResultAddress RimEclipseResultDefinition::scalarResultIndex() const +RigEclipseResultAddress RimEclipseResultDefinition::eclipseResultAddress() const { size_t gridScalarResultIndex = cvf::UNDEFINED_SIZE_T; @@ -786,7 +786,7 @@ bool RimEclipseResultDefinition::hasStaticResult() const if (isFlowDiagOrInjectionFlooding()) return false; const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); - RigEclipseResultAddress gridScalarResultIndex = this->scalarResultIndex(); + RigEclipseResultAddress gridScalarResultIndex = this->eclipseResultAddress(); if (hasResult() && gridCellResults->timeStepCount(gridScalarResultIndex) == 1 ) { @@ -845,7 +845,7 @@ bool RimEclipseResultDefinition::hasDynamicResult() const if (this->currentGridCellResults()) { const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); - RigEclipseResultAddress gridScalarResultIndex = this->scalarResultIndex(); + RigEclipseResultAddress gridScalarResultIndex = this->eclipseResultAddress(); if (gridCellResults->timeStepCount(gridScalarResultIndex) > 1 ) { return true; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h index 7c6a578885..cf14079d08 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h @@ -94,7 +94,7 @@ public: QString resultVariableUiShortName() const; void loadResult(); - RigEclipseResultAddress scalarResultIndex() const; + RigEclipseResultAddress eclipseResultAddress() const; bool hasStaticResult() const; bool hasDynamicResult() const; bool hasResult() const; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index bb338c6113..ebd058d36d 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -1152,7 +1152,7 @@ void RimEclipseView::updateLegends() { if (cellEdgeResult()->singleVarEdgeResultColors()->resultType() != RiaDefines::FORMATION_NAMES) { - cellEdgeResult()->legendConfig()->setIntegerCategories(results->uniqueCellScalarValues(cellEdgeResult()->singleVarEdgeResultColors()->scalarResultIndex())); + cellEdgeResult()->legendConfig()->setIntegerCategories(results->uniqueCellScalarValues(cellEdgeResult()->singleVarEdgeResultColors()->eclipseResultAddress())); } else { diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp index ebadc93111..501a0b3859 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp @@ -424,19 +424,19 @@ QString RiuResultTextBuilder::nncResultText() if (m_reservoirView->currentFaultResultColors()) { - RigEclipseResultAddress scalarResultIdx = m_reservoirView->currentFaultResultColors()->scalarResultIndex(); + RigEclipseResultAddress eclipseResultAddress = m_reservoirView->currentFaultResultColors()->eclipseResultAddress(); RiaDefines::ResultCatType resultType = m_reservoirView->currentFaultResultColors()->resultType(); const std::vector* nncValues = nullptr; if (resultType == RiaDefines::STATIC_NATIVE) { - nncValues = nncData->staticConnectionScalarResult(scalarResultIdx.scalarResultIndex); + nncValues = nncData->staticConnectionScalarResult(eclipseResultAddress.scalarResultIndex); } else if (resultType == RiaDefines::DYNAMIC_NATIVE) { if (m_reservoirView.notNull() && m_reservoirView->eclipseCase()) { size_t nativeTimeStep = m_reservoirView->eclipseCase()->uiToNativeTimeStepIndex(m_timeStepIndex); - nncValues = nncData->dynamicConnectionScalarResult(scalarResultIdx.scalarResultIndex, nativeTimeStep); + nncValues = nncData->dynamicConnectionScalarResult(eclipseResultAddress.scalarResultIndex, nativeTimeStep); } } if (nncValues && (m_nncIndex < nncValues->size()))