VikTrack *tr;
VikLayersPanel *vlp;
gchar *track_name;
+ GtkWidget *dialog;
GtkWidget *w_comment;
GtkWidget *w_track_length;
GtkWidget *w_tp_count;
GtkWidget *w_time_end;
GtkWidget *w_time_dur;
GtkWidget *w_dist_time;
+ gdouble track_length;
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()
}
}
-#define MARGIN 50
+#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;
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 x, GdkGC *gc, PropSaved *saved_img)
+static void draw_graph_mark(GtkWidget *image, gdouble event_x, gint img_width, GdkGC *gc, PropSaved *saved_img)
{
GdkPixmap *pix;
const int saved_width = 5;
+ /* 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);
gtk_image_get_pixmap(GTK_IMAGE(image), &pix, NULL);
if (saved_img->saved) {
gdk_draw_image(GDK_DRAWABLE(pix), gc, saved_img->img, 0, 0,
saved_img->pos, 0, -1, -1);
saved_img->saved = FALSE;
- gtk_widget_queue_draw_area(image, saved_img->pos, 0,
+ gtk_widget_queue_draw_area(image,
+ saved_img->pos + img_width/2 - PROFILE_WIDTH/2 - MARGIN/2, 0,
saved_img->img->width, saved_img->img->height);
}
if ((x >= MARGIN) && (x < (PROFILE_WIDTH + MARGIN))) {
saved_img->saved = TRUE;
gdk_draw_line (GDK_DRAWABLE(pix), gc, x, 0, x, image->allocation.height);
/* redraw the area which contains the line, saved_width is just convenient */
- gtk_widget_queue_draw_area(image, x - saved_width/2, 0, saved_width, PROFILE_HEIGHT);
+ gtk_widget_queue_draw_area(image, event_x - saved_width/2, 0, saved_width, PROFILE_HEIGHT);
}
}
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);
- draw_graph_mark(image, event->x, window->style->black_gc,
+ 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);
+ 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);
}
TRUE, MARGIN, 0, PROFILE_WIDTH, PROFILE_HEIGHT);
/* draw grid */
-#define LABEL_FONT "Sans 8"
+#define LABEL_FONT "Sans 7"
for (i=0; i<=LINES; i++) {
PangoFontDescription *pfd;
PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL);
gchar s[32];
+ int w, h;
+ pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT);
pfd = pango_font_description_from_string (LABEL_FONT);
pango_layout_set_font_description (pl, pfd);
pango_font_description_free (pfd);
sprintf(s, "%8dm", (int)(mina + (LINES-i)*(maxa-mina)/LINES));
pango_layout_set_text(pl, s, -1);
- gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], 0,
- CLAMP((int)i*PROFILE_HEIGHT/LINES - 5, 0, PROFILE_HEIGHT-15), pl);
+ pango_layout_get_pixel_size (pl, &w, &h);
+ gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3,
+ CLAMP((int)i*PROFILE_HEIGHT/LINES - h/2, 0, PROFILE_HEIGHT-h), pl);
gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0],
MARGIN, PROFILE_HEIGHT/LINES * i, MARGIN + PROFILE_WIDTH, PROFILE_HEIGHT/LINES * i);
#else
/* draw grid */
-#define LABEL_FONT "Sans 8"
+#define LABEL_FONT "Sans 7"
for (i=0; i<=LINES; i++) {
PangoFontDescription *pfd;
PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL);
gchar s[32];
+ int w, h;
+ pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT);
pfd = pango_font_description_from_string (LABEL_FONT);
pango_layout_set_font_description (pl, pfd);
pango_font_description_free (pfd);
sprintf(s, "%8dmph", (int)(mins + (LINES-i)*(maxs-mins)/LINES));
#endif
pango_layout_set_text(pl, s, -1);
- gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], 0,
- CLAMP((int)i*PROFILE_HEIGHT/LINES - 5, 0, PROFILE_HEIGHT-15), pl);
+ pango_layout_get_pixel_size (pl, &w, &h);
+ gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3,
+ CLAMP((int)i*PROFILE_HEIGHT/LINES - h/2, 0, PROFILE_HEIGHT-h), pl);
gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0],
MARGIN, PROFILE_HEIGHT/LINES * i, MARGIN + PROFILE_WIDTH, PROFILE_HEIGHT/LINES * i);
}
+
/* draw speeds */
for ( i = 0; i < PROFILE_WIDTH; i++ )
{
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" */
}
}
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 */
- 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) );
+ }
}
void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *tr, gpointer vlp, gchar *track_name )
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);
+ 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);
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;
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 );
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)
projects / andy / viking.git / blobdiff