Expose VikSlippyMapSource's private fields as properties

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

diff --git a/src/viklayer.c b/src/viklayer.c
index 434db3d63d4627c03fe17d9204b6937d2cf277d7..e85427e1a75ab3819cac645326cb35a86131e8f2 100644 (file)
--- a/src/viklayer.c
+++ b/src/viklayer.c
@@ -19,8 +19,13 @@
  *
  */
 
  *
  */
 

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib/gi18n.h>
+

 #include "viking.h"
 #include "viking.h"

-#include "vikradiogroup.h"

 #include <string.h>
 
 /* functions common to all layers. */
 #include <string.h>
 
 /* functions common to all layers. */


@@ -32,6 +37,7 @@ extern VikLayerInterface vik_maps_layer_interface;
 extern VikLayerInterface vik_coord_layer_interface;
 extern VikLayerInterface vik_georef_layer_interface;
 extern VikLayerInterface vik_gps_layer_interface;
 extern VikLayerInterface vik_coord_layer_interface;
 extern VikLayerInterface vik_georef_layer_interface;
 extern VikLayerInterface vik_gps_layer_interface;

+extern VikLayerInterface vik_dem_layer_interface;

 
 enum {
   VL_UPDATE_SIGNAL,
 
 enum {
   VL_UPDATE_SIGNAL,


@@ -44,7 +50,7 @@ static GObjectClass *parent_class;
 static void layer_class_init ( VikLayerClass *klass );
 static void layer_init ( VikLayer *vl );
 static void layer_finalize ( VikLayer *vl );
 static void layer_class_init ( VikLayerClass *klass );
 static void layer_init ( VikLayer *vl );
 static void layer_finalize ( VikLayer *vl );

-static gboolean layer_properties_factory ( VikLayer *vl, gpointer vp );
+static gboolean layer_properties_factory ( VikLayer *vl, VikViewport *vp );

 
 
 /* TODO longone: rename vik_layer_init -> set_type */
 
 
 /* TODO longone: rename vik_layer_init -> set_type */


@@ -89,6 +95,24 @@ static void layer_class_init (VikLayerClass *klass)
 }
 
 void vik_layer_emit_update ( VikLayer *vl )
 }
 
 void vik_layer_emit_update ( VikLayer *vl )

+{
+  if ( vl->visible ) {
+    vik_window_set_redraw_trigger(vl);
+    g_signal_emit ( G_OBJECT(vl), layer_signals[VL_UPDATE_SIGNAL], 0 );
+  }
+}
+
+/* should only be done by VikLayersPanel -- need to redraw and record trigger
+ * when we make a layer invisible.
+ */
+void vik_layer_emit_update_although_invisible ( VikLayer *vl )
+{
+  vik_window_set_redraw_trigger(vl);
+  g_signal_emit ( G_OBJECT(vl), layer_signals[VL_UPDATE_SIGNAL], 0 );
+}
+
+/* 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 );
 {
   if ( vl->visible )
     g_signal_emit ( G_OBJECT(vl), layer_signals[VL_UPDATE_SIGNAL], 0 );


@@ -101,6 +125,7 @@ static VikLayerInterface *vik_layer_interfaces[VIK_LAYER_NUM_TYPES] = {
   &vik_georef_layer_interface,
   &vik_gps_layer_interface,
   &vik_maps_layer_interface,
   &vik_georef_layer_interface,
   &vik_gps_layer_interface,
   &vik_maps_layer_interface,

+  &vik_dem_layer_interface,

 };
 
 VikLayerInterface *vik_layer_get_interface ( gint type )
 };
 
 VikLayerInterface *vik_layer_get_interface ( gint type )


@@ -124,20 +149,26 @@ void vik_layer_init ( VikLayer *vl, gint type )
 /* frees old name */
 void vik_layer_rename ( VikLayer *l, const gchar *new_name )
 {
 /* frees old name */
 void vik_layer_rename ( VikLayer *l, const gchar *new_name )
 {

-  g_assert ( l != NULL);
-  if ( l->name )
-    g_free ( l->name );
+  g_assert ( l != NULL );
+  g_assert ( new_name != NULL );
+  g_free ( l->name );

   l->name = g_strdup ( new_name );
 }
 
 void vik_layer_rename_no_copy ( VikLayer *l, gchar *new_name )
 {
   l->name = g_strdup ( new_name );
 }
 
 void vik_layer_rename_no_copy ( VikLayer *l, gchar *new_name )
 {

-  g_assert ( l != NULL);
-  if ( l->name )
-    g_free ( l->name );
+  g_assert ( l != NULL );
+  g_assert ( new_name != NULL );
+  g_free ( l->name );

   l->name = new_name;
 }
 
   l->name = new_name;
 }
 

+const gchar *vik_layer_get_name ( VikLayer *l )
+{
+  g_assert ( l != NULL);
+  return l->name;
+}
+

 VikLayer *vik_layer_create ( gint type, gpointer vp, GtkWindow *w, gboolean interactive )
 {
   VikLayer *new_layer = NULL;
 VikLayer *vik_layer_create ( gint type, gpointer vp, GtkWindow *w, gboolean interactive )
 {
   VikLayer *new_layer = NULL;


@@ -150,7 +181,9 @@ VikLayer *vik_layer_create ( gint type, gpointer vp, GtkWindow *w, gboolean inte
   if ( interactive )
   {
     if ( vik_layer_properties ( new_layer, vp ) )
   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 */
     else
     {
       g_object_unref ( G_OBJECT(new_layer) ); /* cancel that */


@@ -181,22 +214,6 @@ void vik_layer_change_coord_mode ( VikLayer *l, VikCoordMode mode )
     vik_layer_interfaces[l->type]->change_coord_mode ( l, mode );
 }
 
     vik_layer_interfaces[l->type]->change_coord_mode ( l, mode );
 }
 

-VikLayer *vik_layer_copy ( VikLayer *vl, gpointer vp )
-{
-  if ( vik_layer_interfaces[vl->type]->copy )
-  {
-    VikLayer *rv = vik_layer_interfaces[vl->type]->copy ( vl, vp );
-    if ( rv )
-    {
-      vik_layer_rename ( rv, vl->name );
-      rv->visible = vl->visible;
-    }
-    return rv;
-  }
-  else
-    return NULL;
-}
-

 typedef struct {
   gint layer_type;
   gint len;
 typedef struct {
   gint layer_type;
   gint len;


@@ -248,6 +265,24 @@ void vik_layer_marshall_params ( VikLayer *vl, guint8 **data, gint *datalen )
       case VIK_LAYER_PARAM_STRING: 
        vlm_append(d.s, strlen(d.s));
        break;
       case VIK_LAYER_PARAM_STRING: 
        vlm_append(d.s, strlen(d.s));
        break;

+
+      /* print out the string list in the array */
+      case VIK_LAYER_PARAM_STRING_LIST: {
+        GList *list = d.sl;
+        
+        /* write length of list (# of strings) */
+        gint listlen = g_list_length ( list );
+        g_byte_array_append ( b, (guint8 *)&listlen, sizeof(listlen) );
+
+        /* write each string */
+        while ( list ) {
+          gchar *s = (gchar *) list->data;
+          vlm_append(s, strlen(s));
+          list = list->next;
+        }
+
+       break;
+      }

       default:
        vlm_append(&d, sizeof(d));
        break;
       default:
        vlm_append(&d, sizeof(d));
        break;


@@ -298,6 +333,24 @@ void vik_layer_unmarshall_params ( VikLayer *vl, guint8 *data, gint datalen, Vik
        set_param(vl, i, d, vvp);
        g_free(s);
        break;
        set_param(vl, i, d, vvp);
        g_free(s);
        break;

+      case VIK_LAYER_PARAM_STRING_LIST:  {
+        gint listlen = vlm_size, j;
+        GList *list = NULL;
+        b += sizeof(gint); /* skip listlen */;
+
+        for ( j = 0; j < listlen; j++ ) {
+          /* get a string */
+          s = g_malloc(vlm_size + 1);
+         s[vlm_size]=0;
+         vlm_read(s);
+          list = g_list_append ( list, s );
+        }
+        d.sl = list;
+        set_param ( vl, i, d, vvp );
+        /* don't free -- string list is responsibility of the layer */
+
+        break;
+        }

       default:
        vlm_read(&d);
        set_param(vl, i, d, vvp);
       default:
        vlm_read(&d);
        set_param(vl, i, d, vvp);


@@ -397,271 +450,32 @@ gboolean vik_layer_set_param ( VikLayer *layer, guint16 id, VikLayerParamData da
   return FALSE;
 }
 
   return FALSE;
 }
 

-void vik_layer_post_read ( VikLayer *layer, gpointer vp )
+void vik_layer_post_read ( VikLayer *layer, VikViewport *vp, gboolean from_file )

 {
   if ( vik_layer_interfaces[layer->type]->post_read )
 {
   if ( vik_layer_interfaces[layer->type]->post_read )

-    vik_layer_interfaces[layer->type]->post_read ( layer, vp );
+    vik_layer_interfaces[layer->type]->post_read ( layer, vp, from_file );

 }
 
 }
 

-static GtkWidget *properties_widget_new_widget ( VikLayerParam *param, VikLayerParamData data )
+static gboolean layer_properties_factory ( VikLayer *vl, VikViewport *vp )

 {
 {

-  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 ( 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_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_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:
-      rv.u = vik_radio_group_get_selected(VIK_RADIO_GROUP(widget));
-      if ( param->extra_widget_data )
-        rv.u = (guint *)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_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;
+  switch ( a_uibuilder_properties_factory ( 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 */
+    default:
+      return TRUE;

   }
   }

-  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, gpointer 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++;
-        }
-      }
-      vik_layer_post_read ( vl, vp ); /* 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;
-  }
-}