* viking -- GPS Data and Topo Analyzer, Explorer, and Manager
*
* Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
+ * Copyright (C) 2013, Rob Norris <rw_norris@hotmail.com>
*
* 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
*/
#include "viking.h"
+#include "viktrwlayer_analysis.h"
+#include "viktrwlayer_tracklist.h"
+#include "viktrwlayer_waypointlist.h"
#include "icons/icons.h"
#include <string.h>
-
-#define DISCONNECT_UPDATE_SIGNAL(vl, val) g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val)
+#include <glib/gi18n.h>
static void aggregate_layer_marshall( VikAggregateLayer *val, guint8 **data, gint *len );
static VikAggregateLayer *aggregate_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp );
static void aggregate_layer_change_coord_mode ( VikAggregateLayer *val, VikCoordMode mode );
static void aggregate_layer_drag_drop_request ( VikAggregateLayer *val_src, VikAggregateLayer *val_dest, GtkTreeIter *src_item_iter, GtkTreePath *dest_path );
+static const gchar* aggregate_layer_tooltip ( VikAggregateLayer *val );
+static void aggregate_layer_add_menu_items ( VikAggregateLayer *val, GtkMenu *menu, gpointer vlp );
VikLayerInterface vik_aggregate_layer_interface = {
"Aggregate",
+ N_("Aggregate"),
+ "<control><shift>A",
&vikaggregatelayer_pixbuf,
NULL,
(VikLayerFuncSetMenuItemsSelection) NULL,
(VikLayerFuncGetMenuItemsSelection) NULL,
- (VikLayerFuncAddMenuItems) NULL,
+ (VikLayerFuncAddMenuItems) aggregate_layer_add_menu_items,
(VikLayerFuncSublayerAddMenuItems) NULL,
(VikLayerFuncSublayerRenameRequest) NULL,
(VikLayerFuncSublayerToggleVisible) NULL,
+ (VikLayerFuncSublayerTooltip) NULL,
+ (VikLayerFuncLayerTooltip) aggregate_layer_tooltip,
+ (VikLayerFuncLayerSelected) NULL,
(VikLayerFuncMarshall) aggregate_layer_marshall,
(VikLayerFuncUnmarshall) aggregate_layer_unmarshall,
(VikLayerFuncSetParam) NULL,
(VikLayerFuncGetParam) NULL,
+ (VikLayerFuncChangeParam) NULL,
(VikLayerFuncReadFileData) NULL,
(VikLayerFuncWriteFileData) NULL,
(VikLayerFuncDeleteItem) NULL,
+ (VikLayerFuncCutItem) NULL,
(VikLayerFuncCopyItem) NULL,
(VikLayerFuncPasteItem) NULL,
(VikLayerFuncFreeCopiedItem) NULL,
(VikLayerFuncDragDropRequest) aggregate_layer_drag_drop_request,
+
+ (VikLayerFuncSelectClick) NULL,
+ (VikLayerFuncSelectMove) NULL,
+ (VikLayerFuncSelectRelease) NULL,
+ (VikLayerFuncSelectedViewportMenu) NULL,
};
struct _VikAggregateLayer {
VikLayer vl;
GList *children;
+ // One per layer
+ GtkWidget *tracks_analysis_dialog;
};
GType vik_aggregate_layer_get_type ()
VikAggregateLayer *vik_aggregate_layer_new ()
{
VikAggregateLayer *val = VIK_AGGREGATE_LAYER ( g_object_new ( VIK_AGGREGATE_LAYER_TYPE, NULL ) );
- vik_layer_init ( VIK_LAYER(val), VIK_LAYER_AGGREGATE );
+ vik_layer_set_type ( VIK_LAYER(val), VIK_LAYER_AGGREGATE );
val->children = NULL;
return val;
}
void vik_aggregate_layer_insert_layer ( VikAggregateLayer *val, VikLayer *l, GtkTreeIter *replace_iter )
{
GtkTreeIter iter;
+ VikLayer *vl = VIK_LAYER(val);
+
+ // By default layers are inserted above the selected layer
+ gboolean put_above = TRUE;
+
+ // These types are 'base' types in that you what other information on top
+ if ( l->type == VIK_LAYER_MAPS || l->type == VIK_LAYER_DEM || l->type == VIK_LAYER_GEOREF )
+ put_above = FALSE;
- if ( VIK_LAYER(val)->realized )
+ if ( vl->realized )
{
- vik_treeview_insert_layer ( VIK_LAYER(val)->vt, &(VIK_LAYER(val)->iter), &iter, l->name, val, l, l->type, l->type, replace_iter );
+ vik_treeview_insert_layer ( vl->vt, &(vl->iter), &iter, l->name, val, put_above, l, l->type, l->type, replace_iter );
if ( ! l->visible )
- vik_treeview_item_set_visible ( VIK_LAYER(val)->vt, &iter, FALSE );
- vik_layer_realize ( l, VIK_LAYER(val)->vt, &iter );
+ vik_treeview_item_set_visible ( vl->vt, &iter, FALSE );
+ vik_layer_realize ( l, vl->vt, &iter );
if ( val->children == NULL )
- vik_treeview_expand ( VIK_LAYER(val)->vt, &(VIK_LAYER(val)->iter) );
+ vik_treeview_expand ( vl->vt, &(vl->iter) );
}
if (replace_iter) {
- GList *theone = g_list_find ( val->children, vik_treeview_item_get_pointer ( VIK_LAYER(val)->vt, replace_iter ) );
- val->children = g_list_insert ( val->children, l, g_list_position(val->children,theone)+1 );
+ GList *theone = g_list_find ( val->children, vik_treeview_item_get_pointer ( vl->vt, replace_iter ) );
+ if ( put_above )
+ val->children = g_list_insert ( val->children, l, g_list_position(val->children,theone)+1 );
+ else
+ // Thus insert 'here' (so don't add 1)
+ val->children = g_list_insert ( val->children, l, g_list_position(val->children,theone) );
} else {
- val->children = g_list_append ( val->children, l );
+ // Effectively insert at 'end' of the list to match how displayed in the treeview
+ // - but since it is drawn from 'bottom first' it is actually the first in the child list
+ // This ordering is especially important if it is a map or similar type,
+ // which needs be drawn first for the layering draw method to work properly.
+ // ATM this only happens when a layer is drag/dropped to the end of an aggregate layer
+ val->children = g_list_prepend ( val->children, l );
}
g_signal_connect_swapped ( G_OBJECT(l), "update", G_CALLBACK(vik_layer_emit_update_secondary), val );
}
-void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l )
+/**
+ * vik_aggregate_layer_add_layer:
+ * @allow_reordering: should be set for GUI interactions,
+ * whereas loading from a file needs strict ordering and so should be FALSE
+ */
+void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l, gboolean allow_reordering )
{
GtkTreeIter iter;
+ VikLayer *vl = VIK_LAYER(val);
+
+ // By default layers go to the top
+ gboolean put_above = TRUE;
- if ( VIK_LAYER(val)->realized )
+ if ( allow_reordering ) {
+ // These types are 'base' types in that you what other information on top
+ if ( l->type == VIK_LAYER_MAPS || l->type == VIK_LAYER_DEM || l->type == VIK_LAYER_GEOREF )
+ put_above = FALSE;
+ }
+
+ if ( vl->realized )
{
- vik_treeview_add_layer ( VIK_LAYER(val)->vt, &(VIK_LAYER(val)->iter), &iter, l->name, val, l, l->type, l->type);
+ vik_treeview_add_layer ( vl->vt, &(vl->iter), &iter, l->name, val, put_above, l, l->type, l->type);
if ( ! l->visible )
- vik_treeview_item_set_visible ( VIK_LAYER(val)->vt, &iter, FALSE );
- vik_layer_realize ( l, VIK_LAYER(val)->vt, &iter );
+ vik_treeview_item_set_visible ( vl->vt, &iter, FALSE );
+ vik_layer_realize ( l, vl->vt, &iter );
if ( val->children == NULL )
- vik_treeview_expand ( VIK_LAYER(val)->vt, &(VIK_LAYER(val)->iter) );
+ vik_treeview_expand ( vl->vt, &(vl->iter) );
}
- val->children = g_list_append ( val->children, l );
+ if ( put_above )
+ val->children = g_list_append ( val->children, l );
+ else
+ val->children = g_list_prepend ( val->children, l );
+
g_signal_connect_swapped ( G_OBJECT(l), "update", G_CALLBACK(vik_layer_emit_update_secondary), val );
}
void vik_aggregate_layer_move_layer ( VikAggregateLayer *val, GtkTreeIter *child_iter, gboolean up )
{
GList *theone, *first, *second;
- vik_treeview_move_item ( VIK_LAYER(val)->vt, child_iter, up );
+ VikLayer *vl = VIK_LAYER(val);
+ vik_treeview_move_item ( vl->vt, child_iter, up );
- theone = g_list_find ( val->children, vik_treeview_item_get_pointer ( VIK_LAYER(val)->vt, child_iter ) );
+ theone = g_list_find ( val->children, vik_treeview_item_get_pointer ( vl->vt, child_iter ) );
g_assert ( theone != NULL );
* of the pixmap before drawing the trigger layer so we can use it again
* later.
*/
-void vik_aggregate_layer_draw ( VikAggregateLayer *val, gpointer data )
+void vik_aggregate_layer_draw ( VikAggregateLayer *val, VikViewport *vp )
{
GList *iter = val->children;
VikLayer *vl;
- VikLayer *trigger = VIK_LAYER(vik_viewport_get_trigger( VIK_VIEWPORT(data) ));
+ VikLayer *trigger = VIK_LAYER(vik_viewport_get_trigger( vp ));
while ( iter ) {
vl = VIK_LAYER(iter->data);
if ( vl == trigger ) {
- if ( vik_viewport_get_half_drawn ( VIK_VIEWPORT(data) ) ) {
- vik_viewport_set_half_drawn ( VIK_VIEWPORT(data), FALSE );
- vik_viewport_snapshot_load( VIK_VIEWPORT(data) );
+ if ( vik_viewport_get_half_drawn ( vp ) ) {
+ vik_viewport_set_half_drawn ( vp, FALSE );
+ vik_viewport_snapshot_load( vp );
} else {
- vik_viewport_snapshot_save( VIK_VIEWPORT(data) );
+ vik_viewport_snapshot_save( vp );
}
}
- if ( vl->type == VIK_LAYER_AGGREGATE || vl->type == VIK_LAYER_GPS || ! vik_viewport_get_half_drawn( VIK_VIEWPORT(data) ) )
- vik_layer_draw ( vl, data );
+ if ( vl->type == VIK_LAYER_AGGREGATE || vl->type == VIK_LAYER_GPS || ! vik_viewport_get_half_drawn( vp ) )
+ vik_layer_draw ( vl, vp );
iter = iter->next;
}
}
}
}
+// A slightly better way of defining the menu callback information
+// This should be easier to extend/rework compared to previously
+typedef enum {
+ MA_VAL = 0,
+ MA_VLP,
+ MA_LAST
+} menu_array_index;
+
+typedef gpointer menu_array_values[MA_LAST];
+
+static void aggregate_layer_child_visible_toggle ( menu_array_values values )
+{
+ VikAggregateLayer *val = VIK_AGGREGATE_LAYER ( values[MA_VAL] );
+ VikLayersPanel *vlp = VIK_LAYERS_PANEL ( values[MA_VLP] );
+ VikLayer *vl;
+
+ // Loop around all (child) layers applying visibility setting
+ // This does not descend the tree if there are aggregates within aggregrate - just the first level of layers held
+ GList *iter = val->children;
+ while ( iter ) {
+ vl = VIK_LAYER ( iter->data );
+ vl->visible = !vl->visible;
+ // Also set checkbox on/off
+ vik_treeview_item_toggle_visible ( vik_layers_panel_get_treeview ( vlp ), &(vl->iter) );
+ iter = iter->next;
+ }
+ // Redraw as view may have changed
+ vik_layer_emit_update ( VIK_LAYER ( val ) );
+}
+
+static void aggregate_layer_child_visible ( menu_array_values values, gboolean on_off)
+{
+ // Convert data back to correct types
+ VikAggregateLayer *val = VIK_AGGREGATE_LAYER ( values[MA_VAL] );
+ VikLayersPanel *vlp = VIK_LAYERS_PANEL ( values[MA_VLP] );
+ VikLayer *vl;
+
+ // Loop around all (child) layers applying visibility setting
+ // This does not descend the tree if there are aggregates within aggregrate - just the first level of layers held
+ GList *iter = val->children;
+ while ( iter ) {
+ vl = VIK_LAYER ( iter->data );
+ vl->visible = on_off;
+ // Also set checkbox on_off
+ vik_treeview_item_set_visible ( vik_layers_panel_get_treeview ( vlp ), &(vl->iter), on_off );
+ iter = iter->next;
+ }
+ // Redraw as view may have changed
+ vik_layer_emit_update ( VIK_LAYER ( val ) );
+}
+
+static void aggregate_layer_child_visible_on ( menu_array_values values )
+{
+ aggregate_layer_child_visible ( values, TRUE );
+}
+
+static void aggregate_layer_child_visible_off ( menu_array_values values )
+{
+ aggregate_layer_child_visible ( values, FALSE );
+}
+
+/**
+ * If order is true sort ascending, otherwise a descending sort
+ */
+static gint sort_layer_compare ( gconstpointer a, gconstpointer b, gpointer order )
+{
+ VikLayer *sa = (VikLayer *)a;
+ VikLayer *sb = (VikLayer *)b;
+
+ // Default ascending order
+ gint answer = g_strcmp0 ( sa->name, sb->name );
+
+ if ( GPOINTER_TO_INT(order) ) {
+ // Invert sort order for ascending order
+ answer = -answer;
+ }
+
+ return answer;
+}
+
+static void aggregate_layer_sort_a2z ( menu_array_values values )
+{
+ VikAggregateLayer *val = VIK_AGGREGATE_LAYER ( values[MA_VAL] );
+ vik_treeview_sort_children ( VIK_LAYER(val)->vt, &(VIK_LAYER(val)->iter), VL_SO_ALPHABETICAL_ASCENDING );
+ val->children = g_list_sort_with_data ( val->children, sort_layer_compare, GINT_TO_POINTER(TRUE) );
+}
+
+static void aggregate_layer_sort_z2a ( menu_array_values values )
+{
+ VikAggregateLayer *val = VIK_AGGREGATE_LAYER ( values[MA_VAL] );
+ vik_treeview_sort_children ( VIK_LAYER(val)->vt, &(VIK_LAYER(val)->iter), VL_SO_ALPHABETICAL_DESCENDING );
+ val->children = g_list_sort_with_data ( val->children, sort_layer_compare, GINT_TO_POINTER(FALSE) );
+}
+
+/**
+ * aggregate_layer_waypoint_create_list:
+ * @vl: The layer that should create the waypoint and layers list
+ * @user_data: Not used in this function
+ *
+ * Returns: A list of #vik_trw_waypoint_list_t
+ */
+static GList* aggregate_layer_waypoint_create_list ( VikLayer *vl, gpointer user_data )
+{
+ VikAggregateLayer *val = VIK_AGGREGATE_LAYER(vl);
+
+ // Get all TRW layers
+ GList *layers = NULL;
+ layers = vik_aggregate_layer_get_all_layers_of_type ( val, layers, VIK_LAYER_TRW, TRUE );
+
+ // For each TRW layers keep adding the waypoints to build a list of all of them
+ GList *waypoints_and_layers = NULL;
+ layers = g_list_first ( layers );
+ while ( layers ) {
+ GList *waypoints = NULL;
+ waypoints = g_list_concat ( waypoints, g_hash_table_get_values ( vik_trw_layer_get_waypoints( VIK_TRW_LAYER(layers->data) ) ) );
+
+ waypoints_and_layers = g_list_concat ( waypoints_and_layers, vik_trw_layer_build_waypoint_list_t ( VIK_TRW_LAYER(layers->data), waypoints ) );
+
+ layers = g_list_next ( layers );
+ }
+ g_list_free ( layers );
+
+ return waypoints_and_layers;
+}
+
+static void aggregate_layer_waypoint_list_dialog ( menu_array_values values )
+{
+ VikAggregateLayer *val = VIK_AGGREGATE_LAYER ( values[MA_VAL] );
+ gchar *title = g_strdup_printf ( _("%s: Waypoint List"), VIK_LAYER(val)->name );
+ vik_trw_layer_waypoint_list_show_dialog ( title, VIK_LAYER(val), NULL, aggregate_layer_waypoint_create_list, TRUE );
+ g_free ( title );
+}
+
+/**
+ * Search all TrackWaypoint layers in this aggregate layer for an item on the user specified date
+ */
+static void aggregate_layer_search_date ( menu_array_values values )
+{
+ VikAggregateLayer *val = VIK_AGGREGATE_LAYER ( values[MA_VAL] );
+ VikCoord position;
+ gchar *date_str = a_dialog_get_date ( VIK_GTK_WINDOW_FROM_LAYER(val), _("Search by Date") );
+
+ if ( !date_str )
+ return;
+
+ VikViewport *vvp = vik_window_viewport ( VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(val)) );
+
+ GList *gl = NULL;
+ gl = vik_aggregate_layer_get_all_layers_of_type ( val, gl, VIK_LAYER_TRW, TRUE );
+ gboolean found = FALSE;
+ // Search tracks first
+ while ( gl && !found ) {
+ // Make it auto select the item if found
+ found = vik_trw_layer_find_date ( VIK_TRW_LAYER(gl->data), date_str, &position, vvp, TRUE, TRUE );
+ gl = g_list_next ( gl );
+ }
+ g_list_free ( gl );
+ if ( !found ) {
+ // Reset and try on Waypoints
+ gl = NULL;
+ gl = vik_aggregate_layer_get_all_layers_of_type ( val, gl, VIK_LAYER_TRW, TRUE );
+ while ( gl && !found ) {
+ // Make it auto select the item if found
+ found = vik_trw_layer_find_date ( VIK_TRW_LAYER(gl->data), date_str, &position, vvp, FALSE, TRUE );
+ gl = g_list_next ( gl );
+ }
+ g_list_free ( gl );
+ }
+
+ if ( !found )
+ a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_LAYER(val), _("No items found with the requested date.") );
+ g_free ( date_str );
+}
+
+/**
+ * aggregate_layer_track_create_list:
+ * @vl: The layer that should create the track and layers list
+ * @user_data: Not used in this function
+ *
+ * Returns: A list of #vik_trw_track_list_t
+ */
+static GList* aggregate_layer_track_create_list ( VikLayer *vl, gpointer user_data )
+{
+ VikAggregateLayer *val = VIK_AGGREGATE_LAYER(vl);
+
+ // Get all TRW layers
+ GList *layers = NULL;
+ layers = vik_aggregate_layer_get_all_layers_of_type ( val, layers, VIK_LAYER_TRW, TRUE );
+
+ // For each TRW layers keep adding the tracks and routes to build a list of all of them
+ GList *tracks_and_layers = NULL;
+ layers = g_list_first ( layers );
+ while ( layers ) {
+ GList *tracks = NULL;
+ tracks = g_list_concat ( tracks, g_hash_table_get_values ( vik_trw_layer_get_tracks( VIK_TRW_LAYER(layers->data) ) ) );
+ tracks = g_list_concat ( tracks, g_hash_table_get_values ( vik_trw_layer_get_routes( VIK_TRW_LAYER(layers->data) ) ) );
+
+ tracks_and_layers = g_list_concat ( tracks_and_layers, vik_trw_layer_build_track_list_t ( VIK_TRW_LAYER(layers->data), tracks ) );
+
+ layers = g_list_next ( layers );
+ }
+ g_list_free ( layers );
+
+ return tracks_and_layers;
+}
+
+static void aggregate_layer_track_list_dialog ( menu_array_values values )
+{
+ VikAggregateLayer *val = VIK_AGGREGATE_LAYER ( values[MA_VAL] );
+ gchar *title = g_strdup_printf ( _("%s: Track and Route List"), VIK_LAYER(val)->name );
+ vik_trw_layer_track_list_show_dialog ( title, VIK_LAYER(val), NULL, aggregate_layer_track_create_list, TRUE );
+ g_free ( title );
+}
+
+/**
+ * aggregate_layer_analyse_close:
+ *
+ * Stuff to do on dialog closure
+ */
+static void aggregate_layer_analyse_close ( GtkWidget *dialog, gint resp, VikLayer* vl )
+{
+ VikAggregateLayer *val = VIK_AGGREGATE_LAYER(vl);
+ gtk_widget_destroy ( dialog );
+ val->tracks_analysis_dialog = NULL;
+}
+
+static void aggregate_layer_analyse ( menu_array_values values )
+{
+ VikAggregateLayer *val = VIK_AGGREGATE_LAYER ( values[MA_VAL] );
+
+ // There can only be one!
+ if ( val->tracks_analysis_dialog )
+ return;
+
+ val->tracks_analysis_dialog = vik_trw_layer_analyse_this ( VIK_GTK_WINDOW_FROM_LAYER(VIK_LAYER(val)),
+ VIK_LAYER(val)->name,
+ VIK_LAYER(val),
+ NULL,
+ aggregate_layer_track_create_list,
+ aggregate_layer_analyse_close );
+}
+
+static void aggregate_layer_add_menu_items ( VikAggregateLayer *val, GtkMenu *menu, gpointer vlp )
+{
+ // Data to pass on in menu functions
+ static menu_array_values values;
+ values[MA_VAL] = val;
+ values[MA_VLP] = vlp;
+
+ GtkWidget *item = gtk_menu_item_new();
+ gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item );
+ gtk_widget_show ( item );
+
+ GtkWidget *vis_submenu = gtk_menu_new ();
+ item = gtk_menu_item_new_with_mnemonic ( _("_Visibility") );
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show ( item );
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), vis_submenu );
+
+ item = gtk_image_menu_item_new_with_mnemonic ( _("_Show All") );
+ gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU) );
+ g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(aggregate_layer_child_visible_on), values );
+ gtk_menu_shell_append (GTK_MENU_SHELL (vis_submenu), item);
+ gtk_widget_show ( item );
+
+ item = gtk_image_menu_item_new_with_mnemonic ( _("_Hide All") );
+ gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU) );
+ g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(aggregate_layer_child_visible_off), values );
+ gtk_menu_shell_append (GTK_MENU_SHELL (vis_submenu), item);
+ gtk_widget_show ( item );
+
+ item = gtk_image_menu_item_new_with_mnemonic ( _("_Toggle") );
+ gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU) );
+ g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(aggregate_layer_child_visible_toggle), values );
+ gtk_menu_shell_append (GTK_MENU_SHELL (vis_submenu), item);
+ gtk_widget_show ( item );
+
+ GtkWidget *submenu_sort = gtk_menu_new ();
+ item = gtk_image_menu_item_new_with_mnemonic ( _("_Sort") );
+ gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU) );
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show ( item );
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu_sort );
+
+ item = gtk_image_menu_item_new_with_mnemonic ( _("Name _Ascending") );
+ gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_SORT_ASCENDING, GTK_ICON_SIZE_MENU) );
+ g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(aggregate_layer_sort_a2z), values );
+ gtk_menu_shell_append ( GTK_MENU_SHELL(submenu_sort), item );
+ gtk_widget_show ( item );
+
+ item = gtk_image_menu_item_new_with_mnemonic ( _("Name _Descending") );
+ gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_SORT_DESCENDING, GTK_ICON_SIZE_MENU) );
+ g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(aggregate_layer_sort_z2a), values );
+ gtk_menu_shell_append ( GTK_MENU_SHELL(submenu_sort), item );
+ gtk_widget_show ( item );
+
+ item = gtk_menu_item_new_with_mnemonic ( _("_Statistics") );
+ g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(aggregate_layer_analyse), values );
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show ( item );
+
+ item = gtk_image_menu_item_new_with_mnemonic ( _("Track _List...") );
+ gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU) );
+ g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(aggregate_layer_track_list_dialog), values );
+ gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item );
+ gtk_widget_show ( item );
+
+ item = gtk_image_menu_item_new_with_mnemonic ( _("_Waypoint List...") );
+ gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU) );
+ g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(aggregate_layer_waypoint_list_dialog), values );
+ gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item );
+ gtk_widget_show ( item );
+
+ GtkWidget *search_submenu = gtk_menu_new ();
+ item = gtk_image_menu_item_new_with_mnemonic ( _("Searc_h") );
+ gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_MENU) );
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show ( item );
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), search_submenu );
+
+ item = gtk_menu_item_new_with_mnemonic ( _("By _Date...") );
+ g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(aggregate_layer_search_date), values );
+ gtk_menu_shell_append ( GTK_MENU_SHELL(search_submenu), item );
+ gtk_widget_set_tooltip_text (item, _("Find the first item with a specified date"));
+ gtk_widget_show ( item );
+}
+
static void disconnect_layer_signal ( VikLayer *vl, VikAggregateLayer *val )
{
- g_assert(DISCONNECT_UPDATE_SIGNAL(vl,val)==1);
+ guint number_handlers = g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val);
+ if ( number_handlers != 1 )
+ g_critical ("%s: Unexpected number of disconnect handlers: %d", __FUNCTION__, number_handlers);
}
void vik_aggregate_layer_free ( VikAggregateLayer *val )
g_list_foreach ( val->children, (GFunc)(disconnect_layer_signal), val );
g_list_foreach ( val->children, (GFunc)(g_object_unref), NULL );
g_list_free ( val->children );
+ if ( val->tracks_analysis_dialog != NULL )
+ gtk_widget_destroy ( val->tracks_analysis_dialog );
}
static void delete_layer_iter ( VikLayer *vl )
vik_treeview_item_delete ( VIK_LAYER(val)->vt, iter );
val->children = g_list_remove ( val->children, l );
- g_assert(DISCONNECT_UPDATE_SIGNAL(l,val)==1);
+ disconnect_layer_signal ( l, val );
g_object_unref ( l );
return was_visible;
#if 0
/* returns 0 == we're good, 1 == didn't find any layers, 2 == got rejected */
-guint vik_aggregate_layer_tool ( VikAggregateLayer *val, guint16 layer_type, VikToolInterfaceFunc tool_func, GdkEventButton *event, VikViewport *vvp )
+guint vik_aggregate_layer_tool ( VikAggregateLayer *val, VikLayerTypeEnum layer_type, VikToolInterfaceFunc tool_func, GdkEventButton *event, VikViewport *vvp )
{
GList *iter = val->children;
gboolean found_rej = FALSE;
}
#endif
-VikLayer *vik_aggregate_layer_get_top_visible_layer_of_type ( VikAggregateLayer *val, gint type )
+VikLayer *vik_aggregate_layer_get_top_visible_layer_of_type ( VikAggregateLayer *val, VikLayerTypeEnum type )
{
VikLayer *rv;
GList *ls = val->children;
while ( ls )
{
- if ( VIK_LAYER(ls->data)->visible && VIK_LAYER(ls->data)->type == type )
- return VIK_LAYER(ls->data);
- else if ( VIK_LAYER(ls->data)->visible && VIK_LAYER(ls->data)->type == VIK_LAYER_AGGREGATE )
+ VikLayer *vl = VIK_LAYER(ls->data);
+ if ( vl->visible && vl->type == type )
+ return vl;
+ else if ( vl->visible && vl->type == VIK_LAYER_AGGREGATE )
{
- rv = vik_aggregate_layer_get_top_visible_layer_of_type(VIK_AGGREGATE_LAYER(ls->data), type);
+ rv = vik_aggregate_layer_get_top_visible_layer_of_type(VIK_AGGREGATE_LAYER(vl), type);
if ( rv )
return rv;
}
return NULL;
}
-GList *vik_aggregate_layer_get_all_layers_of_type(VikAggregateLayer *val, GList *layers, gint type)
+GList *vik_aggregate_layer_get_all_layers_of_type(VikAggregateLayer *val, GList *layers, VikLayerTypeEnum type, gboolean include_invisible)
{
GList *l = layers;
GList *children = val->children;
+ VikLayer *vl;
if (!children)
return layers;
+
+ // Where appropriate *don't* include non-visible layers
while (children) {
- if (VIK_LAYER(children->data)->type == VIK_LAYER_AGGREGATE)
- l = vik_aggregate_layer_get_all_layers_of_type(VIK_AGGREGATE_LAYER(children->data), l, type);
- else if (VIK_LAYER(children->data)->type == type)
- l = g_list_prepend(l, children->data); /* now in top down order */
+ vl = VIK_LAYER(children->data);
+ if (vl->type == VIK_LAYER_AGGREGATE ) {
+ // Don't even consider invisible aggregrates, unless told to
+ if (vl->visible || include_invisible)
+ l = vik_aggregate_layer_get_all_layers_of_type(VIK_AGGREGATE_LAYER(children->data), l, type, include_invisible);
+ }
+ else if (vl->type == type) {
+ if (vl->visible || include_invisible)
+ l = g_list_prepend(l, children->data); /* now in top down order */
+ }
+ else if (type == VIK_LAYER_TRW) {
+ /* GPS layers contain TRW layers. cf with usage in file.c */
+ if (VIK_LAYER(children->data)->type == VIK_LAYER_GPS) {
+ if (VIK_LAYER(children->data)->visible || include_invisible) {
+ if (!vik_gps_layer_is_empty(VIK_GPS_LAYER(children->data))) {
+ /*
+ can not use g_list_concat due to wrong copy method - crashes if used a couple times !!
+ l = g_list_concat (l, vik_gps_layer_get_children (VIK_GPS_LAYER(children->data)));
+ */
+ /* create own copy method instead :( */
+ GList *gps_trw_layers = (GList *)vik_gps_layer_get_children (VIK_GPS_LAYER(children->data));
+ int n_layers = g_list_length (gps_trw_layers);
+ int layer = 0;
+ for ( layer = 0; layer < n_layers; layer++) {
+ l = g_list_prepend(l, gps_trw_layers->data);
+ gps_trw_layers = gps_trw_layers->next;
+ }
+ g_list_free(gps_trw_layers);
+ }
+ }
+ }
+ }
children = children->next;
}
return l;
{
GList *i = val->children;
GtkTreeIter iter;
+ VikLayer *vl = VIK_LAYER(val);
+ VikLayer *vli;
while ( i )
{
- vik_treeview_add_layer ( VIK_LAYER(val)->vt, layer_iter, &iter, VIK_LAYER(i->data)->name, val,
- VIK_LAYER(i->data), VIK_LAYER(i->data)->type, VIK_LAYER(i->data)->type );
- if ( ! VIK_LAYER(i->data)->visible )
- vik_treeview_item_set_visible ( VIK_LAYER(val)->vt, &iter, FALSE );
- vik_layer_realize ( VIK_LAYER(i->data), VIK_LAYER(val)->vt, &iter );
+ vli = VIK_LAYER(i->data);
+ vik_treeview_add_layer ( vl->vt, layer_iter, &iter, vli->name, val, TRUE,
+ vli, vli->type, vli->type );
+ if ( ! vli->visible )
+ vik_treeview_item_set_visible ( vl->vt, &iter, FALSE );
+ vik_layer_realize ( vli, vl->vt, &iter );
i = i->next;
}
}
g_free(dp);
}
+/**
+ * Generate tooltip text for the layer.
+ */
+static const gchar* aggregate_layer_tooltip ( VikAggregateLayer *val )
+{
+ static gchar tmp_buf[128];
+ tmp_buf[0] = '\0';
+
+ GList *children = val->children;
+ if ( children ) {
+ gint nn = g_list_length (children);
+ // Could have a more complicated tooltip that numbers each type of layers,
+ // but for now a simple overall count
+ g_snprintf (tmp_buf, sizeof(tmp_buf), ngettext("One layer", "%d layers", nn), nn );
+ }
+ return tmp_buf;
+}
projects / andy / viking.git / blobdiff