OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2019-03-29 12:53:11 +01:00
parent c5f2b2bca9
commit b08271b982
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -1461,11 +1461,11 @@ QString RimEclipseResultDefinition::flowDiagResUiText(bool shortLabel, int maxTr
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> QList<caf::PdmOptionItemInfo>
RimEclipseResultDefinition::calcOptionsForVariableUiFieldStandard(RiaDefines::ResultCatType resultCatType, RimEclipseResultDefinition::calcOptionsForVariableUiFieldStandard(RiaDefines::ResultCatType resultCatType,
const RigCaseCellResultsData* results, const RigCaseCellResultsData* results,
bool showDerivedResultsFirst, bool showDerivedResultsFirst,
bool addPerCellFaceOptionItems, bool addPerCellFaceOptionItems,
bool ternaryEnabled) bool ternaryEnabled)
{ {
CVF_ASSERT(resultCatType != RiaDefines::FLOW_DIAGNOSTICS && resultCatType != RiaDefines::INJECTION_FLOODING); CVF_ASSERT(resultCatType != RiaDefines::FLOW_DIAGNOSTICS && resultCatType != RiaDefines::INJECTION_FLOODING);
@ -1476,7 +1476,7 @@ RimEclipseResultDefinition::calcOptionsForVariableUiFieldStandard(RiaDefines::Re
QStringList cellCenterResultNames; QStringList cellCenterResultNames;
QStringList cellFaceResultNames; QStringList cellFaceResultNames;
for (QString s : getResultNamesForResultType(resultCatType, results)) for (const QString& s : getResultNamesForResultType(resultCatType, results))
{ {
if (s == RiaDefines::completionTypeResultName()) if (s == RiaDefines::completionTypeResultName())
{ {
@ -1497,7 +1497,7 @@ RimEclipseResultDefinition::calcOptionsForVariableUiFieldStandard(RiaDefines::Re
cellFaceResultNames.sort(); cellFaceResultNames.sort();
// Cell Center result names // Cell Center result names
for (QString s : cellCenterResultNames) for (const QString& s : cellCenterResultNames)
{ {
optionList.push_back(caf::PdmOptionItemInfo(s, s)); optionList.push_back(caf::PdmOptionItemInfo(s, s));
} }
@ -1516,13 +1516,12 @@ RimEclipseResultDefinition::calcOptionsForVariableUiFieldStandard(RiaDefines::Re
if (resultCatType == RiaDefines::DYNAMIC_NATIVE && hasAtLeastOneTernaryComponent) if (resultCatType == RiaDefines::DYNAMIC_NATIVE && hasAtLeastOneTernaryComponent)
{ {
optionList.push_front( optionList.push_front(
caf::PdmOptionItemInfo(RiaDefines::ternarySaturationResultName(), caf::PdmOptionItemInfo(RiaDefines::ternarySaturationResultName(), RiaDefines::ternarySaturationResultName()));
RiaDefines::ternarySaturationResultName()));
} }
} }
if (addPerCellFaceOptionItems) if (addPerCellFaceOptionItems)
{ {
for (QString s : cellFaceResultNames) for (const QString& s : cellFaceResultNames)
{ {
if (showDerivedResultsFirst) if (showDerivedResultsFirst)
{ {
@ -1707,7 +1706,8 @@ QString RimEclipseResultDefinition::selectedTracersString() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QStringList RimEclipseResultDefinition::getResultNamesForResultType(RiaDefines::ResultCatType resultCatType, const RigCaseCellResultsData* results) QStringList RimEclipseResultDefinition::getResultNamesForResultType(RiaDefines::ResultCatType resultCatType,
const RigCaseCellResultsData* results)
{ {
if (resultCatType != RiaDefines::FLOW_DIAGNOSTICS) if (resultCatType != RiaDefines::FLOW_DIAGNOSTICS)
{ {
@ -1959,8 +1959,8 @@ bool RimEclipseResultDefinition::isCaseDiffResult() const
bool RimEclipseResultDefinition::showDerivedResultsFirstInVariableUiField() const bool RimEclipseResultDefinition::showDerivedResultsFirstInVariableUiField() const
{ {
// Cell Face result names // Cell Face result names
bool showDerivedResultsFirstInList = false; bool showDerivedResultsFirstInList = false;
RimEclipseFaultColors* rimEclipseFaultColors = nullptr; RimEclipseFaultColors* rimEclipseFaultColors = nullptr;
this->firstAncestorOrThisOfType(rimEclipseFaultColors); this->firstAncestorOrThisOfType(rimEclipseFaultColors);
if (rimEclipseFaultColors) showDerivedResultsFirstInList = true; if (rimEclipseFaultColors) showDerivedResultsFirstInList = true;