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

#3958 Refactor: Simple renaming

Browse Source
This commit is contained in:
Jacob Støren 2019-01-25 16:15:27 +01:00
parent 3e3d3871ed
commit c159dfb763
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@ -74,7 +74,7 @@ RimCellEdgeColors::RimCellEdgeColors()
m_legendConfig = new RimRegularLegendConfig(); m_legendConfig = new RimRegularLegendConfig();
m_ignoredResultScalar = cvf::UNDEFINED_DOUBLE; m_ignoredResultScalar = cvf::UNDEFINED_DOUBLE;
resetResultIndices(); resetResultAddresses();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -105,15 +105,15 @@ void RimCellEdgeColors::loadResult()
{ {
m_singleVarEdgeResultColors->loadResult();; m_singleVarEdgeResultColors->loadResult();;
RigEclipseResultAddress resultindex = m_singleVarEdgeResultColors->eclipseResultAddress(); RigEclipseResultAddress resultAddr = m_singleVarEdgeResultColors->eclipseResultAddress();
for (int cubeFaceIdx = 0; cubeFaceIdx < 6; ++cubeFaceIdx) 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 else
{ {
resetResultIndices(); resetResultAddresses();
QStringList vars = findResultVariableNames(); QStringList vars = findResultVariableNames();
updateIgnoredScalarValue(); updateIgnoredScalarValue();
@ -132,7 +132,7 @@ void RimCellEdgeColors::loadResult()
if (vars[i].endsWith(varEnd)) 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; int cubeFaceIndex;
for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++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<QString>* resultNames)
int cubeFaceIndex; int cubeFaceIndex;
for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++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<RimCellEdgeMetaData>* metaD
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellEdgeColors::resetResultIndices() void RimCellEdgeColors::resetResultAddresses()
{ {
int cubeFaceIndex; int cubeFaceIndex;
for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++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; int cubeFaceIndex;
for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex) for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex)
{ {
hasResult |= m_resultNameToIndexPairs[cubeFaceIndex].second.isValid(); hasResult |= m_resultNameToAddressPairs[cubeFaceIndex].second.isValid();
} }
return hasResult; return hasResult;

4
ApplicationCode/ProjectDataModel/RimCellEdgeColors.h
View File

@ -107,7 +107,7 @@ protected:
QStringList findResultVariableNames(); QStringList findResultVariableNames();
private: private:
void resetResultIndices(); void resetResultAddresses();
void updateIgnoredScalarValue(); void updateIgnoredScalarValue();
void gridScalarResultNames(std::vector<QString>* resultNames); void gridScalarResultNames(std::vector<QString>* resultNames);
@ -120,7 +120,7 @@ private:
caf::PdmField<bool> useYVariable; caf::PdmField<bool> useYVariable;
caf::PdmField<bool> useZVariable; caf::PdmField<bool> useZVariable;
std::array<std::pair<QString, RigEclipseResultAddress>, 6> m_resultNameToIndexPairs; std::array<std::pair<QString, RigEclipseResultAddress>, 6> m_resultNameToAddressPairs;
caf::PdmPointer<RimEclipseView> m_reservoirView; caf::PdmPointer<RimEclipseView> m_reservoirView;
double m_ignoredResultScalar; double m_ignoredResultScalar;