Changeset 8fbaec7ac54405201416b0af9a2a3f55d8384067

Timestamp:

02/22/10 12:23:25 (5 months ago)

Author:

Tobias Bieniek <Tobias.Bieniek@…>

Parents:

38c49736fe32fa0a12be8e01c1e65f9f2ec6984e

Children:

747293d7078a948297b9fce24aedf548962a5694

git-committer:

Tobias Bieniek <Tobias.Bieniek@gmx.de> / 2010-02-22T10:23:25Z+0100

Message:

Formatter/LowWarning: Replaced *MODIFY by ToSysUnit?()/ToUserUnit() + Corrected Format

Files:

• src/Formatter/LowWarning.cpp (modified) (2 diffs)

src/Formatter/LowWarning.cpp

@@ -49 +49 @@
   switch (i) {
   case 1:
-    minimum = Units::ToUserUnit(SettingsComputer().SafetyAltitudeTerrain, Units::AltitudeUnit);
+    minimum = Units::ToUserUnit(SettingsComputer().SafetyAltitudeTerrain,
+                                Units::AltitudeUnit);
     break;
   case 2:
-    minimum = 0.5*LIFTMODIFY*Calculated().common_stats.current_risk_mc;
+    minimum = Units::ToUserUnit(0.5 * Calculated().common_stats.current_risk_mc,
+                                Units::VerticalSpeedUnit);
     break;
   case 21:
-    minimum = 0.667*LIFTMODIFY*Calculated().common_stats.current_risk_mc;
-    break;
-  default:
+    minimum = Units::ToUserUnit(0.667 * Calculated().common_stats.current_risk_mc,
+                                Units::VerticalSpeedUnit);
     break;
   }
@@ -64 +65 @@
 
 const TCHAR *FormatterLowWarning::Render(int *color) {
-
   if (Valid) {
-    _stprintf(Text,
-              Format,
-              Value );
-    if (Value<minimum) {
-      *color = 1; // red
-    } else {
+    _stprintf(Text, Format, Value);
+    if (Value < minimum)
+      // red
+      *color = 1;
+    else
       *color = 0;
-    }
   } else {
     RenderInvalid(color);
   }
-  return(Text);
+  return Text;
 }