Make elev graph show better graph for low altitude tracks.

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

diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c
index a64ca5a7c13a462a2f414d08628f8d211494a343..e8d182a6b96f6a69c1bbc29d0562c18c91b693be 100644 (file)
--- a/src/viklayerspanel.c
+++ b/src/viklayerspanel.c
@@ -206,14 +206,19 @@ static void layers_item_toggled (VikLayersPanel *vlp, GtkTreeIter *iter)
 
   switch ( type )
   {
-    case VIK_TREEVIEW_TYPE_LAYER: visible = (VIK_LAYER(p)->visible ^= 1); break;
-    case VIK_TREEVIEW_TYPE_SUBLAYER: visible = vik_layer_sublayer_toggle_visible ( VIK_LAYER(vik_treeview_item_get_parent(vlp->vt, iter)), vik_treeview_item_get_data(vlp->vt, iter), p); break;
+    case VIK_TREEVIEW_TYPE_LAYER:
+      visible = (VIK_LAYER(p)->visible ^= 1);
+      vik_layer_emit_update_although_invisible ( VIK_LAYER(p) ); /* set trigger for half-drawn */
+      break;
+    case VIK_TREEVIEW_TYPE_SUBLAYER:
+      visible = vik_layer_sublayer_toggle_visible ( VIK_LAYER(vik_treeview_item_get_parent(vlp->vt, iter)),
+                                               vik_treeview_item_get_data(vlp->vt, iter), p);
+      vik_layer_emit_update_although_invisible ( VIK_LAYER(vik_treeview_item_get_parent(vlp->vt, iter)) );
+      break;
     default: return;
   }
 
   vik_treeview_item_set_visible ( vlp->vt, iter, visible );
-
-  vik_layers_panel_emit_update ( vlp );
 }
 
 static void layers_item_edited (VikLayersPanel *vlp, GtkTreeIter *iter, const gchar *new_text)
@@ -384,7 +389,13 @@ void vik_layers_panel_add_layer ( VikLayersPanel *vlp, VikLayer *l )
       VikLayer *vl = VIK_LAYER(vik_treeview_item_get_parent ( vlp->vt, &iter ));
       replace_iter = &(vl->iter);
       g_assert ( vl->realized );
-      addtoagg = VIK_AGGREGATE_LAYER(vik_treeview_item_get_parent ( vlp->vt, &(vl->iter) ) );
+      VikLayer *grandpa = (vik_treeview_item_get_parent ( vlp->vt, &(vl->iter) ) );
+      if (IS_VIK_AGGREGATE_LAYER(grandpa))
+        addtoagg = VIK_AGGREGATE_LAYER(grandpa);
+      else {
+        addtoagg = vlp->toplayer;
+        replace_iter = &grandpa->iter;
+      }
     }
     if ( replace_iter )
       vik_aggregate_layer_insert_layer ( addtoagg, l, replace_iter );
@@ -424,7 +435,7 @@ gboolean vik_layers_panel_properties ( VikLayersPanel *vlp )
   {
     if ( vik_treeview_item_get_data ( vlp->vt, &iter ) == VIK_LAYER_AGGREGATE )
       a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_WIDGET(vlp), "Aggregate Layers have no settable properties." );
-    vik_layer_properties ( VIK_LAYER( vik_treeview_item_get_pointer ( vlp->vt, &iter ) ), VIK_GTK_WINDOW_FROM_WIDGET(vlp->vt) );
+    vik_layer_properties ( VIK_LAYER( vik_treeview_item_get_pointer ( vlp->vt, &iter ) ), vlp->vvp );
     return TRUE;
   }
   else
@@ -455,9 +466,15 @@ void vik_layers_panel_cut_selected ( VikLayersPanel *vlp )
   if ( type == VIK_TREEVIEW_TYPE_LAYER )
   {
     VikAggregateLayer *parent = vik_treeview_item_get_parent ( vlp->vt, &iter );
+
     if ( parent )
     {
-      a_clipboard_copy ( vlp );
+
+      /* reset trigger if trigger deleted */
+      if ( vik_layers_panel_get_selected ( vlp ) == vik_viewport_get_trigger ( vlp->vvp ) )
+        vik_viewport_set_trigger ( vlp->vvp, NULL );
+
+      a_clipboard_copy_selected ( vlp );
       if ( vik_aggregate_layer_delete ( parent, &iter ) )
         vik_layers_panel_emit_update ( vlp );
     }
@@ -476,13 +493,12 @@ void vik_layers_panel_copy_selected ( VikLayersPanel *vlp )
   type = vik_treeview_item_get_type ( vlp->vt, &iter );
 
   if ( type == VIK_TREEVIEW_TYPE_LAYER ) {
-    a_clipboard_copy ( vlp );
+    a_clipboard_copy_selected ( vlp );
   }
 }
 
 void vik_layers_panel_paste_selected ( VikLayersPanel *vlp )
 {
-  gint type;
   GtkTreeIter iter;
   g_return_if_fail ( vik_treeview_get_selected_iter ( vlp->vt, &iter ) );
   a_clipboard_paste ( vlp );
@@ -502,6 +518,10 @@ void vik_layers_panel_delete_selected ( VikLayersPanel *vlp )
     VikAggregateLayer *parent = vik_treeview_item_get_parent ( vlp->vt, &iter );
     if ( parent )
     {
+      /* reset trigger if trigger deleted */
+      if ( vik_layers_panel_get_selected ( vlp ) == vik_viewport_get_trigger ( vlp->vvp ) )
+        vik_viewport_set_trigger ( vlp->vvp, NULL );
+
       if (IS_VIK_AGGREGATE_LAYER(parent)) {
         if ( vik_aggregate_layer_delete ( parent, &iter ) )
          vik_layers_panel_emit_update ( vlp );
@@ -513,7 +533,8 @@ void vik_layers_panel_delete_selected ( VikLayersPanel *vlp )
   else if (type == VIK_TREEVIEW_TYPE_SUBLAYER) {
     VikLayer *sel = vik_layers_panel_get_selected ( vlp );
     if ( vik_layer_get_interface(sel->type)->delete_item ) {
-      vik_layer_get_interface(sel->type)->delete_item ( sel, type, vik_treeview_item_get_pointer(sel->vt, &iter) );
+      gint subtype = vik_treeview_item_get_data( vlp->vt, &iter);
+      vik_layer_get_interface(sel->type)->delete_item ( sel, subtype, vik_treeview_item_get_pointer(sel->vt, &iter) );
     }
   }
 }
@@ -577,6 +598,13 @@ VikLayer *vik_layers_panel_get_layer_of_type ( VikLayersPanel *vlp, gint type )
     return rv;
 }
 
+GList *vik_layers_panel_get_all_layers_of_type(VikLayersPanel *vlp, gint type)
+{
+  GList *layers = NULL;
+
+  return (vik_aggregate_layer_get_all_layers_of_type ( vlp->toplayer, layers, type ));
+}
+
 VikAggregateLayer *vik_layers_panel_get_top_layer ( VikLayersPanel *vlp )
 {
   return vlp->toplayer;