Output formating of gps data changed

diff --git a/debian/changelog b/debian/changelog
index 0a10bf1..d6b63eb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 gps-tracker (1.0-5) unstable; urgency=low
 
   * Changed format of default output filename
+  * Output formating of gps data changed
 
- -- Dr. Johann Pfefferl <pfefferl@gmx.net>  Wed, 26 May 2010 10:03:53 +0200
+ -- Dr. Johann Pfefferl <pfefferl@gmx.net>  Wed, 26 May 2010 10:52:15 +0200
 
 gps-tracker (1.0-4) unstable; urgency=low
 

diff --git a/gps-tracker.c b/gps-tracker.c
index a376ab9..db10026 100644 (file)
--- a/gps-tracker.c
+++ b/gps-tracker.c
@@ -142,7 +142,7 @@ on_gps_device_changed (LocationGPSDevice *device, gpointer data)
   if (device->fix && device->status) {
     if (device->fix->fields & LOCATION_GPS_DEVICE_LATLONG_SET) {
       //g_print ("lat = %f, long = %f\n", device->fix->latitude, device->fix->longitude);
-      g_string_append_printf (msg, "lat = %f, long = %f\n",
+      g_string_append_printf (msg, "lat = % 9.6f, long = % 9.6f\n",
           device->fix->latitude,
           device->fix->longitude);
       if(fp) {
@@ -158,7 +158,7 @@ on_gps_device_changed (LocationGPSDevice *device, gpointer data)
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_TIME_SET) {
         //g_print ("time = %f\n", device->fix->time);
-        g_string_append_printf(msg, "time = %F\n", device->fix->time);
+        //g_string_append_printf(msg, "time = %F\n", device->fix->time);
         if(fp) {
           gchar st[64];
           struct tm *tmp;
@@ -179,7 +179,7 @@ on_gps_device_changed (LocationGPSDevice *device, gpointer data)
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_ALTITUDE_SET) {
         //g_print ("alt = %f\n", device->fix->altitude);
-        g_string_append_printf (msg, "alt = %f\n", device->fix->altitude);
+        g_string_append_printf (msg, "alt =% 5.0fm\n", device->fix->altitude);
         if(fp)
           g_fprintf(fp, "<ele>%s</ele>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->altitude));
 
@@ -187,21 +187,21 @@ on_gps_device_changed (LocationGPSDevice *device, gpointer data)
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_SPEED_SET) {
         //g_print ("speed = %f\n", device->fix->speed);
-        g_string_append_printf (msg, "speed = %f, ", device->fix->speed);
+        g_string_append_printf (msg, "speed =% 4.0fkm/h, ", device->fix->speed);
         if(fp)
           g_fprintf(fp, "<speed>%s</speed>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->speed));
       }
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_TRACK_SET) {
         //g_print ("track = %f\n", device->fix->track);
-        g_string_append_printf (msg, "track = %f, ", device->fix->track);
+        g_string_append_printf (msg, "track =%4.0f°, ", device->fix->track);
         if(fp)
           g_fprintf(fp, "<course>%s</course>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->track));
       }
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_CLIMB_SET) {
         //g_print ("climb = %f\n", device->fix->climb);
-        g_string_append_printf (msg, "climb = %f\n", device->fix->climb);
+        g_string_append_printf (msg, "climb =%+4.0f°\n", device->fix->climb);
       }
 
       //g_print ("Accuracy values:\n");
@@ -224,7 +224,7 @@ on_gps_device_changed (LocationGPSDevice *device, gpointer data)
        
        //g_print ("Satellites in view: %d\n", device->satellites_in_view);
        //g_print ("Satellites in use: %d\n", device->satellites_in_use);
-  g_string_append_printf (msg, "Satellites = % 2d/% 2d\n", device->satellites_in_use, device->satellites_in_view);
+  g_string_append_printf (msg, "Satellites = %2d/%2d\n", device->satellites_in_use, device->satellites_in_view);
        //g_print ("GPS status: %d\n", device->status);
        g_string_append_printf (msg, "GPS status: %d\n", device->status);