X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/20c7a3a095bc527ba1f97ff85fe193ce11177773..de2fc9aa9e8db8e0258c8328161c6b5eda176a0a:/src/vikaggregatelayer.c diff --git a/src/vikaggregatelayer.c b/src/vikaggregatelayer.c index 4b954b27..884340f7 100644 --- a/src/vikaggregatelayer.c +++ b/src/vikaggregatelayer.c @@ -20,13 +20,12 @@ */ #include "viking.h" -#include "vikaggregatelayer_pixmap.h" +#include "icons/icons.h" #include #define DISCONNECT_UPDATE_SIGNAL(vl, val) g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val) -static VikAggregateLayer *aggregate_layer_copy ( VikAggregateLayer *val, gpointer vp ); 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 ); @@ -34,7 +33,7 @@ static void aggregate_layer_drag_drop_request ( VikAggregateLayer *val_src, VikA VikLayerInterface vik_aggregate_layer_interface = { "Aggregate", - &aggregatelayer_pixbuf, + &vikaggregatelayer_pixbuf, NULL, 0, @@ -64,7 +63,6 @@ VikLayerInterface vik_aggregate_layer_interface = { (VikLayerFuncSublayerRenameRequest) NULL, (VikLayerFuncSublayerToggleVisible) NULL, - (VikLayerFuncCopy) aggregate_layer_copy, (VikLayerFuncMarshall) aggregate_layer_marshall, (VikLayerFuncUnmarshall) aggregate_layer_unmarshall, @@ -117,23 +115,6 @@ VikAggregateLayer *vik_aggregate_layer_create (VikViewport *vp) return rv; } -static VikAggregateLayer *aggregate_layer_copy ( VikAggregateLayer *val, gpointer vp ) -{ - VikAggregateLayer *rv = vik_aggregate_layer_new (); - VikLayer *child_layer; - GList *child = val->children; - while ( child ) - { - child_layer = vik_layer_copy ( VIK_LAYER(child->data), vp ); - if ( child_layer ) { - rv->children = g_list_append ( rv->children, child_layer ); - g_signal_connect_swapped ( G_OBJECT(child_layer), "update", G_CALLBACK(vik_layer_emit_update), rv ); - } - child = child->next; - } - return rv; -} - static void aggregate_layer_marshall( VikAggregateLayer *val, guint8 **data, gint *datalen ) { GList *child = val->children; @@ -184,7 +165,7 @@ static VikAggregateLayer *aggregate_layer_unmarshall( guint8 *data, gint len, Vi child_layer = vik_layer_unmarshall ( data + sizeof(gint), alm_size, vvp ); if (child_layer) { rv->children = g_list_append ( rv->children, child_layer ); - g_signal_connect_swapped ( G_OBJECT(child_layer), "update", G_CALLBACK(vik_layer_emit_update), rv ); + g_signal_connect_swapped ( G_OBJECT(child_layer), "update", G_CALLBACK(vik_layer_emit_update_secondary), rv ); } alm_next; } @@ -223,7 +204,7 @@ void vik_aggregate_layer_insert_layer ( VikAggregateLayer *val, VikLayer *l, Gtk } else { val->children = g_list_append ( val->children, l ); } - g_signal_connect_swapped ( G_OBJECT(l), "update", G_CALLBACK(vik_layer_emit_update), val ); + 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 ) @@ -242,7 +223,7 @@ void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l ) } val->children = g_list_append ( val->children, l ); - g_signal_connect_swapped ( G_OBJECT(l), "update", G_CALLBACK(vik_layer_emit_update), val ); + 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 ) @@ -284,9 +265,34 @@ void vik_aggregate_layer_move_layer ( VikAggregateLayer *val, GtkTreeIter *child val->children = second; } +/* Draw the aggregate layer. If vik viewport is in half_drawn mode, this means we are only + * to draw the layers above and including the trigger layer. + * To do this we don't draw any layers if in half drawn mode, unless we find the + * trigger layer, in which case we pull up the saved pixmap, turn off half drawn mode and + * start drawing layers. + * Also, if we were never in half drawn mode, we save a snapshot + * of the pixmap before drawing the trigger layer so we can use it again + * later. + */ void vik_aggregate_layer_draw ( VikAggregateLayer *val, gpointer data ) { - g_list_foreach ( val->children, (GFunc)(vik_layer_draw), data ); + GList *iter = val->children; + VikLayer *vl; + VikLayer *trigger = VIK_LAYER(vik_viewport_get_trigger( VIK_VIEWPORT(data) )); + 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) ); + } else { + vik_viewport_snapshot_save( VIK_VIEWPORT(data) ); + } + } + if ( vl->type == VIK_LAYER_AGGREGATE || vl->type == VIK_LAYER_GPS || ! vik_viewport_get_half_drawn( VIK_VIEWPORT(data) ) ) + vik_layer_draw ( vl, data ); + iter = iter->next; + } } static void aggregate_layer_change_coord_mode ( VikAggregateLayer *val, VikCoordMode mode ) @@ -400,6 +406,22 @@ VikLayer *vik_aggregate_layer_get_top_visible_layer_of_type ( VikAggregateLayer return NULL; } +GList *vik_aggregate_layer_get_all_layers_of_type(VikAggregateLayer *val, GList *layers, gint type) +{ + GList *l = layers; + GList *children = val->children; + if (!children) + return 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 */ + children = children->next; + } + return l; +} + void vik_aggregate_layer_realize ( VikAggregateLayer *val, VikTreeview *vt, GtkTreeIter *layer_iter ) { GList *i = val->children;