Minor Improvements.

[andy/viking.git] / src / degrees_converters.c

diff --git a/src/degrees_converters.c b/src/degrees_converters.c
index 587b58687203ed329730d31286d958946f9ec9a8..8e674dff576c5cee94f71ba8d756618d9cb23373 100644 (file)
--- a/src/degrees_converters.c
+++ b/src/degrees_converters.c
@@ -1,8 +1,35 @@
+/*
+ * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
+ *
+ * Copyright (C) 2006-2007, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
 #include <math.h>
+#endif
 #include <glib.h>
-#include <stdio.h>
 #include <string.h>
 
+#define DEGREE_SYMBOL "\302\260"
+
 /**
  * @param pos_c char for positive value
  * @param neg_c char for negative value
@@ -24,8 +51,7 @@ static gchar *convert_dec_to_ddd(gdouble dec, gchar pos_c, gchar neg_c)
   val_d = fabs(dec);
 
   /* Format */
-  /* TODO : replace "°" as UTF-8 */
-  result = g_strdup_printf ( "%c%f°", sign_c, val_d );
+  result = g_strdup_printf ( "%c%f" DEGREE_SYMBOL, sign_c, val_d );
   return result;
 }
 
@@ -66,8 +92,7 @@ static gchar *convert_dec_to_dmm(gdouble dec, gchar pos_c, gchar neg_c)
   val_m = (tmp - val_d) * 60;
 
   /* Format */
-  /* TODO : replace "°" as UTF-8 */
-  result = g_strdup_printf ( "%c%d°%f'",
+  result = g_strdup_printf ( "%c%d" DEGREE_SYMBOL "%f'",
                              sign_c, val_d, val_m );
   return result;
 }
@@ -113,8 +138,7 @@ static gchar *convert_dec_to_dms(gdouble dec, gchar pos_c, gchar neg_c)
   val_s = (tmp - val_m) * 60;
 
   /* Format */
-  /* TODO : replace "°" as UTF-8 */
-  result = g_strdup_printf ( "%c%d°%d'%f\"",
+  result = g_strdup_printf ( "%c%d" DEGREE_SYMBOL "%d'%f\"",
                              sign_c, val_d, val_m, val_s );
   return result;
 }