diff --git a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp index 8a308b4883..37997470aa 100644 --- a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp @@ -74,7 +74,7 @@ RimCellEdgeColors::RimCellEdgeColors() m_legendConfig = new RimRegularLegendConfig(); m_ignoredResultScalar = cvf::UNDEFINED_DOUBLE; - resetResultIndices(); + resetResultAddresses(); } //-------------------------------------------------------------------------------------------------- @@ -105,15 +105,15 @@ void RimCellEdgeColors::loadResult() { m_singleVarEdgeResultColors->loadResult();; - RigEclipseResultAddress resultindex = m_singleVarEdgeResultColors->eclipseResultAddress(); + RigEclipseResultAddress resultAddr = m_singleVarEdgeResultColors->eclipseResultAddress(); for (int cubeFaceIdx = 0; cubeFaceIdx < 6; ++cubeFaceIdx) { - m_resultNameToIndexPairs[cubeFaceIdx] = std::make_pair(m_singleVarEdgeResultColors->resultVariable(), resultindex); + m_resultNameToAddressPairs[cubeFaceIdx] = std::make_pair(m_singleVarEdgeResultColors->resultVariable(), resultAddr); } } else { - resetResultIndices(); + resetResultAddresses(); QStringList vars = findResultVariableNames(); updateIgnoredScalarValue(); @@ -132,7 +132,7 @@ void RimCellEdgeColors::loadResult() if (vars[i].endsWith(varEnd)) { - m_resultNameToIndexPairs[cubeFaceIdx] = std::make_pair(vars[i], RigEclipseResultAddress(RiaDefines::STATIC_NATIVE, vars[i])); + m_resultNameToAddressPairs[cubeFaceIdx] = std::make_pair(vars[i], RigEclipseResultAddress(RiaDefines::STATIC_NATIVE, vars[i])); } } } @@ -322,7 +322,7 @@ void RimCellEdgeColors::gridScalarIndices(RigEclipseResultAddress resultIndices[ int cubeFaceIndex; for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex) { - resultIndices[cubeFaceIndex] = RigEclipseResultAddress(m_resultNameToIndexPairs[cubeFaceIndex].second); + resultIndices[cubeFaceIndex] = RigEclipseResultAddress(m_resultNameToAddressPairs[cubeFaceIndex].second); } } @@ -336,7 +336,7 @@ void RimCellEdgeColors::gridScalarResultNames(std::vector* resultNames) int cubeFaceIndex; for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex) { - resultNames->push_back(m_resultNameToIndexPairs[cubeFaceIndex].first); + resultNames->push_back(m_resultNameToAddressPairs[cubeFaceIndex].first); } } @@ -382,12 +382,12 @@ void RimCellEdgeColors::cellEdgeMetaData(std::vector* metaD //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimCellEdgeColors::resetResultIndices() +void RimCellEdgeColors::resetResultAddresses() { int cubeFaceIndex; for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex) { - m_resultNameToIndexPairs[cubeFaceIndex].second = RigEclipseResultAddress(); + m_resultNameToAddressPairs[cubeFaceIndex].second = RigEclipseResultAddress(); } } @@ -407,7 +407,7 @@ bool RimCellEdgeColors::hasResult() const int cubeFaceIndex; for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex) { - hasResult |= m_resultNameToIndexPairs[cubeFaceIndex].second.isValid(); + hasResult |= m_resultNameToAddressPairs[cubeFaceIndex].second.isValid(); } return hasResult; diff --git a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.h b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.h index 2d61307e01..8528d27462 100644 --- a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.h +++ b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.h @@ -107,7 +107,7 @@ protected: QStringList findResultVariableNames(); private: - void resetResultIndices(); + void resetResultAddresses(); void updateIgnoredScalarValue(); void gridScalarResultNames(std::vector* resultNames); @@ -120,7 +120,7 @@ private: caf::PdmField useYVariable; caf::PdmField useZVariable; - std::array, 6> m_resultNameToIndexPairs; + std::array, 6> m_resultNameToAddressPairs; caf::PdmPointer m_reservoirView; double m_ignoredResultScalar;