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

Convert to enum class

Browse Source
This commit is contained in:
Magne Sjaastad
2020-04-24 08:10:48 +02:00
parent e85c36b4a4
commit 95fc63fe7c
76 changed files with 363 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/Completions/RimWellPathValve.cpp
View File

@@ -232,9 +232,9 @@ double RimWellPathValve::convertOrificeDiameter( double
RiaEclipseUnitTools::UnitSystem wellPathUnits,
RiaEclipseUnitTools::UnitSystem unitSystem )
{
if ( unitSystem == RiaEclipseUnitTools::UNITS_METRIC )
if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
if ( wellPathUnits == RiaEclipseUnitTools::UNITS_FIELD )
if ( wellPathUnits == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::inchToMeter( orificeDiameterWellPathUnits );
}
@@ -243,9 +243,9 @@ double RimWellPathValve::convertOrificeDiameter( double
return RiaEclipseUnitTools::mmToMeter( orificeDiameterWellPathUnits );
}
}
else if ( unitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( unitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
if ( wellPathUnits == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPathUnits == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::meterToFeet( RiaEclipseUnitTools::mmToMeter( orificeDiameterWellPathUnits ) );
}
@@ -504,11 +504,11 @@ void RimWellPathValve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin
firstAncestorOrThisOfType( wellPath );
if ( wellPath )
{
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_METRIC )
if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_measuredDepth.uiCapability()->setUiName( "Measured Depth [m]" );
}
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( wellPath->unitSystem() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
m_measuredDepth.uiCapability()->setUiName( "Measured Depth [ft]" );
}