mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preparing for 4.3: doc fixes/last changes

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@207 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2008-07-12 08:16:51 +00:00
parent 8c7906eaea
commit d7a9d5cc8f
15 changed files with 298 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
webfrontend/pgm2/01_FHEMWEB.pm
View File

@@ -56,12 +56,12 @@ my $__detail; # durrently selected device for detail view
my $__title; # Page title
my $__cmdret; # Returned data by the fhem call
my $__scrolledweblinkcount; # Number of scrolled weblinks
my %__wlpos; # WebLink scroll position
my %__pos; # scroll position
my $__RET; # Returned data (html)
my $__RETTYPE; # image/png or the like
my $__SF; # Short for submit form
my $__ti; # Tabindex for all input fields
my @__zoom; # "day","week","month","year"
my @__zoom; # "qday", "day","week","month","year"
my %__zoom; # the same as @__zoom
my $__plotmode; # Current plotmode
my $__plotsize; # Size for a plot
@@ -110,7 +110,7 @@ FHEMWEB_Define($$)
###############
# Initialize internal structures
my $n = 0;
@__zoom = ("day","week","month","year");
@__zoom = ("qday", "day","week","month","year");
%__zoom = map { $_, $n++ } @__zoom;
return undef;
@@ -212,7 +212,7 @@ FHEMWEB_AnswerCall($)
{
my ($arg) = @_;
%__wlpos = ();
%__pos = ();
$__room = "";
$__detail = "";
$__cmdret = "";
@@ -328,7 +328,7 @@ FHEMWEB_digestCgi($)
if($p =~ m/^val\.(.*)$/) { $val{$1} = $v; }
if($p =~ m/^dev\.(.*)$/) { $dev{$1} = $v; }
if($p =~ m/^cmd\.(.*)$/) { $cmd = $v; $c= $1; }
if($p eq "wlpos") { %__wlpos = split(/[=;]/, $v); }
if($p eq "pos") { %__pos = split(/[=;]/, $v); }
if($p eq "data") { $__data = $v; }
}
@@ -579,8 +579,8 @@ FHEMWEB_roomOverview($)
pO "  ";
FHEMWEB_zoomLink("zoom=-1", "Zoom-in.png", "zoom in", 0);
FHEMWEB_zoomLink("zoom=1", "Zoom-out.png","zoom out", 0);
FHEMWEB_zoomLink("all=-1", "Prev.png", "prev", 0);
FHEMWEB_zoomLink("all=1", "Next.png", "next", 0);
FHEMWEB_zoomLink("off=-1", "Prev.png", "prev", 0);
FHEMWEB_zoomLink("off=1", "Next.png", "next", 0);
}
}
}
@@ -606,7 +606,7 @@ FHEMWEB_roomOverview($)
pO " <tr><td><a href=\"$__ME/HOWTO.html\">Howto</a></td></tr>\n";
pO " <tr><td><a href=\"$__ME/commandref.html\">Details</a></td></tr>\n";
my $sel = ($cmd =~ m/^style/) ? " class=\"sel\"" : "";
pO " <tr$sel><td><a href=\"$__ME?cmd=style list\">Misc. files</a></td></tr>\n";
pO " <tr$sel><td><a href=\"$__ME?cmd=style list\">Edit files</a></td></tr>\n";
pO " </table>\n";
pO " </td></tr>\n";
pO " </table>\n";
@@ -791,10 +791,7 @@ FHEMWEB_showRoom()
}
pO "<table><tr><td>";
$__wlpos{$va[0]} = $__wlpos{$d} if($__wlpos{$d});
my $wl = "&amp;wlpos=" . join(";", map { "$_=$__wlpos{$_}" }
grep { /(zoom|all|$va[0])/ } keys %__wlpos);
my $wl = "&amp;pos=" . join(";", map {"$_=$__pos{$_}"} keys %__pos);
my $arg="$__ME?cmd=showlog $d $va[0] $va[1] $va[2]$wl";
if($__plotmode eq "SVG") {
@@ -806,9 +803,6 @@ FHEMWEB_showRoom()
}
pO "</td><td>";
FHEMWEB_zoomLink("$d=-1", "Prev.png", "prev", 1);
FHEMWEB_zoomLink("$d=1", "Next.png", "next", 1);
pO "<a href=\"$__ME?detail=$d\">$d</a>";
pO "</td></tr></table>";
@@ -1107,13 +1101,13 @@ FHEMWEB_zoomLink($$$$)
my ($d,$off) = split("=", $cmd, 2);
return if($__plotmode eq "gnuplot");
return if($__plotmode eq "gnuplot"); # No scrolling
return if($__devs{$d} && $__devs{$d}{ATTR}{fixedrange});
return if($__devs{$d} && $__devs{$d}{ATTR}{noscroll});
my $val = $__wlpos{$d};
my $val = $__pos{$d};
$cmd = "room=$__room&amp;wlpos=";
$cmd = "room=$__room&amp;pos=";
if($d eq "zoom") {
$val = "day" if(!$val);
@@ -1121,21 +1115,34 @@ FHEMWEB_zoomLink($$$$)
return if(!defined($val) || $val+$off < 0 || $val+$off >= int(@__zoom) );
$val = $__zoom[$val+$off];
return if(!$val);
$cmd .= "zoom=$val";
# Approximation of the next offset.
my $w_off = $__pos{off};
$w_off = 0 if(!$w_off);
if($val eq "qday") {
$w_off = $w_off*4;
} elsif($val eq "day") {
$w_off = ($off < 0) ? $w_off*7 : int($w_off/4);
} elsif($val eq "week") {
$w_off = ($off < 0) ? $w_off*4 : int($w_off/7);
} elsif($val eq "month") {
$w_off = ($off < 0) ? $w_off*12: int($w_off/4);
} elsif($val eq "year") {
$w_off = int($w_off/12);
}
$cmd .= "zoom=$val;off=$w_off";
} else {
return if((!$val && $off > 0) || ($val && $val+$off > 0)); # no future
$__wlpos{$d}=($val ? $val+$off : $off);
$cmd .= join(";", map { "$_=$__wlpos{$_}" } sort keys %__wlpos);
$off=($val ? $val+$off : $off);
my $zoom=$__pos{zoom};
$zoom = 0 if(!$zoom);
$cmd .= "zoom=$zoom;off=$off";
if(!defined($val)) {
delete $__wlpos{$d};
} else {
$__wlpos{$d} = $val;
}
}
pO "<a href=\"$__ME?$cmd\">";
pO "<img style=\"border-color:transparent\" alt=\"$alt\" ".
"src=\"$__ME/icons/$img\"/></a>";
@@ -1153,7 +1160,7 @@ FHEMWEB_calcWeblink($$)
return if($__plotmode eq "gnuplot");
my $now = time();
my $zoom = $__wlpos{zoom};
my $zoom = $__pos{zoom};
$zoom = "day" if(!$zoom);
if(!$d) {
@@ -1167,6 +1174,7 @@ FHEMWEB_calcWeblink($$)
return;
}
return if(!$__devs{$wl});
return if($__devs{$wl} && $__devs{$wl}{ATTR}{noscroll});
@@ -1177,11 +1185,21 @@ FHEMWEB_calcWeblink($$)
return;
}
my $off = $__wlpos{$d};
my $off = $__pos{$d};
$off = 0 if(!$off);
$off += $__wlpos{all} if($__wlpos{all});
$off += $__pos{off} if($__pos{off});
if($zoom eq "day") {
if($zoom eq "qday") {
my $t = $now + $off*21600;
my @l = localtime($t);
$l[2] = int($l[2]/6)*6;
$__devs{$d}{from}
= sprintf("%04d-%02d-%02d_%02d",$l[5]+1900,$l[4]+1,$l[3],$l[2]);
$__devs{$d}{to}
= sprintf("%04d-%02d-%02d_%02d",$l[5]+1900,$l[4]+1,$l[3],$l[2]+6);
} elsif($zoom eq "day") {
my $t = $now + $off*86400;
my @l = localtime($t);

8
webfrontend/pgm2/98_SVG.pm
View File

@@ -27,7 +27,7 @@ SVG_render($$$$$$$)
my ($ow,$oh) = split(",", $wh); # Original width
my $th = 16; # "Font" height
my ($x, $y) = (3*$th, 1.5*$th); # Rect offset
my ($x, $y) = (3*$th, 1.2*$th); # Rect offset
my ($w, $h) = ($ow-2*$x, $oh-2*$y); # Rect size
my %conf; # gnuplot file settings
@@ -108,7 +108,6 @@ SVG_render($$$$$$$)
push @{$dyp}, $v;
$min = $v if($min > $v);
$max = $v if($max < $v);
}
}
@@ -135,7 +134,9 @@ SVG_render($$$$$$$)
# Compute & draw vertical tics, grid and labels
my $ddur = ($tosec-$fromsec)/86400;
my ($first_tag, $tag, $step, $tstep, $aligntext, $aligntics);
if($ddur <= 1) {
if($ddur <= 0.5) {
$first_tag=". 2 1"; $tag=": 3 4"; $step = 3600; $tstep = 900;
} elsif($ddur <= 1) {
$first_tag=". 2 1"; $tag=": 3 4"; $step = 4*3600; $tstep = 3600;
} elsif ($ddur <= 7) {
$first_tag=". 6"; $tag=". 2 1"; $step = 24*3600; $tstep = 6*3600;
@@ -286,7 +287,6 @@ SVG_render($$$$$$$)
pO "<polyline points=\"$ret\" class=\"l$idx\"/>\n";
} elsif($type[$idx] eq "histeps" ) {
if(@{$dxp} == 1) {
my $y1 = $y+$h-($dyp->[0]-$min)*$hmul;
$ret .= sprintf(" %d,%d %d,%d %d,%d %d,%d",

2
webfrontend/pgm2/fht.gplot
View File

@@ -14,7 +14,7 @@ set y2tics
set title '<TL>'
set grid xtics y2tics
set y2label "temperature (Celsius)"
set y2label "Temperature in C<>"
set ylabel "Actuator (%)"
#FileLog 4:measured:0:

34
webfrontend/pgm2/svg_style.css
View File

@@ -1,15 +1,19 @@
text { font-family:Times; font-size:12px; }
text.title { font-size:16px; }
rect.border { stroke:black; stroke-width:1px; fill:none; }
polyline { stroke:black; stroke-width:1px; fill:none; }
.vgrid { stroke-dasharray:2,6; stroke:gray; }
.hgrid { stroke-dasharray:2,6; stroke:gray; }
.l0 { stroke:red; } text.l0 { stroke:none; fill:red; }
.l1 { stroke:green; } text.l1 { stroke:none; fill:green; }
.l2 { stroke:blue; } text.l2 { stroke:none; fill:blue; }
.l3 { stroke:magenta; } text.l3 { stroke:none; fill:magenta; }
.l4 { stroke:cyan; } text.l4 { stroke:none; fill:cyan; }
text { font-family:Times; font-size:12px; }
text.title { font-size:16px; }
rect.border { stroke:black; stroke-width:1px; fill:none; }
polyline { stroke:black; stroke-width:1px; fill:none; }
.vgrid { stroke-dasharray:2,6; stroke:gray; }
.hgrid { stroke-dasharray:2,6; stroke:gray; }
.l0 { stroke:red; } text.l0 { stroke:none; fill:red; }
.l1 { stroke:green; } text.l1 { stroke:none; fill:green; }
.l2 { stroke:blue; } text.l2 { stroke:none; fill:blue; }
.l3 { stroke:magenta; } text.l3 { stroke:none; fill:magenta; }
.l4 { stroke:cyan; } text.l4 { stroke:none; fill:cyan; }
.l5 { stroke:black; } text.l5 { stroke:none; fill:black; }
.l6 { stroke:olive; } text.l6 { stroke:none; fill:olive; }
.l7 { stroke:gray; } text.l7 { stroke:none; fill:gray; }
.l8 { stroke:yellow; } text.l8 { stroke:none; fill:yellow; }