X-Git-Url: http://git.maemo.org/git/?p=jspeed;a=blobdiff_plain;f=src%2Fodometer.cpp;h=740c3cc1764c151aee2bb6728d2f2e7d3b79a5a1;hp=d68fb1fee5880024e2dae4bdbf1bcac065706bb1;hb=fa66fb373153edc684f4d575c56107b74a615a3b;hpb=e37daa8a1873c9a9be25cf52c30044d53eeea6bc diff --git a/src/odometer.cpp b/src/odometer.cpp index d68fb1f..740c3cc 100644 --- a/src/odometer.cpp +++ b/src/odometer.cpp @@ -33,6 +33,10 @@ namespace QString const MILE_UNIT = "mi"; QString const KM_SPEEDUNIT = "km/h"; QString const MILE_SPEEDUNIT = "mph"; + QString const METER_UNIT = "m"; + QString const FEET_UNIT = "feet"; + double const FEET_MULTIPLIER = 3.2808399; + double const METER_MULTIPLIER = 1.0; static const int FIX_TIMEOUT = 4000; double const DEFAULT_SPEED_TRESHOLD = 8.0; double const MIN_SPEED_TRESHOLD = 0.8; @@ -284,6 +288,35 @@ QString const& Odometer::getSpeedUnit() } } +double Odometer::getUnitMultiplier() +{ + return Location::getUnitMultiplier(); +} + +double Odometer::getMeterMultiplier() +{ + if(Location::getUnit() == Location::KM) + { + return METER_MULTIPLIER; + } + else + { + return FEET_MULTIPLIER; + } +} + +QString Odometer::getMeterUnit() +{ + if(Location::getUnit() == Location::KM) + { + return METER_UNIT; + } + else + { + return FEET_UNIT; + } +} + void Odometer::updateUnit() { QString unit = Settings::instance().value("unit", "km").toString();