#1573 Created own unit system class

This commit is contained in:
Bjørnar Grip Fjær
2017-06-06 14:57:32 +02:00
parent 7628719620
commit f1b4b735ff
6 changed files with 79 additions and 29 deletions

View File

@@ -21,6 +21,8 @@
#include "RigCurveDataTools.h"
#include "RimUnitSystem.h"
#include "cvfMath.h"
#include "cvfAssert.h"
@@ -366,7 +368,7 @@ std::vector<double> RigWellLogCurveData::convertFromMeterToFeet(const std::vecto
for (size_t i = 0; i < valuesInMeter.size(); i++)
{
valuesInFeet[i] = valuesInMeter[i] * RimDefines::feetPerMeter();
valuesInFeet[i] = valuesInMeter[i] * RimUnitSystem::feetPerMeter();
}
return valuesInFeet;
@@ -381,7 +383,7 @@ std::vector<double> RigWellLogCurveData::convertFromFeetToMeter(const std::vecto
for (size_t i = 0; i < valuesInFeet.size(); i++)
{
valuesInMeter[i] = valuesInFeet[i] / RimDefines::feetPerMeter();
valuesInMeter[i] = valuesInFeet[i] / RimUnitSystem::feetPerMeter();
}
return valuesInMeter;