Changeset da7c778addde263a49ff38aa871f182e89b227a7

Timestamp:

02/21/10 21:42:56 (5 months ago)

Author:

Tobias Bieniek <Tobias.Bieniek@…>

Parents:

eb5a233ad1a512cecdb0759ccc7aca04c7f91f15

Children:

0f32191d6b65f1112e7704851952d962077860fc

git-committer:

Tobias Bieniek <Tobias.Bieniek@gmx.de> / 2010-02-21T19:42:56Z+0100

Message:

FlightStatistics?: Replaced *MODIFY by ToSysUnit?()/ToUserUnit()

Files:

• src/FlightStatistics.cpp (modified) (15 diffs)

src/FlightStatistics.cpp

@@ -198 +198 @@
 
   chart.DrawXGrid(0.5, Altitude.x_min, Chart::STYLE_THINDASHPAPER, 0.5, true);
-  chart.DrawYGrid(1000/ALTITUDEMODIFY, 0, Chart::STYLE_THINDASHPAPER, 1000, true);
+  chart.DrawYGrid(Units::ToSysUnit(1000, Units::UserAltitudeUnit), 0,
+                  Chart::STYLE_THINDASHPAPER, 1000, true);
   chart.DrawLineGraph(Altitude, Chart::STYLE_MEDIUMBLACK);
 
@@ -230 +231 @@
 
   chart.DrawXGrid(0.5, Task_Speed.x_min,
-      Chart::STYLE_THINDASHPAPER, 0.5, true);
-  chart.DrawYGrid(10/TASKSPEEDMODIFY, 0, Chart::STYLE_THINDASHPAPER,
-      10, true);
+                  Chart::STYLE_THINDASHPAPER, 0.5, true);
+  chart.DrawYGrid(Units::ToSysUnit(10, Units::UserTaskSpeedUnit), 0,
+                  Chart::STYLE_THINDASHPAPER, 10, true);
   chart.DrawLineGraph(Task_Speed, Chart::STYLE_MEDIUMBLACK);
   chart.DrawTrend(Task_Speed, Chart::STYLE_BLUETHIN);
@@ -260 +261 @@
   chart.ScaleXFromValue(ThermalAverage.sum_n);
 
-  chart.DrawYGrid(1.0 / LIFTMODIFY, 0, Chart::STYLE_THINDASHPAPER, 1.0, true);
+  chart.DrawYGrid(Units::ToSysUnit(1.0, Units::UserVerticalSpeedUnit), 0,
+                  Chart::STYLE_THINDASHPAPER, 1.0, true);
   chart.DrawBarChart(ThermalAverage);
 
@@ -290 +292 @@
   chart.ScaleXFromValue(glide_polar.get_Vmax() + 2);
 
-  chart.DrawXGrid(10.0 / SPEEDMODIFY, 0, Chart::STYLE_THINDASHPAPER, 10.0, true);
-  chart.DrawYGrid(1.0 / LIFTMODIFY, 0, Chart::STYLE_THINDASHPAPER, 1.0, true);
+  chart.DrawXGrid(Units::ToSysUnit(10.0, Units::UserHorizontalSpeedUnit), 0,
+                  Chart::STYLE_THINDASHPAPER, 10.0, true);
+  chart.DrawYGrid(Units::ToSysUnit(1.0, Units::UserVerticalSpeedUnit), 0,
+                  Chart::STYLE_THINDASHPAPER, 1.0, true);
 
   double sinkrate0, sinkrate1;
@@ -570 +574 @@
   chart.ScaleYFromData(windstats_mag);
 
-  chart.DrawXGrid(5 / SPEEDMODIFY, 0, Chart::STYLE_THINDASHPAPER, 5.0, true);
-  chart.DrawYGrid(1000 / ALTITUDEMODIFY, 0, Chart::STYLE_THINDASHPAPER, 1000.0,
-      true);
+  chart.DrawXGrid(Units::ToSysUnit(5, Units::UserHorizontalSpeedUnit), 0,
+                  Chart::STYLE_THINDASHPAPER, 5.0, true);
+  chart.DrawYGrid(Units::ToSysUnit(1000, Units::UserAltitudeUnit), 0,
+                  Chart::STYLE_THINDASHPAPER, 1000.0, true);
   chart.DrawLineGraph(windstats_mag, Chart::STYLE_MEDIUMBLACK);
 
@@ -772 +777 @@
     canvas.set_text_color(Color(0xff, 0xff, 0xff));
 
-    chart.DrawXGrid(5.0 / DISTANCEMODIFY, 0, Chart::STYLE_THINDASHPAPER,
-        5.0, true);
-    chart.DrawYGrid(1000.0 / ALTITUDEMODIFY, 0, Chart::STYLE_THINDASHPAPER,
-        1000.0, true);
+    chart.DrawXGrid(Units::ToSysUnit(5.0, Units::UserDistanceUnit), 0,
+                    Chart::STYLE_THINDASHPAPER, 5.0, true);
+    chart.DrawYGrid(Units::ToSysUnit(1000.0, Units::UserAltitudeUnit), 0,
+                    Chart::STYLE_THINDASHPAPER, 1000.0, true);
 
     chart.DrawXLabel(TEXT("D"));
@@ -881 +886 @@
   } else if (Altitude_Ceiling.sum_n<4) {
     _stprintf(sTmp, TEXT("%s:\r\n  %.0f-%.0f %s"),
-              gettext(TEXT("Working band")),
-              Altitude_Base.y_ave*ALTITUDEMODIFY,
-              Altitude_Ceiling.y_ave*ALTITUDEMODIFY,
-              Units::GetAltitudeName());
+              gettext(TEXT("Working band")),
+              Units::ToUserUnit(Altitude_Base.y_ave, Units::UserAltitudeUnit),
+              Units::ToUserUnit(Altitude_Ceiling.y_ave, Units::UserAltitudeUnit),
+              Units::GetAltitudeName());
   } else {
     _stprintf(sTmp, TEXT("%s:\r\n  %.0f-%.0f %s\r\n\r\n%s:\r\n  %.0f %s/hr"),
-              gettext(TEXT("Working band")),
-              Altitude_Base.y_ave*ALTITUDEMODIFY,
-              Altitude_Ceiling.y_ave*ALTITUDEMODIFY,
-              Units::GetAltitudeName(),
-              gettext(TEXT("Ceiling trend")),
-              Altitude_Ceiling.m*ALTITUDEMODIFY,
-              Units::GetAltitudeName());
+              gettext(TEXT("Working band")),
+              Units::ToUserUnit(Altitude_Base.y_ave, Units::UserAltitudeUnit),
+              Units::ToUserUnit(Altitude_Ceiling.y_ave, Units::UserAltitudeUnit),
+              Units::GetAltitudeName(),
+              gettext(TEXT("Ceiling trend")),
+              Units::ToUserUnit(Altitude_Ceiling.m, Units::UserAltitudeUnit),
+              Units::GetAltitudeName());
   }
   Unlock();
@@ -907 +912 @@
     _stprintf(sTmp, TEXT("%s:\r\n  %3.1f %s"),
               gettext(TEXT("Av climb")),
-              ThermalAverage.y_ave*LIFTMODIFY,
+              Units::ToUserUnit(ThermalAverage.y_ave, Units::UserVerticalSpeedUnit),
               Units::GetVerticalSpeedName()
               );
@@ -913 +918 @@
     _stprintf(sTmp, TEXT("%s:\r\n  %3.1f %s\r\n\r\n%s:\r\n  %3.2f %s"),
               gettext(TEXT("Av climb")),
-              ThermalAverage.y_ave*LIFTMODIFY,
+              Units::ToUserUnit(ThermalAverage.y_ave, Units::UserVerticalSpeedUnit),
               Units::GetVerticalSpeedName(),
               gettext(TEXT("Climb trend")),
-              ThermalAverage.m*LIFTMODIFY,
+              Units::ToUserUnit(ThermalAverage.m, Units::UserVerticalSpeedUnit),
               Units::GetVerticalSpeedName()
               );
@@ -929 +934 @@
     _stprintf(sTmp, TEXT("%s:\r\n  %d\r\n  at %d %s\r\n\r\n%s:\r\n%3.2f %s\r\n  at %d %s"),
               gettext(TEXT("Best LD")),
-              (int)glide_polar.get_bestLD(),
-              (int)(glide_polar.get_VbestLD()*SPEEDMODIFY),
+              (int)glide_polar.get_bestLD(),
+        (int)(Units::ToUserUnit(glide_polar.get_VbestLD(),
+                                Units::UserHorizontalSpeedUnit)),
               Units::GetHorizontalSpeedName(),
               gettext(TEXT("Min sink")),
-              (double)(glide_polar.get_Smin() * LIFTMODIFY),
+              Units::ToUserUnit(glide_polar.get_Smin(), Units::UserVerticalSpeedUnit),
               Units::GetVerticalSpeedName(),
-              (int)(glide_polar.get_Vmin()*SPEEDMODIFY),
+        (int)(Units::ToUserUnit(glide_polar.get_Vmin(),
+                                Units::UserHorizontalSpeedUnit)),
               Units::GetHorizontalSpeedName()
               );
@@ -941 +948 @@
     _stprintf(sTmp, TEXT("%s:\r\n  %d at %d %s\r\n%s:\r\n  %3.2f %s at %d %s"),
               gettext(TEXT("Best LD")),
-              (int)glide_polar.get_bestLD(),
-              (int)(glide_polar.get_VbestLD()*SPEEDMODIFY),
+        (int)glide_polar.get_bestLD(),
+        (int)(Units::ToUserUnit(glide_polar.get_VbestLD(),
+                                Units::UserHorizontalSpeedUnit)),
               Units::GetHorizontalSpeedName(),
               gettext(TEXT("Min sink")),
-              (double)(glide_polar.get_Smin()*LIFTMODIFY),
+        Units::ToUserUnit(glide_polar.get_Smin(), Units::UserVerticalSpeedUnit),
               Units::GetVerticalSpeedName(),
-              (int)(glide_polar.get_Vmin()*SPEEDMODIFY),
+        (int)(Units::ToUserUnit(glide_polar.get_Vmin(),
+                                Units::UserHorizontalSpeedUnit)),
               Units::GetHorizontalSpeedName());
   }
@@ -957 +966 @@
   _stprintf(sTmp, TEXT("%s:\r\n  %5.0f %s\r\n\r\n%s:\r\n  %5.0f %s\r\n"),
             gettext(TEXT("Thermal height")),
-            CuSonde::thermalHeight*ALTITUDEMODIFY,
+            Units::ToUserUnit(CuSonde::thermalHeight, Units::UserAltitudeUnit),
             Units::GetAltitudeName(),
             gettext(TEXT("Cloud base")),
-            CuSonde::cloudBase*ALTITUDEMODIFY,
+            Units::ToUserUnit(CuSonde::cloudBase, Units::UserAltitudeUnit),
             Units::GetAltitudeName());
 }
@@ -985 +994 @@
                   timetext2,
                   gettext(TEXT("Distance to go")),
-                  DISTANCEMODIFY * derived.AATTargetDistance,
+                  Units::ToUserUnit(derived.AATTargetDistance, Units::UserDistanceUnit),
                   Units::GetDistanceName(),
                   gettext(TEXT("Target speed")),
-                  TASKSPEEDMODIFY * derived.AATTargetSpeed,
+                  Units::ToUserUnit(derived.AATTargetSpeed, Units::UserTaskSpeedUnit),
                   Units::GetTaskSpeedName()
                   );
@@ -999 +1008 @@
                   timetext2,
                   gettext(TEXT("Distance to go")),
-                  DISTANCEMODIFY * derived.AATTargetDistance,
+      Units::ToUserUnit(derived.AATTargetDistance, Units::UserDistanceUnit),
                   Units::GetDistanceName(),
                   gettext(TEXT("Target speed")),
-                  TASKSPEEDMODIFY * derived.AATTargetSpeed,
+                      Units::ToUserUnit(derived.AATTargetSpeed, Units::UserTaskSpeedUnit),
                   Units::GetTaskSpeedName()
                   );
@@ -1012 +1021 @@
                 timetext1,
                 gettext(TEXT("Distance to go")),
-                DISTANCEMODIFY * derived.TaskDistanceToGo,
+                Units::ToUserUnit(derived.TaskDistanceToGo, Units::UserDistanceUnit),
                 Units::GetDistanceName());
     }