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

Janitor : Several fixes by clang-tidy and use of clang compiler

Browse Source
This commit is contained in:
Magne Sjaastad
2021-04-05 18:18:34 +02:00
parent b01569869a
commit d754ef4705
36 changed files with 185 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp
View File

@@ -337,18 +337,20 @@ QList<caf::PdmOptionItemInfo>
if ( !caf::Utils::isStringMatch( m_tracerFilter, tracerName ) ) continue;
RimFlowDiagSolution::TracerStatusType tracerStatus = m_flowDiagSolution->tracerStatusOverall( tracerName );
if ( tracerStatus == RimFlowDiagSolution::CLOSED ) continue;
if ( tracerStatus == RimFlowDiagSolution::TracerStatusType::CLOSED ) continue;
if ( m_cellFilter() == RigFlowDiagResults::CELLS_FLOODED )
{
if ( tracerStatus == RimFlowDiagSolution::INJECTOR || tracerStatus == RimFlowDiagSolution::VARYING )
if ( tracerStatus == RimFlowDiagSolution::TracerStatusType::INJECTOR ||
tracerStatus == RimFlowDiagSolution::TracerStatusType::VARYING )
{
sortedTracerNames.push_back( std::make_pair( tracerName, tracerName ) );
}
}
else if ( m_cellFilter() == RigFlowDiagResults::CELLS_DRAINED )
{
if ( tracerStatus == RimFlowDiagSolution::PRODUCER || tracerStatus == RimFlowDiagSolution::VARYING )
if ( tracerStatus == RimFlowDiagSolution::TracerStatusType::PRODUCER ||
tracerStatus == RimFlowDiagSolution::TracerStatusType::VARYING )
{
sortedTracerNames.push_back( std::make_pair( tracerName, tracerName ) );
}
@@ -358,16 +360,16 @@ QList<caf::PdmOptionItemInfo>
QString prefix;
switch ( tracerStatus )
{
case RimFlowDiagSolution::INJECTOR:
case RimFlowDiagSolution::TracerStatusType::INJECTOR:
prefix = "I : ";
break;
case RimFlowDiagSolution::PRODUCER:
case RimFlowDiagSolution::TracerStatusType::PRODUCER:
prefix = "P : ";
break;
case RimFlowDiagSolution::VARYING:
case RimFlowDiagSolution::TracerStatusType::VARYING:
prefix = "I/P: ";
break;
case RimFlowDiagSolution::UNDEFINED:
case RimFlowDiagSolution::TracerStatusType::UNDEFINED:
prefix = "U : ";
break;
}