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

Use index to map to EQUILNUM

Browse Source
This commit is contained in:
Magne Sjaastad
2019-03-14 18:27:32 +01:00
parent 75688703d4
commit 78940795a8
3 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.cpp
View File

@@ -164,10 +164,10 @@ QList<caf::PdmOptionItemInfo> RimPlotAxisAnnotation::calculateValueOptions(const
}
else if (fieldNeedingOptions == &m_equilNum)
{
for (const auto& eq : equilItems())
for (int i = 0; i < equilItems().size(); i++)
{
QString uiText = QString("%1").arg(eq.liveOilInitConstantRs());
options.push_back(caf::PdmOptionItemInfo(uiText, eq.liveOilInitConstantRs()));
QString uiText = QString("%1").arg(i+1);
options.push_back(caf::PdmOptionItemInfo(uiText, i));
}
}
@@ -200,12 +200,11 @@ void RimPlotAxisAnnotation::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
//--------------------------------------------------------------------------------------------------
RigEquil RimPlotAxisAnnotation::selectedItem() const
{
for (auto eq : equilItems())
int index = m_equilNum() -1;
if (index < equilItems().size())
{
if (eq.liveOilInitConstantRs() == m_equilNum())
{
return eq;
}
return equilItems()[index];
}
return RigEquil::defaultObject();