Changeset 31 for trunk

Timestamp:

Oct 18, 2011, 2:26:26 AM (12 years ago)

Author:

roman

Message:

support for fractional seconds

Location:

trunk/Utilities/GpsLocationConverter

Files:

• GpsLocationConverter.rc (modified) (previous)
• GpsLocationConverter_i.c (modified) (1 diff)
• GpsLocationConverter_i.h (modified) (1 diff)
• MainDialog.h (modified) (5 diffs)
• _Bin/Release/GpsLocationConverter.exe (modified) (previous)

trunk/Utilities/GpsLocationConverter/GpsLocationConverter_i.c

@@ -7 +7 @@
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Wed Oct 12 21:18:26 2011
+/* at Tue Oct 18 12:15:23 2011
  */
 /* Compiler settings for GpsLocationConverter.idl:

trunk/Utilities/GpsLocationConverter/GpsLocationConverter_i.h

@@ -5 +5 @@
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Wed Oct 12 21:18:26 2011
+/* at Tue Oct 18 12:15:23 2011
  */
 /* Compiler settings for GpsLocationConverter.idl:

trunk/Utilities/GpsLocationConverter/MainDialog.h

@@ -103 +103 @@
                         const INT nPartialLatitudeSecond = (INT) fPartialLatitudeSecond;
                         sLatitude.AppendFormat(_T("%02d"), nPartialLatitudeSecond);
-                        sLatitude.AppendFormat(_T(".%02d "), (INT) ((fPartialLatitudeSecond - nPartialLatitudeSecond) * 100 + 0.5 - 1E-6));
+                        sLatitude.AppendFormat(_T(".%02d"), (INT) ((fPartialLatitudeSecond - nPartialLatitudeSecond) * 100 + 0.5 - 1E-6));
                         #pragma endregion 
                         #pragma region Latitude
@@ -116 +116 @@
                         const INT nPartialLongitudeSecond = (INT) fPartialLongitudeSecond;
                         sLongitude.AppendFormat(_T("%02d"), nPartialLongitudeSecond);
-                        sLongitude.AppendFormat(_T(".%02d "), (INT) ((fPartialLongitudeSecond - nPartialLongitudeSecond) * 100 + 0.5 - 1E-6));
+                        sLongitude.AppendFormat(_T(".%02d"), (INT) ((fPartialLongitudeSecond - nPartialLongitudeSecond) * 100 + 0.5 - 1E-6));
                         #pragma endregion 
                         psTexts[ 8] = sLatitude;
@@ -216 +216 @@
                 #pragma endregion 
                 #pragma region Degrees, Minutes and Seconds
-                static CAtlStaticRegExp<> g_ExpressionE0(_T("^[\t ]*") 
-                        _T("{[NSCÞ]}") _T("[\t ]*") _T("{[0-9]+}[^0-9]+?{[0-9]+}[^0-9\\.]+?{[0-9]+}") 
-                        _T("[^0-9\\.]+?") 
-                        _T("{[EWÂÇ]}") _T("[\t ]*") _T("{[0-9]+}[^0-9]+?{[0-9]+}[^0-9\\.]+?{[0-9]+}")
-                        _T(""), FALSE);
-                static CAtlStaticRegExp<> g_ExpressionE1(_T("^[\t ]*") 
-                        _T("{[EWÂÇ]}") _T("[\t ]*") _T("{[0-9]+}[^0-9]+?{[0-9]+}[^0-9\\.]+?{[0-9]+}")
-                        _T("[^0-9\\.]+?") 
-                        _T("{[NSCÞ]}") _T("[\t ]*") _T("{[0-9]+}[^0-9]+?{[0-9]+}[^0-9\\.]+?{[0-9]+}") 
-                        _T(""), FALSE);
-                static CAtlStaticRegExp<> g_ExpressionE2(_T("^[\t ]*") 
-                        _T("{[0-9]+}[^0-9]+?{[0-9]+}[^0-9\\.]+?{[0-9]+}") _T("[\t ]*") _T("{[NSCÞ]}")
-                        _T("[^0-9\\.]+?") 
-                        _T("{[0-9]+}[^0-9]+?{[0-9]+}[^0-9\\.]+?{[0-9]+}") _T("[\t ]*") _T("{[EWÂÇ]}")
-                        _T(""), FALSE);
-                static CAtlStaticRegExp<> g_ExpressionE3(_T("^[\t ]*") 
-                        _T("{[0-9]+}[^0-9]+?{[0-9]+}[^0-9\\.]+?{[0-9]+}") _T("[\t ]*") _T("{[EWÂÇ]}")
-                        _T("[^0-9\\.]+?") 
-                        _T("{[0-9]+}[^0-9]+?{[0-9]+}[^0-9\\.]+?{[0-9]+}") _T("[\t ]*") _T("{[NSCÞ]}")
-                        _T(""), FALSE);
+#define LATITUDE_SYMBOL         _T("{[NSCÞ]}")
+#define LONGITUDE_SYMBOL        _T("{[EWÂÇ]}")
+#define VALUE                           _T("{[0-9]+}[^0-9]+?{[0-9]+}[^0-9\\.]+?{[0-9]+(\\.([0-9]+)?)?}")
+#define OPTIONAL_WHITESPACE     _T("[\t ]*")
+#define SEPARATOR                       _T("[^0-9\\.]+?")
+                static CAtlStaticRegExp<> g_ExpressionE0(_T("^") OPTIONAL_WHITESPACE LATITUDE_SYMBOL OPTIONAL_WHITESPACE VALUE SEPARATOR LONGITUDE_SYMBOL OPTIONAL_WHITESPACE VALUE _T(""), FALSE);
+                static CAtlStaticRegExp<> g_ExpressionE1(_T("^") OPTIONAL_WHITESPACE LONGITUDE_SYMBOL OPTIONAL_WHITESPACE VALUE SEPARATOR LATITUDE_SYMBOL OPTIONAL_WHITESPACE VALUE  _T(""), FALSE);
+                static CAtlStaticRegExp<> g_ExpressionE2(_T("^") OPTIONAL_WHITESPACE VALUE OPTIONAL_WHITESPACE LATITUDE_SYMBOL SEPARATOR VALUE OPTIONAL_WHITESPACE LONGITUDE_SYMBOL _T(""), FALSE);
+                static CAtlStaticRegExp<> g_ExpressionE3(_T("^") OPTIONAL_WHITESPACE VALUE OPTIONAL_WHITESPACE LONGITUDE_SYMBOL SEPARATOR VALUE OPTIONAL_WHITESPACE LATITUDE_SYMBOL _T(""), FALSE);
+#undef LATITUDE_SYMBOL
+#undef LONGITUDE_SYMBOL
+#undef VALUE
+#undef OPTIONAL_WHITESPACE
+#undef SEPARATOR
                 INT nLayoutE = -1;
                 if(g_ExpressionE0.Match(sText, &MatchContext))
@@ -258 +252 @@
                         INT nLatitudeDegrees, nLongitudeDegrees;
                         INT nLatitudeMinutes, nLongitudeMinutes;
-                        INT nLatitudeSeconds, nLongitudeSeconds;
+                        DOUBLE fLatitudeSeconds, fLongitudeSeconds;
                         if(FALSE ||
                                 !AtlStringToInteger(MatchContext.GetMatchString(g_pnMap[nLayoutE][1]), nLatitudeDegrees) || 
                                 !AtlStringToInteger(MatchContext.GetMatchString(g_pnMap[nLayoutE][2]), nLatitudeMinutes) || 
-                                !AtlStringToInteger(MatchContext.GetMatchString(g_pnMap[nLayoutE][3]), nLatitudeSeconds) || 
+                                !AtlStringToDouble(MatchContext.GetMatchString(g_pnMap[nLayoutE][3]), fLatitudeSeconds) || 
                                 !AtlStringToInteger(MatchContext.GetMatchString(g_pnMap[nLayoutE][5]), nLongitudeDegrees) ||
                                 !AtlStringToInteger(MatchContext.GetMatchString(g_pnMap[nLayoutE][6]), nLongitudeMinutes) ||
-                                !AtlStringToInteger(MatchContext.GetMatchString(g_pnMap[nLayoutE][7]), nLongitudeSeconds) ||
+                                !AtlStringToDouble(MatchContext.GetMatchString(g_pnMap[nLayoutE][7]), fLongitudeSeconds) ||
                                 FALSE)
                                 return FALSE;
@@ -271 +265 @@
                         if(nLatitudeMinutes >= 60 || nLongitudeMinutes >= 60)
                                 return FALSE;
-                        _A(nLatitudeSeconds >= 0 && nLongitudeSeconds >= 0);
-                        if(nLatitudeSeconds >= 60 || nLongitudeSeconds >= 60)
-                                return FALSE;
-                        const DOUBLE fLatitude = nLatitudeSign * (nLatitudeDegrees + (nLatitudeMinutes + nLatitudeSeconds / 60.0) / 60.0);
-                        const DOUBLE fLongitude = nLongitudeSign * (nLongitudeDegrees + (nLongitudeMinutes + nLongitudeSeconds / 60.0) / 60.0);
+                        _A(fLatitudeSeconds >= 0 && fLongitudeSeconds >= 0);
+                        if(fLatitudeSeconds >= 60 || fLongitudeSeconds >= 60)
+                                return FALSE;
+                        const DOUBLE fLatitude = nLatitudeSign * (nLatitudeDegrees + (nLatitudeMinutes + fLatitudeSeconds / 60.0) / 60.0);
+                        const DOUBLE fLongitude = nLongitudeSign * (nLongitudeDegrees + (nLongitudeMinutes + fLongitudeSeconds / 60.0) / 60.0);
                         SetLocation(fLatitude, fLongitude);
                         return TRUE;