diff --git a/fhem/webfrontend/pgm3/CHANGED b/fhem/webfrontend/pgm3/CHANGED index 4266d8a14..8badb0813 100644 --- a/fhem/webfrontend/pgm3/CHANGED +++ b/fhem/webfrontend/pgm3/CHANGED @@ -169,3 +169,6 @@ It is not necessary to tell fhem that there are other logs. 2007-12-24 (071224) -- Bugfix: UserDef with type "temperature" now with y1tics ==> gnuplot.php -- Feature: Webcam/Pics now hideable ==> index.php, config.php + +2008-03-24 + -- Bugfix: FHT-View with the current CVS-FHEM was broken: Small changes in include/fht.php diff --git a/fhem/webfrontend/pgm3/HISTORY b/fhem/webfrontend/pgm3/HISTORY index 7b2582261..ca4db02db 100644 --- a/fhem/webfrontend/pgm3/HISTORY +++ b/fhem/webfrontend/pgm3/HISTORY @@ -69,3 +69,6 @@ - Martin 2007-12-24 -- Bugfix: Userdef-Gnuplot with type temperature now with y1tics -- Feature: Webcam/Pics hideable + +- Martin 2008-03-24 + -- Bugfix: FHT-View with the current CVS-FHEM was broken diff --git a/fhem/webfrontend/pgm3/include/fht.php b/fhem/webfrontend/pgm3/include/fht.php index f007344bb..535069c14 100755 --- a/fhem/webfrontend/pgm3/include/fht.php +++ b/fhem/webfrontend/pgm3/include/fht.php @@ -91,25 +91,6 @@ setlocale (LC_ALL, 'de_DE.utf8'); $resultreverse = array_reverse($_SESSION["arraydata"]); - #if the expected graphic already exist then do not redraw the picture - -# $savefile=$AbsolutPath."/tmp/FHT.".$drawfht.".log.".$resultreverse[0][0].".png"; -# if (file_exists($savefile)) { -# -# $im2 = @ImageCreateFromPNG($savefile); -# header("Content-type: image/png"); -# imagePng($im2); -# exit; # ;-))) -# } -# else #delete old pngs -# { -# $delfile=$AbsolutPath."/tmp/FHT.".$drawfht.".log.*.png"; -# foreach (glob($delfile) as $filename) { - # unlink($filename); -# } -# } - - $im = ImageCreateTrueColor($imgmaxxfht,$imgmaxyfht); $black = ImageColorAllocate($im, 0, 0, 0); $bg1p = ImageColorAllocate($im, 110,148,183); @@ -207,10 +188,18 @@ setlocale (LC_ALL, 'de_DE.utf8'); $text=$txtroom.$room; ImageTTFText ($im, $fontsize, 0, 3, 49, $txtcolor, $fontttf, $text); - $text="desired: $desired_temp ".substr($desired_date,11,5); + $text="desired: $desired_temp"; - ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-230-$XcorrectDate, 23, $txtcolor, $fontttf, $text); - + ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-230-$XcorrectDate, 23, $txtcolor, $fontttf, $text); + + # Time of desired-temp + $text=substr($desired_date,11,5); + ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-160-$XcorrectDate, 23, $txtcolor, $fontttf, $text); + + + + + $text="Actuator: $actuator"; ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-230-$XcorrectDate, 33, $txtcolor, $fontttf, $text); diff --git a/fhem/webfrontend/pgm3/index.php b/fhem/webfrontend/pgm3/index.php index 490edfa79..5781e5942 100644 --- a/fhem/webfrontend/pgm3/index.php +++ b/fhem/webfrontend/pgm3/index.php @@ -41,7 +41,7 @@ include "include/gnuplot.php"; include "include/functions.php"; -$pgm3version='071224'; +$pgm3version='080324'; $Action = $_POST['Action']; @@ -454,6 +454,7 @@ xml_parser_free($xml_parser); + @@ -510,6 +511,7 @@ xml_parser_free($xml_parser); { $webcamname=str_replace("/","",$webcam1); $webcamname=str_replace(":","",$webcamname); +# $order="$wgetpath -O tmp/$webcamname $webcam1; /usr/bin/touch tmp/$webcamname"; $order="$wgetpath -O tmp/$webcamname $webcam1"; exec($order,$res); $errormessage = $res[0];