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

#3694 Stimplan : Add support for effective width using unit mm

Browse Source
This commit is contained in:
Magne Sjaastad
2018-11-19 10:39:15 +01:00
parent 8c521b1775
commit bab90456c7
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/Application/Tools/RiaEclipseUnitTools.cpp
View File

@@ -139,6 +139,10 @@ double RiaEclipseUnitTools::convertToMeter(double sourceValue, const QString& so
{ {
return sourceValue / 100.0; return sourceValue / 100.0;
} }
else if (timmed.compare("mm", Qt::CaseInsensitive) == 0)
{
return sourceValue / 1000.0;
}
else if (timmed.compare("in", Qt::CaseInsensitive) == 0) else if (timmed.compare("in", Qt::CaseInsensitive) == 0)
{ {
return RiaEclipseUnitTools::inchToMeter(sourceValue); return RiaEclipseUnitTools::inchToMeter(sourceValue);
@@ -171,6 +175,11 @@ double RiaEclipseUnitTools::convertToFeet(double sourceValue, const QString& sou
double meter = sourceValue / 100.0; double meter = sourceValue / 100.0;
return RiaEclipseUnitTools::meterToFeet(meter); return RiaEclipseUnitTools::meterToFeet(meter);
} }
else if (timmed.compare("mm", Qt::CaseInsensitive) == 0)
{
double meter = sourceValue / 1000.0;
return RiaEclipseUnitTools::meterToFeet(meter);
}
else if (timmed.compare("m", Qt::CaseInsensitive) == 0 || timmed.compare("md-m", Qt::CaseInsensitive) == 0) else if (timmed.compare("m", Qt::CaseInsensitive) == 0 || timmed.compare("md-m", Qt::CaseInsensitive) == 0)
{ {
return RiaEclipseUnitTools::meterToFeet(sourceValue); return RiaEclipseUnitTools::meterToFeet(sourceValue);

7
ApplicationCode/UnitTests/RiaEclipseUnitTools-Test.cpp
View File

@@ -37,6 +37,13 @@ TEST(RiaEclipseUnitTools, TestConversionToMeter)
double destValue = RiaEclipseUnitTools::convertToMeter(sourceValue, unitText); double destValue = RiaEclipseUnitTools::convertToMeter(sourceValue, unitText);
EXPECT_NEAR(1.0, destValue, deltaRange); EXPECT_NEAR(1.0, destValue, deltaRange);
} }
{
double sourceValue = 123.0;
QString unitText = "mm";
double destValue = RiaEclipseUnitTools::convertToMeter(sourceValue, unitText);
EXPECT_NEAR(0.123, destValue, deltaRange);
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------