FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

- Now it is prossible to adjust the range of the Gnuplot-pictures of FHT in the config.php

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinhaas 2007-02-22 17:35:04 +00:00
parent 7214e1770a
commit ecfbdbd3c3
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/webfrontend/pgm3/CHANGED
View File

@ -104,4 +104,3 @@ Changelog
-- Bugfix: DEL Button for at-Jobs now works -- Bugfix: DEL Button for at-Jobs now works
-- Now you can use php4 OR php5 (php5 is recommended) -- Now you can use php4 OR php5 (php5 is recommended)
-- Feature: php-Pictures of FHT now inclusive "desired-temp" -- Feature: php-Pictures of FHT now inclusive "desired-temp"

4
fhem/webfrontend/pgm3/config.php
View File

@ -27,7 +27,7 @@
# this is only possible, if the webserver (e.g.wwwrun) has the rights ro write the # this is only possible, if the webserver (e.g.wwwrun) has the rights ro write the
# files from fh1000.pl. If you want that then run fhz1000.pl as wwwrun too. # files from fh1000.pl. If you want that then run fhz1000.pl as wwwrun too.
# if 'yes' then only the needed lines are in the logfiles, the rest will be deleted. # if 'yes' then only the needed lines are in the logfiles, the rest will be deleted.
$logrotate='no'; # yes/no default='no' $logrotate='yes'; # yes/no default='no'
## Kioskmode. Only show but don't switch anything. Values: on/off ## Kioskmode. Only show but don't switch anything. Values: on/off
@ -70,6 +70,8 @@
$imgmaxxfht=450; #Size of the pictures Default: 450 for faster systems else 380 $imgmaxxfht=450; #Size of the pictures Default: 450 for faster systems else 380
$imgmaxyfht=52; $imgmaxyfht=52;
$show_desiredtemp=1; # show the desired_temp as a graphic (0/1) $show_desiredtemp=1; # show the desired_temp as a graphic (0/1)
$FHTyrange='15:31'; # Temperature in gnuplot. Default 15 to 31 (Celsius)
$FHTy2range='0:70'; # Actuator in gnuplot. Default 0 to 70 (Percent)
$logrotateFHTlines=4300; # automatic Logrotate; $logrotate must be 'yes'. $logrotateFHTlines=4300; # automatic Logrotate; $logrotate must be 'yes'.
# Default:4300 # Default:4300
# read docs/logrotate if you want adjust it manually! # read docs/logrotate if you want adjust it manually!

6
fhem/webfrontend/pgm3/include/gnuplot.php
View File

@ -6,7 +6,7 @@
################ ################
function drawgnuplot($gnudraw,$gnutyp,$gnuplot,$pictype,$logpath) function drawgnuplot($gnudraw,$gnutyp,$gnuplot,$pictype,$logpath,$FHTyrange,$FHTy2range)
{ {
$IN="$gnudraw ($gnutyp)"; $IN="$gnudraw ($gnutyp)";
@ -55,10 +55,10 @@ EOD;
Case FHT: ############################################ Case FHT: ############################################
$gplotmain=" $gplotmain="
set ylabel 'Temperature (Celsius)' set ylabel 'Temperature (Celsius)'
set yrange [15:31] set yrange [$FHTyrange]
set grid ytics set grid ytics
set y2label 'Actuator (%)' set y2label 'Actuator (%)'
set y2range [0:70] set y2range [$FHTy2range]
"; ";
$gplotmaintmp = <<<EOD $gplotmaintmp = <<<EOD

10
fhem/webfrontend/pgm3/index.php
View File

@ -39,7 +39,7 @@ include "config.php";
include "include/gnuplot.php"; include "include/gnuplot.php";
$pgm3version='0.7.1'; $pgm3version='0.7.2cvs';
$Action = $_POST['Action']; $Action = $_POST['Action'];
@ -562,7 +562,7 @@ xml_parser_free($xml_parser);
if ($showfht==$FHTdev and $showgnuplot == 1) if ($showfht==$FHTdev and $showgnuplot == 1)
{ {
drawgnuplot($FHTdev,"FHT",$gnuplot,$pictype,$logpath); drawgnuplot($FHTdev,"FHT",$gnuplot,$pictype,$logpath, $FHTyrange,$FHTy2range);
$FHTdev1=$FHTdev.'1'; $FHTdev1=$FHTdev.'1';
echo "<tr><td colspan=5 align=center><img src='tmp/$FHTdev.$pictype'><br> echo "<tr><td colspan=5 align=center><img src='tmp/$FHTdev.$pictype'><br>
<img src='tmp/$FHTdev1.$pictype'> <img src='tmp/$FHTdev1.$pictype'>
@ -622,7 +622,7 @@ xml_parser_free($xml_parser);
<td $bg2 colspan=2><img src='include/hms100.php?drawhms=$HMSdev&room=$room&type=$type' width='$imgmaxxhms' height='$imgmaxyhms'></td> </tr>"; <td $bg2 colspan=2><img src='include/hms100.php?drawhms=$HMSdev&room=$room&type=$type' width='$imgmaxxhms' height='$imgmaxyhms'></td> </tr>";
if ($showhmsgnu == $HMSdev and $showgnuplot == 1) if ($showhmsgnu == $HMSdev and $showgnuplot == 1)
{ drawgnuplot($HMSdev,$type,$gnuplot,$pictype,$logpath); { drawgnuplot($HMSdev,$type,$gnuplot,$pictype,$logpath,0,0);
$HMSdev1=$HMSdev.'1'; $HMSdev1=$HMSdev.'1';
echo "<tr><td colspan=5 align=center><img src='tmp/$HMSdev.$pictype'><br> echo "<tr><td colspan=5 align=center><img src='tmp/$HMSdev.$pictype'><br>
<img src='tmp/$HMSdev1.$pictype'> <img src='tmp/$HMSdev1.$pictype'>
@ -689,8 +689,8 @@ xml_parser_free($xml_parser);
echo "</td></tr>"; echo "</td></tr>";
if (($showks == $KSdev) and $showgnuplot=='1') if (($showks == $KSdev) and $showgnuplot=='1')
{ {
if ($kstyp=="1")drawgnuplot($KSdev,"KS300_t1",$gnuplot,$pictype,$logpath); if ($kstyp=="1")drawgnuplot($KSdev,"KS300_t1",$gnuplot,$pictype,$logpath,0,0);
else drawgnuplot($KSdev,"KS300_t2",$gnuplot,$pictype,$logpath); else drawgnuplot($KSdev,"KS300_t2",$gnuplot,$pictype,$logpath,0,0);
$KSdev1=$KSdev.'1'; $KSdev1=$KSdev.'1';
echo "<tr><td colspan=5 align=center><img src='tmp/$KSdev.$pictype'><br> echo "<tr><td colspan=5 align=center><img src='tmp/$KSdev.$pictype'><br>
<img src='tmp/$KSdev1.$pictype'> <img src='tmp/$KSdev1.$pictype'>