Remove dependencies to gob2

[andy/viking.git] / src / viktrwlayer_propwin.c

diff --git a/src/viktrwlayer_propwin.c b/src/viktrwlayer_propwin.c
index a562e9f3f646590c6cac7f600fd30157bf959bf2..69de34a12f0faf16f020ae3ab2dc1fe88b8383b7 100644 (file)
--- a/src/viktrwlayer_propwin.c
+++ b/src/viktrwlayer_propwin.c
@@ -62,6 +62,7 @@ typedef struct _propwidgets {
   VikTrack *tr;
   VikLayersPanel *vlp;
   gchar *track_name;
   VikTrack *tr;
   VikLayersPanel *vlp;
   gchar *track_name;

+  GtkWidget *dialog;

   GtkWidget *w_comment;
   GtkWidget *w_track_length;
   GtkWidget *w_tp_count;
   GtkWidget *w_comment;
   GtkWidget *w_track_length;
   GtkWidget *w_tp_count;


@@ -75,9 +76,14 @@ typedef struct _propwidgets {
   GtkWidget *w_time_start;
   GtkWidget *w_time_end;
   GtkWidget *w_time_dur;
   GtkWidget *w_time_start;
   GtkWidget *w_time_end;
   GtkWidget *w_time_dur;

-  GtkWidget *w_dist_time;
+  GtkWidget *w_cur_dist; /*< Current distance */
+  GtkWidget *w_cur_time; /*< Current time */
+  gdouble   track_length;

   PropSaved elev_graph_saved_img;
   PropSaved speed_graph_saved_img;
   PropSaved elev_graph_saved_img;
   PropSaved speed_graph_saved_img;

+  GtkWidget *elev_box;
+  GtkWidget *speed_box;
+  VikTrackpoint *marker_tp;

 } PropWidgets;
 
 static PropWidgets *prop_widgets_new()
 } PropWidgets;
 
 static PropWidgets *prop_widgets_new()


@@ -114,7 +120,7 @@ static void minmax_alt(const gdouble *altitudes, gdouble *min, gdouble *max)
 
 #define MARGIN 70
 #define LINES 5
 
 #define MARGIN 70
 #define LINES 5

-static void set_center_at_graph_position(gdouble event_x, gint img_width, VikLayersPanel *vlp, VikTrack *tr, gboolean time_base)
+static VikTrackpoint *set_center_at_graph_position(gdouble event_x, gint img_width, VikLayersPanel *vlp, VikTrack *tr, gboolean time_base)

 {
   VikTrackpoint *trackpoint;
   gdouble x = event_x - img_width / 2 + PROFILE_WIDTH / 2 - MARGIN / 2;
 {
   VikTrackpoint *trackpoint;
   gdouble x = event_x - img_width / 2 + PROFILE_WIDTH / 2 - MARGIN / 2;


@@ -133,6 +139,7 @@ static void set_center_at_graph_position(gdouble event_x, gint img_width, VikLay
     vik_viewport_set_center_coord ( vik_layers_panel_get_viewport(vlp), &coord );
     vik_layers_panel_emit_update ( vlp );
   }
     vik_viewport_set_center_coord ( vik_layers_panel_get_viewport(vlp), &coord );
     vik_layers_panel_emit_update ( vlp );
   }

+  return trackpoint;

 }
 
 static void draw_graph_mark(GtkWidget *image, gdouble event_x, gint img_width, GdkGC *gc, PropSaved *saved_img)
 }
 
 static void draw_graph_mark(GtkWidget *image, gdouble event_x, gint img_width, GdkGC *gc, PropSaved *saved_img)


@@ -142,7 +149,7 @@ static void draw_graph_mark(GtkWidget *image, gdouble event_x, gint img_width, G
   /* the pixmap = margin + graph area */
   gdouble x = event_x - img_width/2 + PROFILE_WIDTH/2 + MARGIN/2;
 
   /* the pixmap = margin + graph area */
   gdouble x = event_x - img_width/2 + PROFILE_WIDTH/2 + MARGIN/2;
 

-  fprintf(stderr, "event_x=%f img_width=%d x=%f\n", event_x, img_width, x);
+  // fprintf(stderr, "event_x=%f img_width=%d x=%f\n", event_x, img_width, x);

 
   gtk_image_get_pixmap(GTK_IMAGE(image), &pix, NULL);
   if (saved_img->saved) {
 
   gtk_image_get_pixmap(GTK_IMAGE(image), &pix, NULL);
   if (saved_img->saved) {


@@ -178,10 +185,49 @@ static void track_graph_click( GtkWidget *event_box, GdkEventButton *event, gpoi
   GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(event_box));
 
 
   GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(event_box));
 
 

-  set_center_at_graph_position(event->x, event_box->allocation.width, vlp, tr, is_vt_graph);
+  VikTrackpoint *trackpoint = set_center_at_graph_position(event->x, event_box->allocation.width, vlp, tr, is_vt_graph);

   draw_graph_mark(image, event->x, event_box->allocation.width, window->style->black_gc,
       is_vt_graph ? &widgets->speed_graph_saved_img : &widgets->elev_graph_saved_img);
   g_list_free(child);
   draw_graph_mark(image, event->x, event_box->allocation.width, window->style->black_gc,
       is_vt_graph ? &widgets->speed_graph_saved_img : &widgets->elev_graph_saved_img);
   g_list_free(child);

+  widgets->marker_tp = trackpoint;
+  gtk_dialog_set_response_sensitive(GTK_DIALOG(widgets->dialog), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, TRUE);
+
+  /* draw on the other graph */
+  if (trackpoint == NULL || widgets->elev_box == NULL || widgets->speed_box == NULL)
+    /* This test assumes we have only 2 graphs */
+    return;
+
+  gdouble pc = NAN;
+  gdouble x2;
+  GList *other_child = gtk_container_get_children(GTK_CONTAINER(
+                         is_vt_graph ? widgets->elev_box : widgets->speed_box));
+  GtkWidget *other_image = GTK_WIDGET(other_child->data);
+  if (is_vt_graph) {
+    gdouble dist = 0.0;
+    GList *iter;
+    for (iter = tr->trackpoints->next; iter != NULL; iter = iter->next) {
+      dist += vik_coord_diff(&(VIK_TRACKPOINT(iter->data)->coord),
+                                 &(VIK_TRACKPOINT(iter->prev->data)->coord));
+      /* Assuming trackpoint is not a copy */
+      if (trackpoint == VIK_TRACKPOINT(iter->data))
+        break;
+    }
+    if (iter != NULL)
+      pc = dist/widgets->track_length;
+  } else {
+    time_t t_start, t_end, t_total;
+    t_start = VIK_TRACKPOINT(tr->trackpoints->data)->timestamp;
+    t_end = VIK_TRACKPOINT(g_list_last(tr->trackpoints)->data)->timestamp;
+    t_total = t_end - t_start;
+    pc = (gdouble)(trackpoint->timestamp - t_start)/t_total;
+  }
+  if (!isnan(pc)) {
+    x2 = pc * PROFILE_WIDTH + MARGIN + (event_box->allocation.width/2 - PROFILE_WIDTH/2 - MARGIN/2);
+    draw_graph_mark(other_image, x2, event_box->allocation.width, window->style->black_gc,
+      is_vt_graph ? &widgets->elev_graph_saved_img : &widgets->speed_graph_saved_img);
+  }
+
+  g_list_free(other_child);

 
 }
 
 
 }
 


@@ -217,10 +263,10 @@ void track_profile_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass
 
   gdouble meters_from_start;
   VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( tr, (gdouble) x / PROFILE_WIDTH, &meters_from_start );
 
   gdouble meters_from_start;
   VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( tr, (gdouble) x / PROFILE_WIDTH, &meters_from_start );

-  if (trackpoint && widgets->w_dist_time) {
+  if (trackpoint && widgets->w_cur_dist) {

     static gchar tmp_buf[20];
     g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m", meters_from_start);
     static gchar tmp_buf[20];
     g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m", meters_from_start);

-    gtk_label_set_text(GTK_LABEL(widgets->w_dist_time), tmp_buf);
+    gtk_label_set_text(GTK_LABEL(widgets->w_cur_dist), tmp_buf);

   }
 }
 
   }
 }
 


@@ -244,7 +290,7 @@ void track_vt_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass_alon
 
   time_t seconds_from_start;
   VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( tr, (gdouble) x / PROFILE_WIDTH, &seconds_from_start );
 
   time_t seconds_from_start;
   VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( tr, (gdouble) x / PROFILE_WIDTH, &seconds_from_start );

-  if (trackpoint && widgets->w_dist_time) {
+  if (trackpoint && widgets->w_cur_time) {

     static gchar tmp_buf[20];
     guint h, m, s;
     h = seconds_from_start/3600;
     static gchar tmp_buf[20];
     guint h, m, s;
     h = seconds_from_start/3600;


@@ -252,7 +298,7 @@ void track_vt_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass_alon
     s = seconds_from_start - (3600*h) - (60*m);
     g_snprintf(tmp_buf, sizeof(tmp_buf), "%02d:%02d:%02d", h, m, s);
 
     s = seconds_from_start - (3600*h) - (60*m);
     g_snprintf(tmp_buf, sizeof(tmp_buf), "%02d:%02d:%02d", h, m, s);
 

-    gtk_label_set_text(GTK_LABEL(widgets->w_dist_time), tmp_buf);
+    gtk_label_set_text(GTK_LABEL(widgets->w_cur_time), tmp_buf);

   }
 }
 
   }
 }
 


@@ -532,6 +578,7 @@ static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widg
 {
   VikTrack *tr = widgets->tr;
   VikTrwLayer *vtl = widgets->vtl;
 {
   VikTrack *tr = widgets->tr;
   VikTrwLayer *vtl = widgets->vtl;

+  gboolean keep_dialog = FALSE;

 
   /* FIXME: check and make sure the track still exists before doing anything to it */
   /* Note: destroying diaglog (eg, parent window exit) won't give "response" */
 
   /* FIXME: check and make sure the track still exists before doing anything to it */
   /* Note: destroying diaglog (eg, parent window exit) won't give "response" */


@@ -591,15 +638,76 @@ static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widg
         }
       }
       break;
         }
       }
       break;

+    case VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER:
+      {
+        GList *iter = tr->trackpoints;
+        while ((iter = iter->next)) {
+          if (widgets->marker_tp == VIK_TRACKPOINT(iter->data))
+            break;
+        }
+        if (iter == NULL) {
+          a_dialog_msg(VIK_GTK_WINDOW_FROM_LAYER(vtl), GTK_MESSAGE_ERROR,
+                  _("Failed spliting track. Track unchanged"), NULL);
+          keep_dialog = TRUE;
+          break;
+        }
+
+        gchar *r_name = g_strdup_printf("%s #R", widgets->track_name);
+        if (vik_trw_layer_get_track(vtl, r_name ) && 
+             ( ! a_dialog_overwrite( VIK_GTK_WINDOW_FROM_LAYER(vtl),
+              "The track \"%s\" exists, do you wish to overwrite it?", r_name)))
+        {
+            gchar *new_r_name = a_dialog_new_track( VIK_GTK_WINDOW_FROM_LAYER(vtl), vik_trw_layer_get_tracks(vtl) );
+            if (new_r_name) {
+              g_free( r_name );
+              r_name = new_r_name;
+            }
+            else {
+              a_dialog_msg(VIK_GTK_WINDOW_FROM_LAYER(vtl), GTK_MESSAGE_WARNING,
+                  _("Operation Aborted. Track unchanged"), NULL);
+              keep_dialog = TRUE;
+              break;
+            }
+        }
+        iter->prev->next = NULL;
+        iter->prev = NULL;
+        VikTrack *tr_right = vik_track_new();
+        if ( tr->comment )
+          vik_track_set_comment ( tr_right, tr->comment );
+        tr_right->visible = tr->visible;
+        tr_right->trackpoints = iter;
+
+        vik_trw_layer_add_track(vtl, r_name, tr_right);
+        vik_layer_emit_update ( VIK_LAYER(vtl) );
+      }
+      break;

     default:
       fprintf(stderr, "DEBUG: unknown response\n");
       return;
   }
 
   /* Keep same behaviour for now: destroy dialog if click on any button */
     default:
       fprintf(stderr, "DEBUG: unknown response\n");
       return;
   }
 
   /* Keep same behaviour for now: destroy dialog if click on any button */

-  prop_widgets_free(widgets);
-  vik_track_clear_property_dialog(tr);
-  gtk_widget_destroy ( GTK_WIDGET(dialog) );
+  if (!keep_dialog) {
+    prop_widgets_free(widgets);
+    vik_track_clear_property_dialog(tr);
+    gtk_widget_destroy ( GTK_WIDGET(dialog) );
+  }
+}
+
+static GtkWidget *create_graph_page ( GtkWidget *graph,
+                                     const gchar *markup,
+                                     GtkWidget *value)
+{
+  GtkWidget *hbox = gtk_hbox_new ( FALSE, 10 );
+  GtkWidget *vbox = gtk_vbox_new ( FALSE, 10 );
+  GtkWidget *label = gtk_label_new (NULL);
+  gtk_box_pack_start (GTK_BOX(vbox), graph, FALSE, FALSE, 0);
+  gtk_label_set_markup ( GTK_LABEL(label), markup );
+  gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX(hbox), value, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+  
+  return vbox;

 }
 
 void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *tr, gpointer vlp, gchar *track_name )
 }
 
 void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *tr, gpointer vlp, gchar *track_name )


@@ -615,11 +723,13 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *
                          parent,
                          GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
                          GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
                          parent,
                          GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
                          GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,

+                         _("Split at Marker"), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER,

                          _("Split Segments"), VIK_TRW_LAYER_PROPWIN_SPLIT,
                          _("Reverse"),        VIK_TRW_LAYER_PROPWIN_REVERSE,
                          _("Delete Dupl."),   VIK_TRW_LAYER_PROPWIN_DEL_DUP,
                          GTK_STOCK_OK,     GTK_RESPONSE_ACCEPT,
                          NULL);
                          _("Split Segments"), VIK_TRW_LAYER_PROPWIN_SPLIT,
                          _("Reverse"),        VIK_TRW_LAYER_PROPWIN_REVERSE,
                          _("Delete Dupl."),   VIK_TRW_LAYER_PROPWIN_DEL_DUP,
                          GTK_STOCK_OK,     GTK_RESPONSE_ACCEPT,
                          NULL);

+  widgets->dialog = dialog;

   g_free(title);
   g_signal_connect(dialog, "response", G_CALLBACK(propwin_response_cb), widgets);
   //fprintf(stderr, "DEBUG: dialog=0x%p\n", dialog);
   g_free(title);
   g_signal_connect(dialog, "response", G_CALLBACK(propwin_response_cb), widgets);
   //fprintf(stderr, "DEBUG: dialog=0x%p\n", dialog);


@@ -632,11 +742,14 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *
   GtkWidget *vtdiag = vik_trw_layer_create_vtdiag(GTK_WIDGET(parent), tr, vlp, widgets);
   GtkWidget *graphs = gtk_notebook_new();
 
   GtkWidget *vtdiag = vik_trw_layer_create_vtdiag(GTK_WIDGET(parent), tr, vlp, widgets);
   GtkWidget *graphs = gtk_notebook_new();
 

+  widgets->elev_box = profile;
+  widgets->speed_box = vtdiag;
+

   GtkWidget *content[20];
   int cnt;
   int i;
 
   GtkWidget *content[20];
   int cnt;
   int i;
 

-  static gchar *label_texts[] = { N_("<b>Comment:</b>"), N_("<b>Track Length:</b>"), N_("<b>Trackpoints:</b>"), N_("<b>Segments:</b>"), N_("<b>Duplicate Points:</b>"), N_("<b>Max Speed:</b>"), N_("<b>Avg. Speed:</b>"), N_("<b>Avg. Dist. Between TPs:</b>"), N_("<b>Elevation Range:</b>"), N_("<b>Total Elevation Gain/Loss:</b>"), N_("<b>Start:</b>"), N_("<b>End:</b>"), N_("<b>Duration:</b>"), N_("<b>Track Distance/Time:</b>") };
+  static gchar *label_texts[] = { N_("<b>Comment:</b>"), N_("<b>Track Length:</b>"), N_("<b>Trackpoints:</b>"), N_("<b>Segments:</b>"), N_("<b>Duplicate Points:</b>"), N_("<b>Max Speed:</b>"), N_("<b>Avg. Speed:</b>"), N_("<b>Avg. Dist. Between TPs:</b>"), N_("<b>Elevation Range:</b>"), N_("<b>Total Elevation Gain/Loss:</b>"), N_("<b>Start:</b>"), N_("<b>End:</b>"), N_("<b>Duration:</b>") };

   static gchar tmp_buf[50];
   gdouble tmp_speed;
 
   static gchar tmp_buf[50];
   gdouble tmp_speed;
 


@@ -647,7 +760,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *
   g_signal_connect_swapped ( widgets->w_comment, "activate", G_CALLBACK(a_dialog_response_accept), GTK_DIALOG(dialog) );
   content[cnt++] = widgets->w_comment;
 
   g_signal_connect_swapped ( widgets->w_comment, "activate", G_CALLBACK(a_dialog_response_accept), GTK_DIALOG(dialog) );
   content[cnt++] = widgets->w_comment;
 

-  tr_len = vik_track_get_length(tr);
+  tr_len = widgets->track_length = vik_track_get_length(tr);

   g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m", tr_len );
   widgets->w_track_length = content[cnt++] = gtk_label_new ( tmp_buf );
 
   g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m", tr_len );
   widgets->w_track_length = content[cnt++] = gtk_label_new ( tmp_buf );
 


@@ -730,7 +843,6 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *
     widgets->w_time_end = content[cnt++] = gtk_label_new(_("No Data"));
     widgets->w_time_dur = content[cnt++] = gtk_label_new(_("No Data"));
   }
     widgets->w_time_end = content[cnt++] = gtk_label_new(_("No Data"));
     widgets->w_time_dur = content[cnt++] = gtk_label_new(_("No Data"));
   }

-  widgets->w_dist_time = content[cnt++] = gtk_label_new(_("No Data"));

 
   table = GTK_TABLE(gtk_table_new (cnt, 2, FALSE));
   gtk_table_set_col_spacing (table, 0, 10);
 
   table = GTK_TABLE(gtk_table_new (cnt, 2, FALSE));
   gtk_table_set_col_spacing (table, 0, 10);


@@ -747,16 +859,25 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *
     gtk_table_attach_defaults ( table, content[i], 1, 2, i, i+1 );
   }
 
     gtk_table_attach_defaults ( table, content[i], 1, 2, i, i+1 );
   }
 

-  gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), GTK_WIDGET(table), FALSE, FALSE, 0);
+  gtk_notebook_append_page(GTK_NOTEBOOK(graphs), GTK_WIDGET(table), gtk_label_new(_("Statistics")));

 
 

-  if ( profile )
-    gtk_notebook_append_page(GTK_NOTEBOOK(graphs), profile, gtk_label_new(_("Elevation-distance")));
+  if ( profile ) {
+    GtkWidget *page = NULL;
+    widgets->w_cur_dist = gtk_label_new(_("No Data"));
+    page = create_graph_page (profile, _("<b>Track Distance:</b>"), widgets->w_cur_dist );
+    gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Elevation-distance")));
+  }

 
 

-  if ( vtdiag )
-    gtk_notebook_append_page(GTK_NOTEBOOK(graphs), vtdiag, gtk_label_new(_("Speed-time")));
+  if ( vtdiag ) {
+    GtkWidget *page = NULL;
+    widgets->w_cur_time = gtk_label_new(_("No Data"));
+    page = create_graph_page (vtdiag, _("<b>Track Time:</b>"), widgets->w_cur_time );
+    gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Speed-time")));
+  }

 
   gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), graphs, FALSE, FALSE, 0);
 
 
   gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), graphs, FALSE, FALSE, 0);
 

+  gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, FALSE);

   if (seg_count <= 1)
     gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_SPLIT, FALSE);
   if (vik_track_get_dup_point_count(tr) <= 0)
   if (seg_count <= 1)
     gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_SPLIT, FALSE);
   if (vik_track_get_dup_point_count(tr) <= 0)