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 : Use class enum

Browse Source
This commit is contained in:
Magne Sjaastad
2020-08-14 10:41:01 +02:00
parent 07c778280b
commit 523cdc2b7d
22 changed files with 181 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp
View File

@@ -56,7 +56,7 @@ RimTernaryLegendConfig::RimTernaryLegendConfig()
"" );
CAF_PDM_InitField( &rangeMode,
"RangeType",
RangeModeEnum( USER_DEFINED ),
RangeModeEnum( RangeModeType::USER_DEFINED ),
"Range type",
"",
"Switches between automatic and user defined range on the legend",
@@ -299,7 +299,7 @@ void RimTernaryLegendConfig::defineUiOrdering( QString uiConfigName, caf::PdmUiO
formatGr->add( &precision );
formatGr->add( &rangeMode );
if ( rangeMode == USER_DEFINED )
if ( rangeMode == RangeModeType::USER_DEFINED )
{
caf::PdmUiOrdering* ternaryGroupContainer = uiOrdering.addNewGroup( "Ternary " );
{
@@ -392,7 +392,7 @@ void RimTernaryLegendConfig::ternaryRanges( double& soilLower,
double& swatLower,
double& swatUpper ) const
{
if ( rangeMode() == AUTOMATIC_CURRENT_TIMESTEP )
if ( rangeMode() == RangeModeType::AUTOMATIC_CURRENT_TIMESTEP )
{
soilLower = m_localAutoMin[TERNARY_SOIL_IDX];
soilUpper = m_localAutoMax[TERNARY_SOIL_IDX];
@@ -401,7 +401,7 @@ void RimTernaryLegendConfig::ternaryRanges( double& soilLower,
swatLower = m_localAutoMin[TERNARY_SWAT_IDX];
swatUpper = m_localAutoMax[TERNARY_SWAT_IDX];
}
else if ( rangeMode() == AUTOMATIC_ALLTIMESTEPS )
else if ( rangeMode() == RangeModeType::AUTOMATIC_ALLTIMESTEPS )
{
soilLower = m_globalAutoMin[TERNARY_SOIL_IDX];
soilUpper = m_globalAutoMax[TERNARY_SOIL_IDX];
@@ -477,7 +477,7 @@ void RimTernaryLegendConfig::updateLabelText()
}
}
if ( rangeMode == AUTOMATIC_ALLTIMESTEPS )
if ( rangeMode == RangeModeType::AUTOMATIC_ALLTIMESTEPS )
{
QString tmpString;
tmpString = QString( "SOIL : " ) + QString::number( m_globalAutoMin[TERNARY_SOIL_IDX], 'g', precision ) +
@@ -489,7 +489,7 @@ void RimTernaryLegendConfig::updateLabelText()
ternaryRangeSummary = tmpString;
}
else if ( rangeMode == AUTOMATIC_CURRENT_TIMESTEP )
else if ( rangeMode == RangeModeType::AUTOMATIC_CURRENT_TIMESTEP )
{
QString tmpString;
tmpString = QString( "SOIL : " ) + QString::number( m_localAutoMin[TERNARY_SOIL_IDX], 'g', precision ) + " - " +