From: Tobias Oetiker <tobi@oetiker.ch>
Date: Sun, 29 Mar 2015 12:18:28 +0000 (+0200)
Subject: * fix grid rendering for automn time change
X-Git-Tag: v1.5.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd20fda4614b14dd70eb39125a3539af4c87042d;p=thirdparty%2Frrdtool-1.x.git

* fix grid rendering for automn time change
* add extra labeling for really high resolution charts
---

diff --git a/Makefile.in b/Makefile.in
index 532a6069..9c1c4296 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,10 +88,11 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/etc/rrdcached.socket.in \
 	$(top_srcdir)/etc/rrdcached.service.in \
 	$(top_srcdir)/etc/rrdcached-default-lsb.in ABOUT-NLS NEWS TODO \
-	conftools/compile conftools/config.guess \
-	conftools/config.rpath conftools/config.sub conftools/depcomp \
-	conftools/install-sh conftools/missing conftools/ltmain.sh \
-	$(top_srcdir)/conftools/compile \
+	compile conftools/compile config.guess conftools/config.guess \
+	config.rpath conftools/config.rpath config.sub \
+	conftools/config.sub depcomp conftools/depcomp install-sh \
+	conftools/install-sh missing conftools/missing ltmain.sh \
+	conftools/ltmain.sh $(top_srcdir)/conftools/compile \
 	$(top_srcdir)/conftools/config.guess \
 	$(top_srcdir)/conftools/config.rpath \
 	$(top_srcdir)/conftools/config.sub \
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 95130cb1..168b6f27 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -93,7 +93,11 @@ char week_fmt[128] = "Week %V";
 
 xlab_t    xlab[] = {
     /* 0  1    2          3    4         5   6          7  8   9  */
-    {0.0, 0, TMT_SECOND, 1, TMT_SECOND, 5, TMT_SECOND, 10, 0, "%H:%M:%S"}
+    {0.0, 0, TMT_SECOND, 1, TMT_SECOND, 5, TMT_SECOND, 1, 0, "%H:%M:%S"}
+    ,
+    {0.015, 0, TMT_SECOND, 1, TMT_SECOND, 5, TMT_SECOND, 5, 0, "%H:%M:%S"}
+    ,
+    {0.08, 0, TMT_SECOND, 1, TMT_SECOND, 5, TMT_SECOND, 10, 0, "%H:%M:%S"}
     ,
     {0.15, 0, TMT_SECOND, 5, TMT_SECOND, 15, TMT_SECOND, 30, 0, "%H:%M:%S"}
     ,
@@ -1519,8 +1523,6 @@ time_t find_first_time(
     struct tm tm;
 
     localtime_r(&start, &tm);
-    /* let mktime figure this dst on its own */
-    tm.tm_isdst = -1;
 
     switch (baseint) {
     case TMT_SECOND:
@@ -1590,7 +1592,7 @@ time_t find_next_time(
 
     localtime_r(&current, &tm);
     /* let mktime figure this dst on its own */
-    tm.tm_isdst = -1;
+    //tm.tm_isdst = -1;
 
     int limit = 2;
     switch (baseint) {