Fixes to speed alarm and poi alerts. Added flicker effect. Some new fields to text...

[jspeed] / src / odometer.cpp

diff --git a/src/odometer.cpp b/src/odometer.cpp
index 4d81136..740c3cc 100644 (file)
--- 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;
@@ -289,6 +293,30 @@ 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();