Changeset 61d052f61421516146ba7d7ec99116be4f1a8173

Timestamp:

02/22/10 13:19:18 (5 months ago)

Author:

Tobias Bieniek <Tobias.Bieniek@…>

Parents:

747293d7078a948297b9fce24aedf548962a5694

Children:

dfe3fe667598b6a509cb6e0cde6dc2e944d68c76

git-committer:

Tobias Bieniek <Tobias.Bieniek@gmx.de> / 2010-02-22T11:19:18Z+0100

Message:

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

Location:

src

Files:

• Dialogs/dlgAirspaceDetails.cpp (modified) (1 diff)
• Dialogs/dlgAnalysis.cpp (modified) (2 diffs)
• Dialogs/dlgStartTask.cpp (modified) (2 diffs)
• Dialogs/dlgTarget.cpp (modified) (2 diffs)
• Dialogs/dlgTaskOverview.cpp (modified) (3 diffs)
• Dialogs/dlgTaskRules.cpp (modified) (3 diffs)
• Gauge/GaugeFLARM.cpp (modified) (1 diff)
• Gauge/GaugeVario.cpp (modified) (3 diffs)

src/Dialogs/dlgAirspaceDetails.cpp

@@ -126 +126 @@
     const GeoVector vec(ac_loc, closest_loc);
     TCHAR buf[80];
-    _stprintf(buf,_T("%d%s"), (int)(vec.Distance * DISTANCEMODIFY),
+    _stprintf(buf, _T("%d%s"),
+              (int)Units::ToUserUnit(vec.Distance, Units::DistanceUnit),
               Units::GetDistanceName());
     wp->SetText(buf);

src/Dialogs/dlgAnalysis.cpp

@@ -232 +232 @@
                 _T("%s:\r\n  %d %s\r\n%s: %s\r\n%s: %d %s\r\n"),
                 gettext(_T("Distance")),
-                (int)(DISTANCEMODIFY * XCSoarInterface::Calculated().common_stats.distance_olc),
+                (int)Units::ToUserUnit(XCSoarInterface::Calculated().common_stats.distance_olc, Units::DistanceUnit),
                 Units::GetDistanceName(),
                 gettext(_T("Time")),
                 timetext1,
                 gettext(_T("Speed")),
-                (int)(TASKSPEEDMODIFY * XCSoarInterface::Calculated().common_stats.speed_olc),
+                (int)Units::ToUserUnit(XCSoarInterface::Calculated().common_stats.speed_olc, Units::TaskSpeedUnit),
                 Units::GetTaskSpeedName());
     } else {
@@ -243 +243 @@
                 _T("%s: %d %s\r\n%s: %s\r\n%s: %d %s\r\n"),
                 gettext(_T("Distance")),
-                (int)(DISTANCEMODIFY * XCSoarInterface::Calculated().common_stats.distance_olc),
+                (int)Units::ToUserUnit(XCSoarInterface::Calculated().common_stats.distance_olc, Units::DistanceUnit),
                 Units::GetDistanceName(),
                 gettext(_T("Time")),
                 timetext1,
                 gettext(_T("Speed")),
-                (int)(TASKSPEEDMODIFY * XCSoarInterface::Calculated().common_stats.speed_olc),
+                (int)Units::ToUserUnit(XCSoarInterface::Calculated().common_stats.speed_olc, Units::TaskSpeedUnit),
                 Units::GetTaskSpeedName());
     }

src/Dialogs/dlgStartTask.cpp

@@ -90 +90 @@
   if (wp) {
     _stprintf(Temp, _T("%.0f %s"),
-              (double) TASKSPEEDMODIFY * Speed, Units::GetTaskSpeedName());
+              Units::ToUserUnit(Speed, Units::TaskSpeedUnit),
+              Units::GetTaskSpeedName());
     wp->SetText(Temp);
   }
@@ -97 +98 @@
   if (wp) {
     _stprintf(Temp, _T("%.0f %s"),
-              (double) Altitude*ALTITUDEMODIFY, Units::GetAltitudeName());
+              Units::ToUserUnit(Altitude, Units::AltitudeUnit),
+              Units::GetAltitudeName());
     wp->SetText(Temp);
   }

src/Dialogs/dlgTarget.cpp

@@ -362 +362 @@
   wp = (WndProperty*)wf->FindByName(_T("prpSpeedRemaining"));
   if (wp) {
-    wp->GetDataField()->SetAsFloat(v1*TASKSPEEDMODIFY);
+    wp->GetDataField()->SetAsFloat(Units::ToUserUnit(v1, Units::TaskSpeedUnit));
     wp->GetDataField()->SetUnits(Units::GetTaskSpeedName());
     wp->RefreshDisplay();
@@ -369 +369 @@
   wp = (WndProperty*)wf->FindByName(_T("prpSpeedAchieved"));
   if (wp) {
-    wp->GetDataField()->SetAsFloat(XCSoarInterface::Calculated().TaskSpeed*TASKSPEEDMODIFY);
+    wp->GetDataField()->SetAsFloat(Units::ToUserUnit(
+        XCSoarInterface::Calculated().TaskSpeed, Units::TaskSpeedUnit));
     wp->GetDataField()->SetUnits(Units::GetTaskSpeedName());
     wp->RefreshDisplay();

src/Dialogs/dlgTaskOverview.cpp

@@ -164 +164 @@
         _stprintf(sTmp, _T("%s %.1f"),
                   way_points.get(tp.Index).Name,
-                  tp.AATCircleRadius*DISTANCEMODIFY);
+                  Units::ToUserUnit(tp.AATCircleRadius, Units::DistanceUnit));
       } else {
         _stprintf(sTmp, _T("%s %.1f"),
                   way_points.get(tp.Index).Name,
-                  tp.AATSectorRadius*DISTANCEMODIFY);
+                  Units::ToUserUnit(tp.AATSectorRadius, Units::DistanceUnit));
       }
     } else {
@@ -215 +215 @@
 
       if (fai_ok) {
-        _stprintf(sTmp, _T("%.0f %s FAI"), lengthtotal*DISTANCEMODIFY,
+        _stprintf(sTmp, _T("%.0f %s FAI"),
+                  Units::ToUserUnit(lengthtotal, Units::DistanceUnit),
                   Units::GetDistanceName());
       } else {
-        _stprintf(sTmp, _T("%.0f %s"), lengthtotal*DISTANCEMODIFY,
+        _stprintf(sTmp, _T("%.0f %s"),
+                  Units::ToUserUnit(lengthtotal, Units::DistanceUnit),
                   Units::GetDistanceName());
       }
@@ -236 +238 @@
                 gettext(_T("Total:")),
                 task.getSettings().AATTaskLength*1.0,
-                DISTANCEMODIFY*lengthtotal,
-                DISTANCEMODIFY*d1,
+                Units::ToUserUnit(lengthtotal, Units::DistanceUnit),
+                Units::ToUserUnit(d1, Units::DistanceUnit),
                 Units::GetDistanceName());
       canvas.text(rc.left + Layout::FastScale(2),

src/Dialogs/dlgTaskRules.cpp

@@ -118 +118 @@
   wp = (WndProperty*)wf->FindByName(_T("prpFinishMinHeight"));
   if (wp) {
-    wp->GetDataField()->SetAsFloat(iround(settings_task.FinishMinHeight*ALTITUDEMODIFY));
+    wp->GetDataField()->SetAsFloat(iround(Units::ToUserUnit(
+        settings_task.FinishMinHeight, Units::AltitudeUnit)));
     wp->GetDataField()->SetUnits(Units::GetAltitudeName());
     wp->RefreshDisplay();
@@ -125 +126 @@
   wp = (WndProperty*)wf->FindByName(_T("prpStartMaxHeight"));
   if (wp) {
-    wp->GetDataField()->SetAsFloat(iround(settings_task.StartMaxHeight*ALTITUDEMODIFY));
+    wp->GetDataField()->SetAsFloat(iround(Units::ToUserUnit(
+        settings_task.StartMaxHeight, Units::AltitudeUnit)));
     wp->GetDataField()->SetUnits(Units::GetAltitudeName());
     wp->RefreshDisplay();
@@ -132 +134 @@
   wp = (WndProperty*)wf->FindByName(_T("prpStartMaxSpeed"));
   if (wp) {
-    wp->GetDataField()->SetAsFloat(iround(settings_task.StartMaxSpeed*SPEEDMODIFY));
+    wp->GetDataField()->SetAsFloat(iround(Units::ToUserUnit(
+        settings_task.StartMaxSpeed, Units::SpeedUnit)));
     wp->GetDataField()->SetUnits(Units::GetHorizontalSpeedName());
     wp->RefreshDisplay();

src/Gauge/GaugeFLARM.cpp

@@ -195 +195 @@
     canvas.polygon(Arrow, 5);
 
-    short relalt = iround(traffic.RelativeAltitude * ALTITUDEMODIFY / 100);
+    short relalt = iround(Units::ToUserUnit(traffic.RelativeAltitude / 100,
+                                            Units::AltitudeUnit));
 
     // if (relative altitude is other than zero)

src/Gauge/GaugeVario.cpp

@@ -207 +207 @@
   }
 
-  vval = Basic().TotalEnergyVario;
-
-  double vvaldisplay = min(99.9,max(-99.9,vval*LIFTMODIFY));
+  vval = Units::ToUserUnit(Basic().TotalEnergyVario, Units::VerticalSpeedUnit);
+
+  double vvaldisplay = min(99.9, max(-99.9, vval));
 
   if (Appearance.GaugeVarioAvgText) {
@@ -215 +215 @@
     if (!Calculated().Circling) {
       RenderValue(canvas, orgTop.x, orgTop.y, &diValueTop, &diLabelTop,
-                  Calculated().NettoAverage30s*LIFTMODIFY, TEXT("NetAvg"));
+                  Units::ToUserUnit(Calculated().NettoAverage30s,
+                                    Units::VerticalSpeedUnit), TEXT("NetAvg"));
     } else {
       RenderValue(canvas, orgTop.x, orgTop.y, &diValueTop, &diLabelTop,
-                  Calculated().Average30s*LIFTMODIFY, TEXT("Avg"));
+                  Units::ToUserUnit(Calculated().Average30s,
+                                    Units::VerticalSpeedUnit), TEXT("Avg"));
     }
   }
 
   if (Appearance.GaugeVarioMc) {
-    double mc = Calculated().common_stats.current_mc*LIFTMODIFY;
+    double mc = Units::ToUserUnit(Calculated().common_stats.current_mc,
+                                  Units::VerticalSpeedUnit);
     if (SettingsComputer().auto_mc)
       RenderValue(canvas, orgBottom.x, orgBottom.y,
@@ -389 +392 @@
   int i;
   if (!InitDone){
-    degrees_per_unit =
-      (int)((GAUGEVARIOSWEEP/2.0)/(GAUGEVARIORANGE*LIFTMODIFY));
-    gmax =
-      max(80,(int)(degrees_per_unit*(GAUGEVARIORANGE*LIFTMODIFY))+2);
+    degrees_per_unit = (int)((GAUGEVARIOSWEEP * 0.5) /
+                             Units::ToUserUnit(GAUGEVARIORANGE,
+                                               Units::VerticalSpeedUnit));
+    gmax = max(80, (int)(degrees_per_unit *
+                         Units::ToUserUnit(GAUGEVARIORANGE,
+                                           Units::VerticalSpeedUnit)) + 2);
     MakeAllPolygons();
     InitDone = true;
   };
-  i = iround(Value*degrees_per_unit*LIFTMODIFY);
+  i = iround(Units::ToUserUnit(Value * degrees_per_unit,
+                               Units::VerticalSpeedUnit));
   i = min(gmax,max(-gmax,i));
   return i;