GPS/Track information display is rearranged

diff --git a/debian/changelog b/debian/changelog
index d6b63eb..4b07bbb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gps-tracker (1.0-6) unstable; urgency=low
+
+  * GPS/Track information display is rearranged
+
+ -- Dr. Johann Pfefferl <pfefferl@gmx.net>  Wed, 26 May 2010 14:40:46 +0200
+
 gps-tracker (1.0-5) unstable; urgency=low
 
   * Changed format of default output filename

diff --git a/gps-tracker.c b/gps-tracker.c
index db10026..e79a0ad 100644 (file)
--- a/gps-tracker.c
+++ b/gps-tracker.c
@@ -13,9 +13,12 @@ typedef struct {
     HildonWindow *window;
     
     GtkWidget * main_vbox, *btn_hbox;
-    GtkWidget *status_label;
     GtkButton *start_stop_button, *save_button;
     GtkWidget *wp_hbox, *wp_label, *wp_name_entry;
+    GtkWidget *loc_hbox, *loc_gps_data, *loc_track_data;
+    GtkTable *loc_gps_data_table, *loc_track_data_table;
+    GtkWidget *lat_val_label, *lon_val_label, *alt_val_label, *sat_val_label;
+    GtkWidget *speed_val_label, *track_val_label, *climb_val_label;
     //GtkWidget *wp_label;
     GtkButton *wp_set_btn;
     GString *wp_marker_str;
@@ -90,7 +93,7 @@ static void cb_start_stop (GtkWidget * w, AppData * data)
   if(data->tracking_is_on) { /* START pressed */
     data->outf_p = fopen(data->intermediate_gpx_data_filename, "w");
     write_gpx_header(data->outf_p);
-    hildon_banner_show_information(GTK_WIDGET(data->window), NULL, "Tracking started");
+    //hildon_banner_show_information(GTK_WIDGET(data->window), NULL, "Tracking started");
     gtk_button_set_label (data->start_stop_button, "Stop");
     gtk_widget_set_sensitive(GTK_WIDGET(data->save_button), FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(data->wp_set_btn), TRUE);
@@ -102,7 +105,7 @@ static void cb_start_stop (GtkWidget * w, AppData * data)
       data->outf_p = NULL;
     }
     gtk_button_set_label (data->start_stop_button, "Start");
-    hildon_banner_show_information(GTK_WIDGET(data->window), NULL, "Tracking stopped");
+    //hildon_banner_show_information(GTK_WIDGET(data->window), NULL, "Tracking stopped");
     gtk_widget_set_sensitive(GTK_WIDGET(data->save_button), TRUE);
     gtk_widget_set_sensitive(GTK_WIDGET(data->wp_set_btn), FALSE);
   }
@@ -131,20 +134,16 @@ static void
 on_gps_device_changed (LocationGPSDevice *device, gpointer data)
 {
   AppData *app_data = data;
-  GtkLabel *info = (GtkLabel*)app_data->status_label;
-  GString *msg;
   FILE *fp = app_data->outf_p;
-  gchar sbuf1[G_ASCII_DTOSTR_BUF_SIZE], sbuf2[G_ASCII_DTOSTR_BUF_SIZE];
+  gchar sbuf1[30*G_ASCII_DTOSTR_BUF_SIZE], sbuf2[2*G_ASCII_DTOSTR_BUF_SIZE];
        if (!device)
                return;
 
-  msg = g_string_sized_new (512);
   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 = % 9.6f, long = % 9.6f\n",
-          device->fix->latitude,
-          device->fix->longitude);
+      gtk_label_set_text(GTK_LABEL(app_data->lat_val_label), g_ascii_formatd(sbuf1, sizeof(sbuf1), "% 9.6f", device->fix->latitude));
+      gtk_label_set_text(GTK_LABEL(app_data->lon_val_label), g_ascii_formatd(sbuf1, sizeof(sbuf1), "% 9.6f", device->fix->longitude));
       if(fp) {
         g_fprintf(fp, "\n<trkpt lat=\"%s\" lon=\"%s\">\n",
           g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->latitude),
@@ -158,7 +157,6 @@ 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);
         if(fp) {
           gchar st[64];
           struct tm *tmp;
@@ -179,7 +177,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 =% 5.0fm\n", device->fix->altitude);
+        gtk_label_set_text(GTK_LABEL(app_data->alt_val_label), g_ascii_formatd(sbuf1, sizeof(sbuf1), "% 5.0f", device->fix->altitude));
         if(fp)
           g_fprintf(fp, "<ele>%s</ele>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->altitude));
 
@@ -187,21 +185,24 @@ 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 =% 4.0fkm/h, ", device->fix->speed);
+        g_snprintf(sbuf1, sizeof(sbuf1), "% 5.1fkm/h", device->fix->speed);
+        gtk_label_set_text(GTK_LABEL(app_data->speed_val_label), sbuf1);
         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 =%4.0f°, ", device->fix->track);
+        g_snprintf(sbuf1, sizeof(sbuf1), "%4.0f°", device->fix->track);
+        gtk_label_set_text(GTK_LABEL(app_data->track_val_label), sbuf1);
         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 =%+4.0f°\n", device->fix->climb);
+        g_snprintf(sbuf1, sizeof(sbuf1), "%+4.0f°", device->fix->climb);
+        gtk_label_set_text(GTK_LABEL(app_data->climb_val_label), sbuf1);
       }
 
       //g_print ("Accuracy values:\n");
@@ -224,9 +225,9 @@ 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_snprintf(sbuf1, sizeof(sbuf1), "%3d/%2d", device->satellites_in_use, device->satellites_in_view);
+  gtk_label_set_text(GTK_LABEL(app_data->sat_val_label), sbuf1);
        //g_print ("GPS status: %d\n", device->status);
-       g_string_append_printf (msg, "GPS status: %d\n", device->status);
 
   hildon_gtk_window_set_progress_indicator(GTK_WINDOW(app_data->window), device->status == LOCATION_GPS_DEVICE_STATUS_NO_FIX);
 
@@ -239,11 +240,8 @@ on_gps_device_changed (LocationGPSDevice *device, gpointer data)
        //              g_print ("Mobile Coutry Code WCDMA: %d\n", device->cell_info->wcdma_cell_info.mcc);
        //}
 
-  gtk_label_set_text(info, msg->str);
   if(device->status != LOCATION_GPS_DEVICE_STATUS_NO_FIX)
     gtk_widget_set_sensitive(GTK_WIDGET(app_data->start_stop_button), TRUE);
-  //gtk_widget_show(GTK_WIDGET(info));
-  g_string_free(msg, TRUE);
 }
 
 static void
@@ -288,8 +286,8 @@ int main (int argc, char **argv)
        hildon_program_add_window (data->program, HILDON_WINDOW (data->window));
 
   data->wp_marker_str = g_string_sized_new(64);
-  data->main_vbox = (void*)gtk_vbox_new(FALSE, 0);
-  data->btn_hbox = (void*)gtk_hbox_new(TRUE, 0);
+  data->main_vbox = (gpointer)gtk_vbox_new(FALSE, 0);
+  data->btn_hbox = (gpointer)gtk_hbox_new(TRUE, 0);
 
   data->start_stop_button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_THUMB_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH));
   gtk_button_set_label (data->start_stop_button, "Start");
@@ -300,10 +298,72 @@ int main (int argc, char **argv)
   gtk_box_pack_start(GTK_BOX(data->btn_hbox), GTK_WIDGET(data->start_stop_button), FALSE, FALSE, 8);
   gtk_box_pack_start(GTK_BOX(data->btn_hbox), GTK_WIDGET(data->save_button), FALSE, FALSE, 8);
   gtk_box_pack_start(GTK_BOX(data->main_vbox), GTK_WIDGET(data->btn_hbox), FALSE, FALSE, 0);
-  data->status_label = gtk_label_new("Waiting for GPS ...");
-  gtk_box_pack_start_defaults(GTK_BOX(data->main_vbox), data->status_label);
 
-  data->wp_hbox = (void*)gtk_hbox_new(TRUE, 0);
+  data->loc_hbox = (gpointer)gtk_hbox_new(FALSE, 0);
+  data->loc_gps_data_table = (gpointer)gtk_table_new(4, 2, FALSE);
+  {
+    GtkWidget *lat_label = gtk_label_new("Lat:");
+    GtkWidget *lon_label = gtk_label_new("Lon:");
+    GtkWidget *alt_label = gtk_label_new("Alt:");
+    GtkWidget *sat_label = gtk_label_new("Sat:");
+    gtk_misc_set_alignment (GTK_MISC (lat_label), 1, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (lon_label), 1, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (alt_label), 1, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (sat_label), 1, 0.5);
+    gtk_table_attach_defaults(data->loc_gps_data_table, lat_label, 0, 1, 0, 1);
+    gtk_table_attach_defaults(data->loc_gps_data_table, lon_label, 0, 1, 1, 2);
+    gtk_table_attach_defaults(data->loc_gps_data_table, alt_label, 0, 1, 2, 3);
+    gtk_table_attach_defaults(data->loc_gps_data_table, sat_label, 0, 1, 3, 4);
+    data->lat_val_label = gtk_label_new(" ?");
+    data->lon_val_label = gtk_label_new(" ?");
+    data->alt_val_label = gtk_label_new(" ?");
+    data->sat_val_label = gtk_label_new(" 0/ 0");
+    gtk_misc_set_alignment (GTK_MISC (data->lat_val_label), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (data->lon_val_label), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (data->alt_val_label), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (data->sat_val_label), 0, 0.5);
+    gtk_table_attach_defaults(data->loc_gps_data_table, data->lat_val_label, 1, 2, 0, 1);
+    gtk_table_attach_defaults(data->loc_gps_data_table, data->lon_val_label, 1, 2, 1, 2);
+    gtk_table_attach_defaults(data->loc_gps_data_table, data->alt_val_label, 1, 2, 2, 3);
+    gtk_table_attach_defaults(data->loc_gps_data_table, data->sat_val_label, 1, 2, 3, 4);
+  }
+  data->loc_gps_data = hildon_caption_new(NULL, "", (gpointer)data->loc_gps_data_table, NULL, HILDON_CAPTION_MANDATORY);
+  //hildon_caption_set_label_alignment(data->loc_gps_data, 0);
+  //hildon_caption_set_separator((gpointer)data->loc_gps_data, "   ");
+  hildon_caption_set_label_markup((gpointer)data->loc_gps_data, "<big><b>GPS data</b></big>");
+  gtk_box_pack_start(GTK_BOX(data->loc_hbox), GTK_WIDGET(data->loc_gps_data), TRUE, FALSE, 4);
+
+  //gtk_box_pack_start(GTK_BOX(data->loc_hbox), gtk_vseparator_new(), TRUE, FALSE, 0);
+
+  data->loc_track_data_table = (gpointer)gtk_table_new(4, 2, FALSE);
+  data->loc_track_data = hildon_caption_new(NULL, "", (gpointer)data->loc_track_data_table, NULL, HILDON_CAPTION_MANDATORY);
+  //hildon_caption_set_label_alignment((gpointer)data->loc_track_data, 0);
+  hildon_caption_set_label_markup((gpointer)data->loc_track_data, "<big><b>Track</b></big>");
+  {
+    GtkWidget *speed_label = gtk_label_new("Speed:");
+    GtkWidget *track_label = gtk_label_new("Heading:");
+    GtkWidget *climb_label = gtk_label_new("Climb:");
+    gtk_misc_set_alignment (GTK_MISC (speed_label), 1, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (track_label), 1, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (climb_label), 1, 0.5);
+    gtk_table_attach_defaults(data->loc_track_data_table, speed_label, 0, 1, 0, 1);
+    gtk_table_attach_defaults(data->loc_track_data_table, track_label, 0, 1, 1, 2);
+    gtk_table_attach_defaults(data->loc_track_data_table, climb_label, 0, 1, 2, 3);
+    data->speed_val_label = gtk_label_new(" ?");
+    data->track_val_label = gtk_label_new(" ?");
+    data->climb_val_label = gtk_label_new(" ?");
+    gtk_misc_set_alignment (GTK_MISC (data->speed_val_label), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (data->track_val_label), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (data->climb_val_label), 0, 0.5);
+    gtk_table_attach_defaults(data->loc_track_data_table, data->speed_val_label, 1, 2, 0, 1);
+    gtk_table_attach_defaults(data->loc_track_data_table, data->track_val_label, 1, 2, 1, 2);
+    gtk_table_attach_defaults(data->loc_track_data_table, data->climb_val_label, 1, 2, 2, 3);
+  }
+  gtk_box_pack_end(GTK_BOX(data->loc_hbox), GTK_WIDGET(data->loc_track_data), TRUE, FALSE, 4);
+
+  gtk_box_pack_start(GTK_BOX(data->main_vbox), GTK_WIDGET(data->loc_hbox), TRUE, FALSE, 0);
+
+  data->wp_hbox = (gpointer)gtk_hbox_new(TRUE, 0);
   //data->wp_label = gtk_label_new("Marker:");
   data->wp_name_entry = hildon_entry_new (HILDON_SIZE_HALFSCREEN_WIDTH);
   //hildon_entry_set_placeholder (HILDON_ENTRY (data->wp_name_entry), "First name");