Changeset 26fd241c3e28094ce1fff787bd1bcfaf0b101ed0

Timestamp:

02/22/10 20:38:25 (5 months ago)

Author:

Tobias Bieniek <Tobias.Bieniek@…>

git-author:

Tobias Bieniek <Tobias.Bieniek@gmx.de> / 2010-02-22T18:29:55Z+0100

Parents:

f84f92055fd97fdf36502aaf47dde06b296949e6

Children:

6409703d43721b4822d3c2d78b75bf02e6493ee8

git-committer:

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

Message:

Units: Implemented Get/SetCoordinateFormat()

Location:

src

Files:

• Dialogs/dlgConfiguration.cpp (modified) (1 diff)
• Dialogs/dlgWaypointEdit.cpp (modified) (5 diffs)
• Profile.cpp (modified) (1 diff)
• Units.cpp (modified) (1 diff)
• Units.hpp (modified) (1 diff)

src/Dialogs/dlgConfiguration.cpp

@@ -1499 +1499 @@
     dfe->addEnumText(_T("DDMM.mmm"));
     dfe->addEnumText(_T("DD.dddd"));
-    dfe->Set(Units::CoordinateFormat);
+    dfe->Set(Units::GetCoordinateFormat());
     wp->RefreshDisplay();
   }

src/Dialogs/dlgWaypointEdit.cpp

@@ -112 +112 @@
 static void SetUnits(void) {
   WndProperty* wp;
-  switch (Units::CoordinateFormat) {
+  switch (Units::GetCoordinateFormat()) {
   case 0: // ("DDMMSS");
   case 1: // ("DDMMSS.ss");
@@ -203 +203 @@
   }
 
-  switch (Units::CoordinateFormat) {
+  switch (Units::GetCoordinateFormat()) {
   case 0: // ("DDMMSS");
   case 1: // ("DDMMSS.ss");
@@ -256 +256 @@
   }
 
-  switch (Units::CoordinateFormat) {
+  switch (Units::GetCoordinateFormat()) {
   case 0: // ("DDMMSS");
   case 1: // ("DDMMSS.ss");
@@ -336 +336 @@
   }
 
-  switch (Units::CoordinateFormat) {
+  switch (Units::GetCoordinateFormat()) {
   case 0: // ("DDMMSS");
   case 1: // ("DDMMSS.ss");
@@ -383 +383 @@
   }
 
-  switch (Units::CoordinateFormat) {
+  switch (Units::GetCoordinateFormat()) {
   case 0: // ("DDMMSS");
   case 1: // ("DDMMSS.ss");

src/Profile.cpp

@@ -182 +182 @@
   Temp = 0;
   GetFromRegistryD(szRegistryLatLonUnits, Temp);
-  Units::CoordinateFormat = (CoordinateFormats_t)Temp;
+  Units::SetCoordinateFormat((CoordinateFormats_t)Temp);
 
   GetFromRegistryD(szRegistrySpeedUnitsValue, Speed);

src/Units.cpp

@@ -297 +297 @@
   // so don't need different names in different languages.
   return UnitDescriptors[Unit].Name;
+}
+
+CoordinateFormats_t
+Units::GetCoordinateFormat()
+{
+  return CoordinateFormat;
+}
+
+CoordinateFormats_t
+Units::SetCoordinateFormat(CoordinateFormats_t NewFormat)
+{
+  CoordinateFormats_t last = CoordinateFormat;
+  if (CoordinateFormat != NewFormat)
+    CoordinateFormat = NewFormat;
+  return last;
 }
 

src/Units.hpp

@@ -115 +115 @@
 
   /**
+   * Returns the user-specified coordinate format
+   * @return The user-specified coordinate format
+   */
+  static CoordinateFormats_t GetCoordinateFormat(void);
+  /**
+   * Sets the user-specified coordinate format
+   * @param NewUnit The new coordinate format
+   * @return The old coordinate format
+   */
+  static CoordinateFormats_t SetCoordinateFormat(CoordinateFormats_t NewFormat);
+
+  /**
    * Returns the user-specified unit for a horizontal distance
    * @return The user-specified unit for a horizontal distance