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));
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));
}
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));
}
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->loc_hbox = (gpointer)gtk_hbox_new(FALSE, 0);
data->loc_gps_data_table = (gpointer)gtk_table_new(4, 2, FALSE);
{
+ GtkWidget *alignment_gps = gtk_alignment_new (0.5, 0.5, 1, 1);
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_alignment_set_padding(GTK_ALIGNMENT(alignment_gps), 0,0,0,0);
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_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_container_add (GTK_CONTAINER (alignment_gps), GTK_WIDGET(data->loc_gps_data));
+ gtk_box_pack_start(GTK_BOX(data->loc_hbox), alignment_gps, TRUE, FALSE, 0);
}
- 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>");
+ data->loc_track_data_table = (gpointer)gtk_table_new(4, 2, TRUE);
{
+ GtkWidget *alignment_track = gtk_alignment_new (0.5, 0.5, 1, 1);
GtkWidget *speed_label = gtk_label_new("Speed:");
GtkWidget *track_label = gtk_label_new("Heading:");
GtkWidget *climb_label = gtk_label_new("Climb:");
+ gtk_alignment_set_padding(GTK_ALIGNMENT(alignment_track), 0,0,0,0);
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, 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);
+ 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>");
+ gtk_container_add (GTK_CONTAINER (alignment_track), GTK_WIDGET(data->loc_track_data));
+ gtk_box_pack_end(GTK_BOX(data->loc_hbox), alignment_track, TRUE, FALSE, 0);
}
- 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);
projects / gps-tracker / blobdiff