From 189ffe035f7225e3bbe329aac9b6ad882437797c Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Mon, 18 Feb 2013 08:21:36 +0000
Subject: [PATCH] Hour resolution by Florian

git-svn-id: https://svn.fhem.de/fhem/trunk@2756 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED            |  1 +
 fhem/FHEM/01_FHEMWEB.pm | 23 ++++++++++++++++++-----
 fhem/FHEM/98_SVG.pm     |  5 ++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 1102e4add..4b75658fe 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -76,6 +76,7 @@
   - bugfix:  floorplan-correction for readings with longpoll. Requires local
              change in css!
   - feature: floorplan added js-extension from Dirk
+  - feature: hour resolution in SVG
 
 - 2012-10-28 (5.3)
   - feature: added functions trim, ltrim, rtrim, UntoggleDirect,
diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index f5bd382e3..b9a3cb668 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -94,7 +94,7 @@ my $FW_RETTYPE;    # image/png or the like
 my $FW_room;       # currently selected room
 my %FW_rooms;      # hash of all rooms
 my %FW_types;      # device types, for sorting
-my @FW_zoom;       # "qday", "day","week","month","year"
+my @FW_zoom;       # "hour","qday","day","week","month","year"
 my %FW_zoom;       # the same as @FW_zoom
 my %FW_hiddenroom; # hash of hidden rooms
 my %FW_hiddengroup;# hash of hidden groups
@@ -133,7 +133,7 @@ FHEMWEB_Initialize($)
   ###############
   # Initialize internal structures
   my $n = 0;
-  @FW_zoom = ("qday", "day","week","month","year");
+  @FW_zoom = ("hour","qday", "day","week","month","year");
   %FW_zoom = map { $_, $n++ } @FW_zoom;
 
   addToAttrList("webCmd");
@@ -1747,8 +1747,11 @@ FW_zoomLink($$$)
     # Approximation of the next offset.
     my $w_off = $FW_pos{off};
     $w_off = 0 if(!$w_off);
-    if($val eq "qday") {
-      $w_off =              $w_off*4;
+
+    if ($val eq "hour") {
+      $w_off =              $w_off*6;
+    } elsif($val eq "qday") {
+      $w_off = ($off < 0) ? $w_off*4 : int($w_off/6);
     } elsif($val eq "day") {
       $w_off = ($off < 0) ? $w_off*7 : int($w_off/4);
     } elsif($val eq "week") {
@@ -1813,7 +1816,17 @@ FW_calcWeblink($$)
   $zoom = "day" if(!$zoom);
   $zoom = $frx if ($frx); #for fixedrange {day|week|...} klaus
 
-  if($zoom eq "qday") {
+
+  if($zoom eq "hour") {
+      
+      my $t = $now + $off*3600;
+      my @l = localtime($t);
+      $FW_devs{$d}{from}
+      =sprintf("%04d-%02d-%02d_%02d",$l[5]+1900,$l[4]+1,$l[3],$l[2]);
+      $FW_devs{$d}{to}
+      =sprintf("%04d-%02d-%02d_%02d",$l[5]+1900,$l[4]+1,$l[3],$l[2]+1);;
+
+  } elsif($zoom eq "qday") {
 
     my $t = $now + $off*21600;
     my @l = localtime($t);
diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm
index bf3ae565b..5a36238d7 100755
--- a/fhem/FHEM/98_SVG.pm
+++ b/fhem/FHEM/98_SVG.pm
@@ -244,7 +244,10 @@ SVG_render($$$$$$$$)
   # Compute & draw vertical tics, grid and labels
   my $ddur = ($tosec-$fromsec)/86400;
   my ($first_tag, $tag, $step, $tstep, $aligntext,  $aligntics);
-  if($ddur <= 0.5) {
+  
+  if ($ddur <= 0.1) {
+    $first_tag=". 2 1"; $tag=": 3 4"; $step = 300; $tstep = 60;
+  } elsif($ddur <= 0.5) {
     $first_tag=". 2 1"; $tag=": 3 4"; $step = 3600; $tstep = 900;
   } elsif($ddur <= 1.1) {       # +0.1 -> DST
     $first_tag=". 2 1"; $tag=": 3 4"; $step = 4*3600; $tstep = 3600;