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

Remove ternary operator (for Linux build)

Browse Source
This commit is contained in:
Rebecca Cox
2017-11-06 09:27:26 +01:00
parent ecc1df5424
commit 61067cbc24
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@@ -486,8 +486,13 @@ void RimWellLogTrack::loadDataAndUpdate()
RimWellRftPlot* rftPlot(nullptr);
firstAncestorOrThisOfType(rftPlot);
RimWellPltPlot* pltPlot;
rftPlot ? pltPlot = nullptr : firstAncestorOrThisOfType(pltPlot);
RimWellPltPlot* pltPlot = nullptr;
if (!rftPlot)
{
firstAncestorOrThisOfType(pltPlot);
}
RimWellAllocationPlot* wellAllocationPlot = nullptr;
if (rftPlot || pltPlot)
{
@@ -524,9 +529,10 @@ void RimWellLogTrack::loadDataAndUpdate()
m_simWellName = wellName;
}
}
RimWellAllocationPlot* wellAllocationPlot;
(rftPlot || pltPlot) ? wellAllocationPlot = nullptr : firstAncestorOrThisOfType(wellAllocationPlot);
else
{
firstAncestorOrThisOfType(wellAllocationPlot);
}
if (wellAllocationPlot)
{
@@ -544,7 +550,6 @@ void RimWellLogTrack::loadDataAndUpdate()
}
}
updateFormationNamesOnPlot();
}