Fixed bugs that caused "draw_scale" and "draw_centermark" not consistent.

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

diff --git a/src/file.c b/src/file.c
index c7f8f6bee761810a80af07f1e3c50d8ceaf81c50..be4fb118b54d526e580822203cba76c191ddb2f6 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -25,6 +25,8 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <glib.h>
+#include <glib/gstdio.h>
 
 #define TEST_BOOLEAN(str) (! ((str)[0] == '\0' || (str)[0] == '0' || (str)[0] == 'n' || (str)[0] == 'N' || (str)[0] == 'f' || (str)[0] == 'F') )
 #define VIK_MAGIC "#VIK"
@@ -154,10 +156,11 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
     default: modestring = "mercator";
   }
 
-  fprintf ( f, "#VIKING GPS Data file " VIKING_URL "\n\nxmpp=%f\nympp=%f\nlat=%f\nlon=%f\nmode=%s\ncolor=%s\ndrawscale=%s\n",
+  fprintf ( f, "#VIKING GPS Data file " VIKING_URL "\n\nxmpp=%f\nympp=%f\nlat=%f\nlon=%f\nmode=%s\ncolor=%s\ndrawscale=%s\ndrawcentermark=%s",
       vik_viewport_get_xmpp ( VIK_VIEWPORT(vp) ), vik_viewport_get_ympp ( VIK_VIEWPORT(vp) ), ll.lat, ll.lon,
       modestring, vik_viewport_get_background_color(VIK_VIEWPORT(vp)),
-      vik_viewport_get_draw_scale(VIK_VIEWPORT(vp)) ? "t" : "f" );
+      vik_viewport_get_draw_scale(VIK_VIEWPORT(vp)) ? "t" : "f",
+      vik_viewport_get_draw_centermark(VIK_VIEWPORT(vp)) ? "t" : "f" );
 
   if ( ! VIK_LAYER(top)->visible )
     fprintf ( f, "visible=f\n" );
@@ -172,7 +175,7 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
       push(&stack);
       stack->data = (gpointer) vik_aggregate_layer_get_children(VIK_AGGREGATE_LAYER(current_layer));
     }
-    if ( current_layer->type == VIK_LAYER_GPS && !vik_gps_layer_is_empty(VIK_GPS_LAYER(current_layer)) )
+    else if ( current_layer->type == VIK_LAYER_GPS && !vik_gps_layer_is_empty(VIK_GPS_LAYER(current_layer)) )
     {
       push(&stack);
       stack->data = (gpointer) vik_gps_layer_get_children(VIK_GPS_LAYER(current_layer));
@@ -214,8 +217,8 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
   guint16 len;
   long line_num = 0;
 
-  VikLayerParam *params; /* for current layer, so we don't have to keep on looking up interface */
-  guint8 params_count;
+  VikLayerParam *params = NULL; /* for current layer, so we don't have to keep on looking up interface */
+  guint8 params_count = 0;
 
   push(&stack);
   stack->under = NULL;
@@ -250,9 +253,10 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
         continue;
       else if ( str_starts_with ( line, "Layer ", 6, TRUE ) )
       {
-        if ( ( ! stack->data ) || VIK_LAYER(stack->data)->type != VIK_LAYER_AGGREGATE )
+        int parent_type = VIK_LAYER(stack->data)->type;
+        if ( ( ! stack->data ) || ((parent_type != VIK_LAYER_AGGREGATE) && (parent_type != VIK_LAYER_GPS)) )
         {
-          g_warning ( "Line %ld: Layer command inside non-Aggregate Layer", line_num );
+          g_warning ( "Line %ld: Layer command inside non-Aggregate Layer (type %d)", line_num, parent_type );
           push(&stack); /* inside INVALID layer */
           stack->data = NULL;
           continue;
@@ -266,6 +270,12 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
             g_warning ( "Line %ld: Unknown type %s\n", line_num, line+6 );
             stack->data = NULL;
           }
+          else if (parent_type == VIK_LAYER_GPS)
+          {
+            stack->data = (gpointer) vik_gps_layer_get_a_child(VIK_GPS_LAYER(stack->under->data));
+            params = vik_layer_get_interface(type)->params;
+            params_count = vik_layer_get_interface(type)->params_count;
+          }
           else
           {
             stack->data = (gpointer) vik_layer_create ( type, vp, NULL, FALSE );
@@ -282,8 +292,15 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
         {
           if ( stack->data && stack->under->data )
           {
-            vik_aggregate_layer_add_layer ( VIK_AGGREGATE_LAYER(stack->under->data), VIK_LAYER(stack->data) );
-            vik_layer_post_read ( VIK_LAYER(stack->data), vp );
+            if (VIK_LAYER(stack->under->data)->type == VIK_LAYER_AGGREGATE) {
+              vik_aggregate_layer_add_layer ( VIK_AGGREGATE_LAYER(stack->under->data), VIK_LAYER(stack->data) );
+              vik_layer_post_read ( VIK_LAYER(stack->data), vp );
+            }
+            else if (VIK_LAYER(stack->under->data)->type == VIK_LAYER_GPS) {
+              /* TODO: anything else needs to be done here ? */
+            }
+            else
+              g_warning ( "Line %ld: EndLayer command inside non-Aggregate Layer (type %d)", line_num, VIK_LAYER(stack->data)->type );
           }
           pop(&stack);
         }
@@ -351,6 +368,8 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
         vik_viewport_set_background_color ( VIK_VIEWPORT(vp), line+6 );
       else if ( stack->under == NULL && eq_pos == 9 && strncasecmp ( line, "drawscale", eq_pos ) == 0 )
         vik_viewport_set_draw_scale ( VIK_VIEWPORT(vp), TEST_BOOLEAN(line+10) );
+      else if ( stack->under == NULL && eq_pos == 14 && strncasecmp ( line, "drawcentermark", eq_pos ) == 0 )
+        vik_viewport_set_draw_centermark ( VIK_VIEWPORT(vp), TEST_BOOLEAN(line+15) );
       else if ( stack->under && eq_pos == 4 && strncasecmp ( line, "name", eq_pos ) == 0 )
         vik_layer_rename ( VIK_LAYER(stack->data), line+5 );
       else if ( eq_pos == 7 && strncasecmp ( line, "visible", eq_pos ) == 0 )
@@ -529,3 +548,20 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_ty
   }
   return FALSE;
 }
+
+const gchar *a_get_viking_dir()
+{
+  static gchar *viking_dir = NULL;
+
+  if (!viking_dir) {
+    gchar *temp[] = {"/tmp/vikXXXXXX"};
+    gchar *home = getenv("HOME");
+    if (!home || access(home, W_OK))
+      home = mktemp(temp);
+    viking_dir = g_strdup_printf("%s/%s", home, ".viking");
+    if (access(viking_dir, F_OK))
+      g_mkdir(viking_dir, 0755);
+  }
+
+  return viking_dir;
+}