Guilhem's autotools support/alphabetized trw option

diff --git a/ChangeLog b/ChangeLog
index a5ade5615d5f3393ec603883b7411c63378956e0..a338e4d0efb3bc3a1585d50bcef9f470bd1dfdf8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2005-09-13
+Guilhem BONNEFILLE  <guilhem.bonnefille@laposte.net>:
+       * bootstrap: new file to bootstrap auto-tools
+       * src/config.h (VIK_CONFIG_ALPHABETIZED_TRW): no more set via this file
+       * Makefile.am (bin_SCRIPTS): viking-remote added
+       * configure.ac: --enable-alphabetized-trw option added
+
+Evan Battaglia <gtoevan@gmx.net>:
+       * Experimental altitude funky plotting I'm working on
+
+2005-09-12
+Alex Foobarian <foobarian@gmail.com>'s changes
+* disable stops, for now (I forgot about those...)
+* Track elevation graph: minimum altitude difference for less jagged curves
+* Track elevation graph: gray background, blue foreground
+* Track elevation graph: lines to clearly show absolute elevation
+* New velocity-vs-time graph & calculating function
+* Notebook to hold this new graph with track elevation graph
+My (Evan's) changes:
+* Fix above v-vs-t patch to not crash on tracks without timestamp.
+* Not show v-vs-t graph and/or elevation map if the necessary data isn't there.
+
 2005-09-07
 Autotools support by Guilhem Bonnefille.
 

diff --git a/Makefile.am b/Makefile.am
index f963effea22fa642c9057bdcc07918296228873b..a18a906eb4d75d980b72754ed1aea814e8247915 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,3 @@
-SUBDIRS = src
\ No newline at end of file
+SUBDIRS = src
+
+bin_SCRIPTS = viking-remote
\ No newline at end of file

diff --git a/TODO b/TODO
index 24caedf9fb70b3572f11aa8204532c9af7ab5f2e..aa19c97e582286ec74ebf5ef56c502e74c117013 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,6 +3,7 @@ FIXES:
 checkbox in list doesn't work?! (on some GTK setups anyway)
 
 map cache size a dynamically settable option
+alphabetized waypoints/tracks dynamically settable option
 
 check out bgitemcount stuff in background.c
 open jobs window a 2nd time after clearing (mess around a bit), crashes

diff --git a/configure.ac b/configure.ac
index 8fcfa70656ddf980bd146ca06750d235d3dfaf4b..50fa92d8235c65ba3900a2b89c6fb37cb5988a05 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.59)
 AC_INIT(viking, 0.1.1)
 AM_INIT_AUTOMAKE()
 dnl AC_CONFIG_SRCDIR([src/main.c])
-dnl AM_CONFIG_HEADERS([config.h])
+dnl AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
 AC_PROG_CC
@@ -27,6 +27,20 @@ AC_FUNC_STAT
 AC_FUNC_STRTOD
 AC_CHECK_FUNCS([bzero floor gethostbyname memset mkdir pow realpath socket sqrt strcasecmp strchr strdup strncasecmp strtol strtoul])
 
+# Options
+AC_ARG_ENABLE(alphabetized-trw, AC_HELP_STRING([--enable-alphabetized-trw],
+              [enable alphabetized track & waypoints (default is enable)]),
+              [ac_cv_enable_alpha_trw=$enableval],
+              [ac_cv_enable_alpha_trw=yes])
+AC_CACHE_CHECK([whether to enable alphabetized track & waypoint],
+               [ac_cv_enable_alpha_trw], [ac_cv_enable_alpha_trw=yes])
+case $ac_cv_enable_alpha_trw in
+  yes)
+    AC_DEFINE(VIK_CONFIG_ALPHABETIZED_TRW, [], [NO ALPHABETIZED TRW])
+    ;;
+esac
+
+# Configuration
 AC_CONFIG_FILES([Makefile
                  src/Makefile])
 AC_OUTPUT

diff --git a/src/config.h b/src/config.h
index 81955a52e421064515462d297fedc53f36d60999..f46158366a341a34d478e95633c77ab8dd9f3d2c 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -1,7 +1,6 @@
 #ifndef VIK_CONFIG_H
 #define VIK_CONFIG_H
 
-#define VIK_CONFIG_ALPHABETIZED_TRW
 #define VIK_CONFIG_MAPCACHE_SIZE 50331648 /* 48 meggerbytes */
 
 

diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
index 206d59ca2b3f35c2173348a7c4782c8f3c901557..09ea30d8f0d84365057f2bf4b5f9283b0dde4e5c 100644 (file)
--- a/src/viktrwlayer.c
+++ b/src/viktrwlayer.c
@@ -743,6 +743,13 @@ static void trw_layer_draw_track ( const gchar *name, VikTrack *track, struct Dr
           if ( list->next ) {
             vik_viewport_draw_rectangle ( dp->vp, g_array_index(dp->vtl->track_gc, GdkGC *, dp->track_gc_iter), TRUE, x-tp_size, y-tp_size, 2*tp_size, 2*tp_size );
 
+#if 0
+            if ( VIK_TRACKPOINT(list->next->data)->altitude != VIK_DEFAULT_ALTITUDE )
+              vik_viewport_draw_line ( dp->vp, g_array_index(dp->vtl->track_gc, GdkGC *, dp->track_gc_iter), x, y, x, y-(VIK_TRACKPOINT(list->next->data)->altitude-540)/5);
+#endif
+
+            vik_viewport_draw_rectangle ( dp->vp, g_array_index(dp->vtl->track_gc, GdkGC *, dp->track_gc_iter), TRUE, x-tp_size, y-tp_size, 2*tp_size, 2*tp_size );
+
             /* stops */
             if (0 && VIK_TRACKPOINT(list->next->data)->timestamp - VIK_TRACKPOINT(list->data)->timestamp > 60 )
               vik_viewport_draw_arc ( dp->vp, g_array_index(dp->vtl->track_gc, GdkGC *, 11), TRUE, x-(3*tp_size), y-(3*tp_size), 6*tp_size, 6*tp_size, 0, 360*64 );

diff --git a/src/viktrwlayer_propwin.c b/src/viktrwlayer_propwin.c
index 5f300014c7fe0915d35c9560115e0c4872a540db..9a5f9988fcfc4d3a862731d8cd94ca05ac1c539c 100644 (file)
--- a/src/viktrwlayer_propwin.c
+++ b/src/viktrwlayer_propwin.c
@@ -87,26 +87,6 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gdoub
   gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->mid_gc[0], 
                     TRUE, MARGIN, 0, PROFILE_WIDTH, PROFILE_HEIGHT);
 
-#if 0
-  {
-    int j;
-    GdkGC **colors[8] = { window->style->bg_gc, window->style->fg_gc, 
-                        window->style->light_gc, 
-                        window->style->dark_gc, window->style->mid_gc, 
-                        window->style->text_gc, window->style->base_gc,
-                        window->style->text_aa_gc };
-    for (i=0; i<5; i++) {
-      for (j=0; j<8; j++) {
-       gdk_draw_rectangle(GDK_DRAWABLE(pix), colors[j][i],
-                          TRUE, i*20, j*20, 20, 20);
-       gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc,
-                          FALSE, i*20, j*20, 20, 20);
-      }
-    }
-  }
-#else
-
-  
   /* draw grid */
 #define LABEL_FONT "Sans 8"
   for (i=0; i<=LINES; i++) {
@@ -134,7 +114,7 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gdoub
     else 
       gdk_draw_line ( GDK_DRAWABLE(pix), window->style->dark_gc[3], 
                      i + MARGIN, PROFILE_HEIGHT, i + MARGIN, PROFILE_HEIGHT-PROFILE_HEIGHT*(altitudes[i]-mina)/(maxa-mina) );
-#endif
+
   /* draw border */
   gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc, FALSE, MARGIN, 0, PROFILE_WIDTH-1, PROFILE_HEIGHT-1);