g_free(filename);
}
-static void
-on_gps_device_changed (LocationGPSDevice *device, gpointer data)
+#define SPAN_PREFIX "<span font_family='monospace'>"
+#define SPAN_POST "</span>"
+#define LABEL_FMT(s) SPAN_PREFIX s SPAN_POST
+#define CHANGE_LABEL(w,fmt,val) change_label_text(w, SPAN_PREFIX fmt SPAN_POST, val)
+#define CHANGE_LABEL2(w,fmt,val1, val2) change_label_text(w, SPAN_PREFIX fmt SPAN_POST, val1, val2)
+
+static void change_label_text(GtkWidget *l, gchar *format, ...)
+{
+ va_list args;
+ gchar buf[512];
+ va_start(args, format);
+ g_vsnprintf(buf, sizeof(buf), format, args);
+ va_end(args);
+ gtk_label_set_markup(GTK_LABEL(l), buf);
+}
+
+static void on_gps_device_changed (LocationGPSDevice *device, gpointer data)
{
AppData *app_data = data;
FILE *fp = app_data->outf_p;
- gchar sbuf1[30*G_ASCII_DTOSTR_BUF_SIZE], sbuf2[2*G_ASCII_DTOSTR_BUF_SIZE];
+ gchar sbuf1[G_ASCII_DTOSTR_BUF_SIZE], sbuf2[G_ASCII_DTOSTR_BUF_SIZE];
if (!device)
return;
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);
- 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));
+ CHANGE_LABEL(app_data->lat_val_label, "% 9.6f", device->fix->latitude);
+ CHANGE_LABEL(app_data->lon_val_label, "% 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),
if (device->fix->fields & LOCATION_GPS_DEVICE_ALTITUDE_SET) {
//g_print ("alt = %f\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));
+ CHANGE_LABEL(app_data->alt_val_label, "% 5.0f", device->fix->altitude);
if(fp)
- g_fprintf(fp, "<ele>%s</ele>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->altitude));
+ g_fprintf(fp, "<ele>%s</ele>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%.1f", device->fix->altitude));
}
if (device->fix->fields & LOCATION_GPS_DEVICE_SPEED_SET) {
//g_print ("speed = %f\n", 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);
+ CHANGE_LABEL(app_data->speed_val_label, "% 5.1fkm/h", device->fix->speed);
if(fp)
- g_fprintf(fp, "<speed>%s</speed>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->speed));
+ g_fprintf(fp, "<speed>%s</speed>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%.1f", device->fix->speed));
}
if (device->fix->fields & LOCATION_GPS_DEVICE_TRACK_SET) {
//g_print ("track = %f\n", 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);
+ CHANGE_LABEL(app_data->track_val_label, "%4.0f°", device->fix->track);
if(fp)
- g_fprintf(fp, "<course>%s</course>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%f", device->fix->track));
+ g_fprintf(fp, "<course>%s</course>\n", g_ascii_formatd(sbuf1, sizeof(sbuf1), "%.1f", device->fix->track));
}
if (device->fix->fields & LOCATION_GPS_DEVICE_CLIMB_SET) {
//g_print ("climb = %f\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);
+ CHANGE_LABEL(app_data->climb_val_label, "%+4.0f°", device->fix->climb);
}
//g_print ("Accuracy values:\n");
//g_print ("Satellites in view: %d\n", device->satellites_in_view);
//g_print ("Satellites in use: %d\n", device->satellites_in_use);
- 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);
+ CHANGE_LABEL2(app_data->sat_val_label, "%3d/%2d", device->satellites_in_use, device->satellites_in_view);
//g_print ("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);
data->working_dir = g_strdup_printf("%s" G_DIR_SEPARATOR_S "MyDocs", g_get_home_dir());
data->intermediate_gpx_data_filename = g_strdup_printf("%s" G_DIR_SEPARATOR_S ".gps-tracker.gpx", data->working_dir);
data->program = hildon_program_get_instance ();
- g_set_application_name("GPS tracker");
+ g_set_application_name("GPS Træcker");
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 = (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");
- gtk_widget_set_sensitive(GTK_WIDGET(data->start_stop_button), FALSE);
- data->save_button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_THUMB_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH));
- gtk_button_set_label (data->save_button, "Save");
- gtk_widget_set_sensitive(GTK_WIDGET(data->save_button), FALSE);
- 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->loc_hbox = (gpointer)gtk_hbox_new(FALSE, 0);
data->loc_gps_data_table = (gpointer)gtk_table_new(4, 2, FALSE);
{
gtk_box_pack_start(GTK_BOX(data->loc_hbox), alignment_gps, TRUE, FALSE, 0);
}
- //gtk_box_pack_start(GTK_BOX(data->loc_hbox), gtk_vseparator_new(), TRUE, FALSE, 0);
+ 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, TRUE);
{
//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));
+ data->wp_set_btn = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_HALFSCREEN_WIDTH));
gtk_button_set_label (data->wp_set_btn, "Set marker");
gtk_widget_set_sensitive(GTK_WIDGET(data->wp_set_btn), FALSE);
//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);
+ gtk_box_pack_start(GTK_BOX(data->main_vbox), GTK_WIDGET(data->wp_hbox), FALSE, 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");
+ gtk_widget_set_sensitive(GTK_WIDGET(data->start_stop_button), FALSE);
+ data->save_button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_THUMB_HEIGHT | HILDON_SIZE_HALFSCREEN_WIDTH));
+ gtk_button_set_label (data->save_button, "Save");
+ gtk_widget_set_sensitive(GTK_WIDGET(data->save_button), FALSE);
+ 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, 4);
/* Add vbox to main window */
gtk_container_add (GTK_CONTAINER (data->window), GTK_WIDGET(data->main_vbox));
projects / gps-tracker / blobdiff