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

Removed fvector and replaced with FixedArray.

Browse Source 
Needs replacing with std::array when we get to c++11
This commit is contained in:
Jacob Støren
2014-08-07 15:53:05 +02:00
committed by Magne Sjaastad
parent 0f26b6e22f
commit 7a3d90daa4
4 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp
View File

@@ -144,7 +144,7 @@ QList<caf::PdmOptionItemInfo> RimCellEdgeResultSlot::calculateValueOptions(const
QList<caf::PdmOptionItemInfo> optionList;
std::map<QString, caf::fvector<QString, 6> > varBaseNameToVarsMap;
std::map<QString, caf::FixedArray<QString, 6> > varBaseNameToVarsMap;
int i;
for (i = 0; i < varList.size(); ++i)
@@ -164,7 +164,7 @@ QList<caf::PdmOptionItemInfo> RimCellEdgeResultSlot::calculateValueOptions(const
}
}
std::map<QString, caf::fvector<QString, 6> >::iterator it;
std::map<QString, caf::FixedArray<QString, 6> >::iterator it;
for (it = varBaseNameToVarsMap.begin(); it != varBaseNameToVarsMap.end(); ++it)
{
@@ -174,16 +174,16 @@ QList<caf::PdmOptionItemInfo> RimCellEdgeResultSlot::calculateValueOptions(const
bool firstText = true;
for (cubeFaceIdx = 0; cubeFaceIdx < 6; ++cubeFaceIdx)
{
if (!it->second.v[cubeFaceIdx].isEmpty())
if (!it->second[cubeFaceIdx].isEmpty())
{
if (firstText)
{
optionUiName += it->second.v[cubeFaceIdx];
optionUiName += it->second[cubeFaceIdx];
firstText = false;
}
else
{
optionUiName += QString(", ") + it->second.v[cubeFaceIdx];
optionUiName += QString(", ") + it->second[cubeFaceIdx];
}
}
}