projects
/
jspeed
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a bug that caused altitude display to have wrong color in some themes.
[jspeed]
/
src
/
odometer.cpp
diff --git
a/src/odometer.cpp
b/src/odometer.cpp
index
740c3cc
..
b2c8488
100644
(file)
--- a/
src/odometer.cpp
+++ b/
src/odometer.cpp
@@
-34,9
+34,7
@@
namespace
QString const KM_SPEEDUNIT = "km/h";
QString const MILE_SPEEDUNIT = "mph";
QString const METER_UNIT = "m";
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;
+ QString const FEET_UNIT = "ft";
static const int FIX_TIMEOUT = 4000;
double const DEFAULT_SPEED_TRESHOLD = 8.0;
double const MIN_SPEED_TRESHOLD = 0.8;
static const int FIX_TIMEOUT = 4000;
double const DEFAULT_SPEED_TRESHOLD = 8.0;
double const MIN_SPEED_TRESHOLD = 0.8;
@@
-295,14
+293,7
@@
double Odometer::getUnitMultiplier()
double Odometer::getMeterMultiplier()
{
double Odometer::getMeterMultiplier()
{
- if(Location::getUnit() == Location::KM)
- {
- return METER_MULTIPLIER;
- }
- else
- {
- return FEET_MULTIPLIER;
- }
+ return Location::getMeterMultiplier();
}
QString Odometer::getMeterUnit()
}
QString Odometer::getMeterUnit()