X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/0df66d57a7784625fcb5f66147c45ed7450f2592..2eb89de4f0ea84ddecf6649d93305c45e3e016ab:/src/viklayer.c?ds=inline diff --git a/src/viklayer.c b/src/viklayer.c index 0962577f..926b9390 100644 --- a/src/viklayer.c +++ b/src/viklayer.c @@ -1,7 +1,8 @@ /* * viking -- GPS Data and Topo Analyzer, Explorer, and Manager * - * Copyright (C) 2003-2005, Evan Battaglia + * Copyright (C) 2005, Alex Foobarian + * Copyright (C) 2003-2007, Evan Battaglia * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,13 +20,15 @@ * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include + #include "viking.h" -#include "vikradiogroup.h" -#include "vikfilelist.h" #include -static VikLayer *trigger = NULL; - /* functions common to all layers. */ /* TODO longone: rename interface free -> finalize */ @@ -92,35 +95,49 @@ static void layer_class_init (VikLayerClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } -void vik_layer_emit_update ( VikLayer *vl ) +/** + * Invoke the actual drawing via signal method + */ +static gboolean idle_draw ( VikLayer *vl ) { - if ( vl->visible ) { - trigger = vl; - g_signal_emit ( G_OBJECT(vl), layer_signals[VL_UPDATE_SIGNAL], 0 ); - } + g_signal_emit ( G_OBJECT(vl), layer_signals[VL_UPDATE_SIGNAL], 0 ); + return FALSE; // Nothing else to do } -/* should only be done by VikLayersPanel -- need to redraw and record trigger - * when we make a layer invisible. +/** + * Draw specified layer */ -void vik_layer_emit_update_although_invisible ( VikLayer *vl ) +void vik_layer_emit_update ( VikLayer *vl, gboolean from_background ) { - trigger = vl; - g_signal_emit ( G_OBJECT(vl), layer_signals[VL_UPDATE_SIGNAL], 0 ); + if ( vl->visible ) { + vik_window_set_redraw_trigger(vl); + + // Only ever draw when there is time to do so + if ( from_background ) + // Drawing requested from background thread, so handle via the gdk thread method + gdk_threads_add_idle ( (GSourceFunc) idle_draw, vl ); + else + g_idle_add ( (GSourceFunc) idle_draw, vl ); + } } -VikLayer *vik_layer_get_and_reset_trigger() +/** + * should only be done by VikLayersPanel (hence never used from the background) + * need to redraw and record trigger when we make a layer invisible. + */ +void vik_layer_emit_update_although_invisible ( VikLayer *vl ) { - VikLayer *rv = trigger; - trigger = NULL; - return rv; + vik_window_set_redraw_trigger(vl); + g_idle_add ( (GSourceFunc) idle_draw, vl ); } /* doesn't set the trigger. should be done by aggregate layer when child emits update. */ void vik_layer_emit_update_secondary ( VikLayer *vl ) { if ( vl->visible ) - g_signal_emit ( G_OBJECT(vl), layer_signals[VL_UPDATE_SIGNAL], 0 ); + // TODO: this can used from the background - eg in acquire + // so will need to flow background update status through too + g_idle_add ( (GSourceFunc) idle_draw, vl ); } static VikLayerInterface *vik_layer_interfaces[VIK_LAYER_NUM_TYPES] = { @@ -186,7 +203,9 @@ VikLayer *vik_layer_create ( gint type, gpointer vp, GtkWindow *w, gboolean inte if ( interactive ) { if ( vik_layer_properties ( new_layer, vp ) ) - vik_layer_rename ( VIK_LAYER(new_layer), vik_layer_interfaces[type]->name ); + /* We translate the name here */ + /* in order to avoid translating name set by user */ + vik_layer_rename ( VIK_LAYER(new_layer), _(vik_layer_interfaces[type]->name) ); else { g_object_unref ( G_OBJECT(new_layer) ); /* cancel that */ @@ -262,7 +281,8 @@ void vik_layer_marshall_params ( VikLayer *vl, guint8 **data, gint *datalen ) guint16 i, params_count = vik_layer_get_interface(vl->type)->params_count; for ( i = 0; i < params_count; i++ ) { - d = get_param(vl, i); + g_debug("%s: %s", __FUNCTION__, params[i].name); + d = get_param(vl, i, FALSE); switch ( params[i].type ) { case VIK_LAYER_PARAM_STRING: @@ -326,6 +346,7 @@ void vik_layer_unmarshall_params ( VikLayer *vl, guint8 *data, gint datalen, Vik guint16 i, params_count = vik_layer_get_interface(vl->type)->params_count; for ( i = 0; i < params_count; i++ ) { + g_debug("%s: %s", __FUNCTION__, params[i].name); switch ( params[i].type ) { case VIK_LAYER_PARAM_STRING: @@ -333,7 +354,7 @@ void vik_layer_unmarshall_params ( VikLayer *vl, guint8 *data, gint datalen, Vik s[vlm_size]=0; vlm_read(s); d.s = s; - set_param(vl, i, d, vvp); + set_param(vl, i, d, vvp, FALSE); g_free(s); break; case VIK_LAYER_PARAM_STRING_LIST: { @@ -349,14 +370,14 @@ void vik_layer_unmarshall_params ( VikLayer *vl, guint8 *data, gint datalen, Vik list = g_list_append ( list, s ); } d.sl = list; - set_param ( vl, i, d, vvp ); + set_param(vl, i, d, vvp, FALSE); /* don't free -- string list is responsibility of the layer */ break; } default: vlm_read(&d); - set_param(vl, i, d, vvp); + set_param(vl, i, d, vvp, FALSE); break; } } @@ -394,6 +415,14 @@ gboolean vik_layer_sublayer_toggle_visible ( VikLayer *l, gint subtype, gpointer return TRUE; /* if unknown, will always be visible */ } +gboolean vik_layer_selected ( VikLayer *l, gint subtype, gpointer sublayer, gint type, gpointer vlp ) +{ + if ( vik_layer_interfaces[l->type]->layer_selected ) + return vik_layer_interfaces[l->type]->layer_selected ( l, subtype, sublayer, type, vlp ); + /* Since no 'layer_selected' function explicitly turn off here */ + return vik_window_clear_highlight ( (VikWindow *)VIK_GTK_WINDOW_FROM_LAYER(l) ); +} + void vik_layer_realize ( VikLayer *l, VikTreeview *vt, GtkTreeIter *layer_iter ) { l->vt = vt; @@ -423,10 +452,10 @@ void vik_layer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp ) vik_layer_interfaces[l->type]->add_menu_items ( l, menu, vlp ); } -gboolean vik_layer_sublayer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp, gint subtype, gpointer sublayer, GtkTreeIter *iter ) +gboolean vik_layer_sublayer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp, gint subtype, gpointer sublayer, GtkTreeIter *iter, VikViewport *vvp ) { if ( vik_layer_interfaces[l->type]->sublayer_add_menu_items ) - return vik_layer_interfaces[l->type]->sublayer_add_menu_items ( l, menu, vlp, subtype, sublayer, iter ); + return vik_layer_interfaces[l->type]->sublayer_add_menu_items ( l, menu, vlp, subtype, sublayer, iter, vvp ); return FALSE; } @@ -438,6 +467,20 @@ const gchar *vik_layer_sublayer_rename_request ( VikLayer *l, const gchar *newna return NULL; } +const gchar* vik_layer_sublayer_tooltip ( VikLayer *l, gint subtype, gpointer sublayer ) +{ + if ( vik_layer_interfaces[l->type]->sublayer_tooltip ) + return vik_layer_interfaces[l->type]->sublayer_tooltip ( l, subtype, sublayer ); + return NULL; +} + +const gchar* vik_layer_layer_tooltip ( VikLayer *l ) +{ + if ( vik_layer_interfaces[l->type]->layer_tooltip ) + return vik_layer_interfaces[l->type]->layer_tooltip ( l ); + return NULL; +} + GdkPixbuf *vik_layer_load_icon ( gint type ) { g_assert ( type < VIK_LAYER_NUM_TYPES ); @@ -446,10 +489,10 @@ GdkPixbuf *vik_layer_load_icon ( gint type ) return NULL; } -gboolean vik_layer_set_param ( VikLayer *layer, guint16 id, VikLayerParamData data, gpointer vp ) +gboolean vik_layer_set_param ( VikLayer *layer, guint16 id, VikLayerParamData data, gpointer vp, gboolean is_file_operation ) { if ( vik_layer_interfaces[layer->type]->set_param ) - return vik_layer_interfaces[layer->type]->set_param ( layer, id, data, vp ); + return vik_layer_interfaces[layer->type]->set_param ( layer, id, data, vp, is_file_operation ); return FALSE; } @@ -459,294 +502,27 @@ void vik_layer_post_read ( VikLayer *layer, VikViewport *vp, gboolean from_file vik_layer_interfaces[layer->type]->post_read ( layer, vp, from_file ); } -static GtkWidget *properties_widget_new_widget ( VikLayerParam *param, VikLayerParamData data ) -{ - GtkWidget *rv = NULL; - switch ( param->widget_type ) - { - case VIK_LAYER_WIDGET_COLOR: - if ( param->type == VIK_LAYER_PARAM_COLOR ) - rv = gtk_color_button_new_with_color ( &(data.c) ); - break; - case VIK_LAYER_WIDGET_CHECKBUTTON: - if ( param->type == VIK_LAYER_PARAM_BOOLEAN ) - { - //rv = gtk_check_button_new_with_label ( //param->title ); - rv = gtk_check_button_new (); - if ( data.b ) - gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(rv), TRUE ); - } - break; - case VIK_LAYER_WIDGET_COMBOBOX: -#ifndef GTK_2_2 - if ( param->type == VIK_LAYER_PARAM_UINT && param->widget_data ) - { - gchar **pstr = param->widget_data; - rv = gtk_combo_box_new_text (); - while ( *pstr ) - gtk_combo_box_append_text ( GTK_COMBO_BOX ( rv ), *(pstr++) ); - if ( param->extra_widget_data ) /* map of alternate uint values for options */ - { - int i; - for ( i = 0; ((const char **)param->widget_data)[i]; i++ ) - if ( ((guint *)param->extra_widget_data)[i] == data.u ) - { - gtk_combo_box_set_active ( GTK_COMBO_BOX(rv), i ); - break; - } - } - gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), data.u ); - } - break; -#endif - case VIK_LAYER_WIDGET_RADIOGROUP: - /* widget_data and extra_widget_data are GList */ - if ( param->type == VIK_LAYER_PARAM_UINT && param->widget_data ) - { - rv = vik_radio_group_new ( param->widget_data ); - if ( param->extra_widget_data ) /* map of alternate uint values for options */ - { - int i; - int nb_elem = g_list_length(param->widget_data); - for ( i = 0; i < nb_elem; i++ ) - if ( (guint32)g_list_nth_data(param->extra_widget_data, i) == data.u ) - { - vik_radio_group_set_selected ( VIK_RADIO_GROUP(rv), i ); - break; - } - } - else if ( data.u ) /* zero is already default */ - vik_radio_group_set_selected ( VIK_RADIO_GROUP(rv), data.u ); - } - break; - case VIK_LAYER_WIDGET_RADIOGROUP_STATIC: - if ( param->type == VIK_LAYER_PARAM_UINT && param->widget_data ) - { - rv = vik_radio_group_new_static ( (const gchar **) param->widget_data ); - if ( param->extra_widget_data ) /* map of alternate uint values for options */ - { - int i; - for ( i = 0; ((const char **)param->widget_data)[i]; i++ ) - if ( ((guint *)param->extra_widget_data)[i] == data.u ) - { - vik_radio_group_set_selected ( VIK_RADIO_GROUP(rv), i ); - break; - } - } - else if ( data.u ) /* zero is already default */ - vik_radio_group_set_selected ( VIK_RADIO_GROUP(rv), data.u ); - } - break; - case VIK_LAYER_WIDGET_SPINBUTTON: - if ( (param->type == VIK_LAYER_PARAM_DOUBLE || param->type == VIK_LAYER_PARAM_UINT - || param->type == VIK_LAYER_PARAM_INT) && param->widget_data ) - { - gdouble init_val = (param->type == VIK_LAYER_PARAM_DOUBLE) ? data.d : (param->type == VIK_LAYER_PARAM_UINT ? data.u : data.i); - VikLayerParamScale *scale = (VikLayerParamScale *) param->widget_data; - rv = gtk_spin_button_new ( GTK_ADJUSTMENT(gtk_adjustment_new( init_val, scale->min, scale->max, scale->step, scale->step, scale->step )), scale->step, scale->digits ); - } - break; - case VIK_LAYER_WIDGET_ENTRY: - if ( param->type == VIK_LAYER_PARAM_STRING ) - { - rv = gtk_entry_new (); - gtk_entry_set_text ( GTK_ENTRY(rv), data.s ); - } - break; - case VIK_LAYER_WIDGET_FILEENTRY: - if ( param->type == VIK_LAYER_PARAM_STRING ) - { - rv = vik_file_entry_new (); - vik_file_entry_set_filename ( VIK_FILE_ENTRY(rv), data.s ); - } - break; - case VIK_LAYER_WIDGET_FILELIST: - if ( param->type == VIK_LAYER_PARAM_STRING_LIST ) - { - rv = vik_file_list_new ( param->title ); - vik_file_list_set_files ( VIK_FILE_LIST(rv), data.sl ); - } - break; - case VIK_LAYER_WIDGET_HSCALE: - if ( (param->type == VIK_LAYER_PARAM_DOUBLE || param->type == VIK_LAYER_PARAM_UINT - || param->type == VIK_LAYER_PARAM_INT) && param->widget_data ) - { - gdouble init_val = (param->type == VIK_LAYER_PARAM_DOUBLE) ? data.d : (param->type == VIK_LAYER_PARAM_UINT ? data.u : data.i); - VikLayerParamScale *scale = (VikLayerParamScale *) param->widget_data; - rv = gtk_hscale_new_with_range ( scale->min, scale->max, scale->step ); - gtk_scale_set_digits ( GTK_SCALE(rv), scale->digits ); - gtk_range_set_value ( GTK_RANGE(rv), init_val ); - } - } - return rv; -} - -static VikLayerParamData properties_widget_get_value ( GtkWidget *widget, VikLayerParam *param ) -{ - VikLayerParamData rv; - switch ( param->widget_type ) - { - case VIK_LAYER_WIDGET_COLOR: - gtk_color_button_get_color ( GTK_COLOR_BUTTON(widget), &(rv.c) ); - break; - case VIK_LAYER_WIDGET_CHECKBUTTON: - rv.b = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - break; - case VIK_LAYER_WIDGET_COMBOBOX: -#ifndef GTK_2_2 - rv.i = gtk_combo_box_get_active ( GTK_COMBO_BOX(widget) ); - if ( rv.i == -1 ) rv.i = 0; - rv.u = rv.i; - if ( param->extra_widget_data ) - rv.u = ((guint *)param->extra_widget_data)[rv.u]; - break; -#endif - case VIK_LAYER_WIDGET_RADIOGROUP: - case VIK_LAYER_WIDGET_RADIOGROUP_STATIC: - rv.u = vik_radio_group_get_selected(VIK_RADIO_GROUP(widget)); - if ( param->extra_widget_data ) - rv.u = (guint32)g_list_nth_data(param->extra_widget_data, rv.u); - break; - case VIK_LAYER_WIDGET_SPINBUTTON: - if ( param->type == VIK_LAYER_PARAM_UINT ) - rv.u = gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(widget) ); - else if ( param->type == VIK_LAYER_PARAM_INT ) - rv.i = gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(widget) ); - else - rv.d = gtk_spin_button_get_value ( GTK_SPIN_BUTTON(widget) ); - break; - case VIK_LAYER_WIDGET_ENTRY: - rv.s = gtk_entry_get_text ( GTK_ENTRY(widget) ); - break; - case VIK_LAYER_WIDGET_FILEENTRY: - rv.s = vik_file_entry_get_filename ( VIK_FILE_ENTRY(widget) ); - break; - case VIK_LAYER_WIDGET_FILELIST: - rv.sl = vik_file_list_get_files ( VIK_FILE_LIST(widget) ); - break; - case VIK_LAYER_WIDGET_HSCALE: - if ( param->type == VIK_LAYER_PARAM_UINT ) - rv.u = (guint32) gtk_range_get_value ( GTK_RANGE(widget) ); - else if ( param->type == VIK_LAYER_PARAM_INT ) - rv.i = (gint32) gtk_range_get_value ( GTK_RANGE(widget) ); - else - rv.d = gtk_range_get_value ( GTK_RANGE(widget) ); - break; - } - return rv; -} - -/* false if cancel, true if OK */ -/* some would claim this wasn't written to be human-readable. */ static gboolean layer_properties_factory ( VikLayer *vl, VikViewport *vp ) { - VikLayerParam *params = vik_layer_interfaces[vl->type]->params; - guint16 params_count = vik_layer_interfaces[vl->type]->params_count; - guint16 i, j, widget_count = 0; - gboolean must_redraw = FALSE; - - if ( ! params ) - return TRUE; /* no params == no options, so all is good */ - - for ( i = 0; i < params_count; i++ ) - if ( params[i].group != VIK_LAYER_NOT_IN_PROPERTIES ) - widget_count++; - - if ( widget_count == 0) - return FALSE; - else - { - /* create widgets and titles; place in table */ - GtkWidget *dialog = gtk_dialog_new_with_buttons ( "Layer Properties", - VIK_GTK_WINDOW_FROM_WIDGET(vp), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL ); - gint resp; - - gchar **groups = vik_layer_interfaces[vl->type]->params_groups; - guint8 groups_count = vik_layer_interfaces[vl->type]->params_groups_count; - - GtkWidget *table = NULL; - GtkWidget **tables = NULL; /* for more than one group */ - - GtkWidget *notebook = NULL; - GtkWidget **widgets = g_malloc ( sizeof(GtkWidget *) * widget_count ); - - if ( groups && groups_count ) - { - guint8 current_group; - guint16 tab_widget_count; - notebook = gtk_notebook_new (); - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), notebook, FALSE, FALSE, 0); - tables = g_malloc ( sizeof(GtkWidget *) * groups_count ); - for ( current_group = 0; current_group < groups_count; current_group++ ) - { - tab_widget_count = 0; - for ( j = 0; j < params_count; j ++ ) - if ( params[j].group == current_group ) - tab_widget_count++; - - if ( tab_widget_count ) - { - tables[current_group] = gtk_table_new ( tab_widget_count, 1, FALSE ); - gtk_notebook_append_page ( GTK_NOTEBOOK(notebook), tables[current_group], gtk_label_new(groups[current_group]) ); - } - } - } - else - { - table = gtk_table_new( widget_count, 1, FALSE ); - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), table, FALSE, FALSE, 0); - } - - for ( i = 0, j = 0; i < params_count; i++ ) - { - if ( params[i].group != VIK_LAYER_NOT_IN_PROPERTIES ) - { - if ( tables ) - table = tables[MAX(0, params[i].group)]; /* round up NOT_IN_GROUP, that's not reasonable here */ - - widgets[j] = properties_widget_new_widget ( &(params[i]), - vik_layer_interfaces[vl->type]->get_param ( vl, i ) ); - - g_assert ( widgets[j] != NULL ); - - gtk_table_attach ( GTK_TABLE(table), gtk_label_new(params[i].title), 0, 1, j, j+1, 0, 0, 0, 0 ); - gtk_table_attach ( GTK_TABLE(table), widgets[j], 1, 2, j, j+1, GTK_EXPAND | GTK_FILL, 0, 2, 2 ); - j++; - } - } - - gtk_widget_show_all ( dialog ); - - resp = gtk_dialog_run (GTK_DIALOG (dialog)); - if ( resp == GTK_RESPONSE_ACCEPT ) - { - for ( i = 0, j = 0; i < params_count; i++ ) - { - if ( params[i].group != VIK_LAYER_NOT_IN_PROPERTIES ) - { - if ( vik_layer_interfaces[vl->type]->set_param ( vl, i, - properties_widget_get_value ( widgets[j], &(params[i]) ), vp ) ) - must_redraw = TRUE; - j++; - } - } + switch ( a_uibuilder_properties_factory ( _("Layer Properties"), + VIK_GTK_WINDOW_FROM_WIDGET(vp), + vik_layer_interfaces[vl->type]->params, + vik_layer_interfaces[vl->type]->params_count, + vik_layer_interfaces[vl->type]->params_groups, + vik_layer_interfaces[vl->type]->params_groups_count, + (gpointer) vik_layer_interfaces[vl->type]->set_param, + vl, + vp, + (gpointer) vik_layer_interfaces[vl->type]->get_param, + vl) ) { + case 0: + case 3: + return FALSE; + /* redraw (?) */ + case 2: vik_layer_post_read ( vl, vp, FALSE ); /* update any gc's */ - - gtk_widget_destroy ( dialog ); /* hide before redrawing. */ - g_free ( widgets ); - - if ( must_redraw ) - vik_layer_emit_update ( vl ); /* if this is a new layer, it won't redraw twice because no on'es listening to this signal. */ - return TRUE; /* user clicked OK */ - } - - if ( tables ) - g_free ( tables ); - gtk_widget_destroy ( dialog ); - g_free ( widgets ); - return FALSE; + default: + return TRUE; } } +