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

-- Bugfix: FHT-View with the current CVS-FHEM was broken

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@155 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinhaas
2008-03-24 20:02:25 +00:00
parent 5d60cc4e09
commit d247be1b0c
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/webfrontend/pgm3/CHANGED
View File

@@ -169,3 +169,6 @@ It is not necessary to tell fhem that there are other logs.
2007-12-24 (071224) 2007-12-24 (071224)
-- Bugfix: UserDef with type "temperature" now with y1tics ==> gnuplot.php -- Bugfix: UserDef with type "temperature" now with y1tics ==> gnuplot.php
-- Feature: Webcam/Pics now hideable ==> index.php, config.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

3
fhem/webfrontend/pgm3/HISTORY
View File

@@ -69,3 +69,6 @@
- Martin 2007-12-24 - Martin 2007-12-24
-- Bugfix: Userdef-Gnuplot with type temperature now with y1tics -- Bugfix: Userdef-Gnuplot with type temperature now with y1tics
-- Feature: Webcam/Pics hideable -- Feature: Webcam/Pics hideable
- Martin 2008-03-24
-- Bugfix: FHT-View with the current CVS-FHEM was broken

31
fhem/webfrontend/pgm3/include/fht.php
View File

@@ -91,25 +91,6 @@ setlocale (LC_ALL, 'de_DE.utf8');
$resultreverse = array_reverse($_SESSION["arraydata"]); $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); $im = ImageCreateTrueColor($imgmaxxfht,$imgmaxyfht);
$black = ImageColorAllocate($im, 0, 0, 0); $black = ImageColorAllocate($im, 0, 0, 0);
$bg1p = ImageColorAllocate($im, 110,148,183); $bg1p = ImageColorAllocate($im, 110,148,183);
@@ -207,9 +188,17 @@ setlocale (LC_ALL, 'de_DE.utf8');
$text=$txtroom.$room; $text=$txtroom.$room;
ImageTTFText ($im, $fontsize, 0, 3, 49, $txtcolor, $fontttf, $text); 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);
# Time of desired-temp
$text=substr($desired_date,11,5);
ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-160-$XcorrectDate, 23, $txtcolor, $fontttf, $text);
ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-230-$XcorrectDate, 23, $txtcolor, $fontttf, $text);
$text="Actuator: $actuator"; $text="Actuator: $actuator";
ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-230-$XcorrectDate, 33, $txtcolor, $fontttf, $text); ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-230-$XcorrectDate, 33, $txtcolor, $fontttf, $text);

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

@@ -41,7 +41,7 @@ include "include/gnuplot.php";
include "include/functions.php"; include "include/functions.php";
$pgm3version='071224'; $pgm3version='080324';
$Action = $_POST['Action']; $Action = $_POST['Action'];
@@ -454,6 +454,7 @@ xml_parser_free($xml_parser);
<head> <head>
<meta http-equiv='refresh' content='$urlreload; URL=$forwardurl'> <meta http-equiv='refresh' content='$urlreload; URL=$forwardurl'>
<meta http-equiv='pragma' content='no-cache'> <meta http-equiv='pragma' content='no-cache'>
<meta http-equiv='expires' content='0'>
<meta http-equiv='Cache-Control' content='no-cache'> <meta http-equiv='Cache-Control' content='no-cache'>
<link rel='alternate' type='application/rss+xml' title='$RSStitel' href='index.php?showrss'> <link rel='alternate' type='application/rss+xml' title='$RSStitel' href='index.php?showrss'>
<link rel='shortcut icon' href='include/fs20.ico' > <link rel='shortcut icon' href='include/fs20.ico' >
@@ -510,6 +511,7 @@ xml_parser_free($xml_parser);
{ {
$webcamname=str_replace("/","",$webcam1); $webcamname=str_replace("/","",$webcam1);
$webcamname=str_replace(":","",$webcamname); $webcamname=str_replace(":","",$webcamname);
# $order="$wgetpath -O tmp/$webcamname $webcam1; /usr/bin/touch tmp/$webcamname";
$order="$wgetpath -O tmp/$webcamname $webcam1"; $order="$wgetpath -O tmp/$webcamname $webcam1";
exec($order,$res); exec($order,$res);
$errormessage = $res[0]; $errormessage = $res[0];