Changeset dfe3fe667598b6a509cb6e0cde6dc2e944d68c76

Timestamp:

02/22/10 13:28:39 (5 months ago)

Author:

Tobias Bieniek <Tobias.Bieniek@…>

Parents:

61d052f61421516146ba7d7ec99116be4f1a8173

Children:

75bbe0bd567d35580cae56867292ff8db0ad5b0e

git-committer:

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

Message:

Units: Renamed HorizontalSpeed? to Speed

Horizontal is the default speed anyway and it saves some characters for the 80char limit...

Location:

src

Files:

• Dialogs/dlgConfiguration.cpp (modified) (3 diffs)
• Dialogs/dlgTaskRules.cpp (modified) (1 diff)
• Dialogs/dlgVegaDemo.cpp (modified) (1 diff)
• Dialogs/dlgWindSettings.cpp (modified) (1 diff)
• FlightStatistics.cpp (modified) (4 diffs)
• RasterWeather.cpp (modified) (1 diff)
• Units.cpp (modified) (5 diffs)
• Units.hpp (modified) (3 diffs)

src/Dialogs/dlgConfiguration.cpp

@@ -1614 +1614 @@
   if (wp) {
     wp->GetDataField()->SetAsFloat(iround(SPEEDMODIFY*XCSoarInterface::SettingsComputer().SafetySpeed));
-    wp->GetDataField()->SetUnits(Units::GetHorizontalSpeedName());
+    wp->GetDataField()->SetUnits(Units::GetSpeedName());
     wp->RefreshDisplay();
   }
@@ -2192 +2192 @@
   if (wp) {
     wp->GetDataField()->SetAsFloat(iround(XCSoarInterface::SettingsComputer().start_max_speed*SPEEDMODIFY));
-    wp->GetDataField()->SetUnits(Units::GetHorizontalSpeedName());
+    wp->GetDataField()->SetUnits(Units::GetSpeedName());
     wp->RefreshDisplay();
   }
@@ -2199 +2199 @@
   if (wp) {
     wp->GetDataField()->SetAsFloat(iround(XCSoarInterface::SettingsComputer().start_max_speed_margin*SPEEDMODIFY));
-    wp->GetDataField()->SetUnits(Units::GetHorizontalSpeedName());
+    wp->GetDataField()->SetUnits(Units::GetSpeedName());
     wp->RefreshDisplay();
   }

src/Dialogs/dlgTaskRules.cpp

@@ -136 +136 @@
     wp->GetDataField()->SetAsFloat(iround(Units::ToUserUnit(
         settings_task.StartMaxSpeed, Units::SpeedUnit)));
-    wp->GetDataField()->SetUnits(Units::GetHorizontalSpeedName());
+    wp->GetDataField()->SetUnits(Units::GetSpeedName());
     wp->RefreshDisplay();
   }

src/Dialogs/dlgVegaDemo.cpp

@@ -148 +148 @@
   if (wp) {
     wp->GetDataField()->SetAsFloat(VegaDemoV*SPEEDMODIFY);
-    wp->GetDataField()->SetUnits(Units::GetHorizontalSpeedName());
+    wp->GetDataField()->SetUnits(Units::GetSpeedName());
     wp->RefreshDisplay();
   }

src/Dialogs/dlgWindSettings.cpp

@@ -147 +147 @@
   wp = (WndProperty*)wf->FindByName(_T("prpSpeed"));
   if (wp) {
-    wp->GetDataField()->SetUnits(Units::GetHorizontalSpeedName());
+    wp->GetDataField()->SetUnits(Units::GetSpeedName());
     wp->RefreshDisplay();
   }

src/FlightStatistics.cpp

@@ -937 +937 @@
         (int)(Units::ToUserUnit(glide_polar.get_VbestLD(),
                                 Units::SpeedUnit)),
-              Units::GetHorizontalSpeedName(),
+              Units::GetSpeedName(),
               gettext(TEXT("Min sink")),
               Units::ToUserUnit(glide_polar.get_Smin(), Units::VerticalSpeedUnit),
@@ -943 +943 @@
         (int)(Units::ToUserUnit(glide_polar.get_Vmin(),
                                 Units::SpeedUnit)),
-              Units::GetHorizontalSpeedName()
+              Units::GetSpeedName()
               );
   } else {
@@ -951 +951 @@
         (int)(Units::ToUserUnit(glide_polar.get_VbestLD(),
                                 Units::SpeedUnit)),
-              Units::GetHorizontalSpeedName(),
+              Units::GetSpeedName(),
               gettext(TEXT("Min sink")),
         Units::ToUserUnit(glide_polar.get_Smin(), Units::VerticalSpeedUnit),
@@ -957 +957 @@
         (int)(Units::ToUserUnit(glide_polar.get_Vmin(),
                                 Units::SpeedUnit)),
-              Units::GetHorizontalSpeedName());
+              Units::GetSpeedName());
   }
 }

src/RasterWeather.cpp

@@ -294 +294 @@
     _stprintf(Buffer, TEXT("%.0f%s"),
               Units::ToUserUnit(val / 100.0, Units::SpeedUnit),
-              Units::GetHorizontalSpeedName());
+              Units::GetSpeedName());
     return;
   case 3: // hbl

src/Units.cpp

@@ -338 +338 @@
 
 Units_t
-Units::GetUserHorizontalSpeedUnit(void)
+Units::GetUserSpeedUnit(void)
 {
   return SpeedUnit;
@@ -344 +344 @@
 
 Units_t
-Units::SetUserHorizontalSpeedUnit(Units_t NewUnit)
+Units::SetUserSpeedUnit(Units_t NewUnit)
 {
   Units_t last = SpeedUnit;
@@ -416 +416 @@
     return (GetUserAltitudeUnit());
   case ugHorizontalSpeed:
-    return (GetUserHorizontalSpeedUnit());
+    return (GetUserSpeedUnit());
   case ugVerticalSpeed:
     return (GetUserVerticalSpeedUnit());
@@ -434 +434 @@
 
   if (SPEEDMODIFY == TOMPH) {
-    SetUserHorizontalSpeedUnit(unStatuteMilesPerHour);
+    SetUserSpeedUnit(unStatuteMilesPerHour);
     SetUserWindSpeedUnit(unStatuteMilesPerHour);
   } else if (SPEEDMODIFY == TOKNOTS) {
-    SetUserHorizontalSpeedUnit(unKnots);
+    SetUserSpeedUnit(unKnots);
     SetUserWindSpeedUnit(unKnots);
   } else if (SPEEDMODIFY == TOKPH) {
-    SetUserHorizontalSpeedUnit(unKiloMeterPerHour);
+    SetUserSpeedUnit(unKiloMeterPerHour);
     SetUserWindSpeedUnit(unKiloMeterPerHour);
   }
@@ -474 +474 @@
 
 const TCHAR *
-Units::GetHorizontalSpeedName()
-{
-  return GetUnitName(GetUserHorizontalSpeedUnit());
+Units::GetSpeedName()
+{
+  return GetUnitName(GetUserSpeedUnit());
 }
 

src/Units.hpp

@@ -149 +149 @@
    * @return The user-specified unit for a horizontal speed
    */
-  static Units_t GetUserHorizontalSpeedUnit(void);
+  static Units_t GetUserSpeedUnit(void);
   /**
    * Sets the user-specified unit for a horizontal speed
@@ -155 +155 @@
    * @return The old unit
    */
-  static Units_t SetUserHorizontalSpeedUnit(Units_t NewUnit);
+  static Units_t SetUserSpeedUnit(Units_t NewUnit);
 
   /**
@@ -235 +235 @@
   static void NotifyUnitChanged(void);
 
-  static const TCHAR *GetHorizontalSpeedName();
+  static const TCHAR *GetSpeedName();
   static const TCHAR *GetVerticalSpeedName();
   static const TCHAR *GetDistanceName();