Added support for marker setting

diff --git a/debian/changelog b/debian/changelog
index 31f3c16..a8a9b07 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gps-tracker (1.0-4) unstable; urgency=low
+
+  * Added support for marker setting
+
+ -- Dr. Johann Pfefferl <pfefferl@gmx.net>  Tue, 25 May 2010 21:28:33 +0200
+
 gps-tracker (1.0-3) unstable; urgency=low
 
   * A new releasde is built

diff --git a/gps-tracker.c b/gps-tracker.c
index 672ed7c..7c58c00 100644 (file)
--- a/gps-tracker.c
+++ b/gps-tracker.c
@@ -15,6 +15,10 @@ typedef struct {
     GtkWidget * main_vbox, *btn_hbox;
     GtkWidget *status_label;
     GtkButton *start_stop_button, *save_button;
+    GtkWidget *wp_hbox, *wp_label, *wp_name_entry;
+    //GtkWidget *wp_label;
+    GtkButton *wp_set_btn;
+    GString *wp_marker_str;
     gboolean tracking_is_on;
     FILE *outf_p;
     gchar *working_dir;
@@ -65,6 +69,21 @@ static void write_gpx_footer(FILE *fp)
   g_fprintf(fp, "</trkseg>\n</trk>\n</gpx>\n");
 }
 
+static void cb_wp_set_btn (GtkWidget * w, AppData * data)
+{
+  HildonEntry *entry = (HildonEntry*)data->wp_name_entry;
+  const gchar *marker_name = hildon_entry_get_text(entry);
+  if(marker_name[0]) {
+    g_string_assign(data->wp_marker_str, marker_name);
+    //hildon_banner_show_information(GTK_WIDGET(data->window), NULL, data->wp_marker_str->str);
+    hildon_entry_set_text(entry, "");
+  }
+  else {
+    g_string_truncate(data->wp_marker_str, 0);
+    hildon_banner_show_information(GTK_WIDGET(data->window), NULL, "WARNING: no marker name given");
+  }
+}
+
 static void cb_start_stop (GtkWidget * w, AppData * data)
 {
   data->tracking_is_on = !data->tracking_is_on;
@@ -123,10 +142,16 @@ on_gps_device_changed (LocationGPSDevice *device, gpointer data)
       g_string_append_printf (msg, "lat = %f, long = %f\n",
           device->fix->latitude,
           device->fix->longitude);
-      if(fp)
+      if(fp) {
         g_fprintf(fp, "\n<trkpt lat=\"%s\" lon=\"%s\">\n",
           g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->latitude),
           g_ascii_formatd(sbuf2, sizeof(sbuf2), "%f", device->fix->longitude));
+        if(app_data->wp_marker_str->len) {
+          g_fprintf(fp, "<name>%s</name>\n", app_data->wp_marker_str->str);
+          hildon_banner_show_information(GTK_WIDGET(app_data->window), NULL, app_data->wp_marker_str->str);
+          g_string_truncate(app_data->wp_marker_str, 0);
+        }
+      }
 
       if (device->fix->fields & LOCATION_GPS_DEVICE_TIME_SET) {
         //g_print ("time = %f\n", device->fix->time);
@@ -256,9 +281,10 @@ int main (int argc, char **argv)
        data->program = hildon_program_get_instance ();
        g_set_application_name("GPS tracker");
 
-       data->window = HILDON_WINDOW(hildon_stackable_window_new ());
+       data->window = HILDON_WINDOW(hildon_stackable_window_new());
        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);
 
@@ -273,11 +299,24 @@ int main (int argc, char **argv)
   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->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");
+  data->wp_set_btn = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH));
+  gtk_button_set_label (data->wp_set_btn, "Set marker");
+  //gtk_box_pack_start(GTK_BOX(data->wp_hbox), GTK_WIDGET(data->wp_label), TRUE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(data->wp_hbox), GTK_WIDGET(data->wp_name_entry), TRUE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(data->wp_hbox), GTK_WIDGET(data->wp_set_btn), TRUE, FALSE, 0);
+  gtk_box_pack_end(GTK_BOX(data->main_vbox), GTK_WIDGET(data->wp_hbox), FALSE, FALSE, 0);
+
        /* Add vbox to main window */
        gtk_container_add (GTK_CONTAINER (data->window), GTK_WIDGET(data->main_vbox));
 
   g_signal_connect (G_OBJECT (data->save_button), "clicked", G_CALLBACK (cb_file_save), data);
   g_signal_connect (G_OBJECT (data->start_stop_button), "clicked", G_CALLBACK (cb_start_stop), data);
+  g_signal_connect (G_OBJECT (data->wp_set_btn), "clicked", G_CALLBACK (cb_wp_set_btn), data);
        g_signal_connect (G_OBJECT (data->window), "destroy",
                        G_CALLBACK (gtk_main_quit), NULL);
 
@@ -314,6 +353,7 @@ int main (int argc, char **argv)
   g_unlink(data->intermediate_gpx_data_filename);
   g_free(data->working_dir);
   g_free(data->intermediate_gpx_data_filename);
+  g_string_free(data->wp_marker_str, TRUE);
   g_free(data);
        g_object_unref (device);
        g_object_unref (control);