Переход на mosquitto

[weathermon.git] / web / image.php

diff --git a/web/image.php b/web/image.php
index 16fbafb89f28de2b801b3c34d77564875159cf43..9b6ca84e3209b5de7b07c08e83b292488f16dc2c 100644 (file)
--- a/web/image.php
+++ b/web/image.php
@@ -1,6 +1,6 @@
 <?php // content="text/plain; charset=utf-8"
 
 <?php // content="text/plain; charset=utf-8"
 

-error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE);
+error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE & ~E_DEPRECATED);

 
 include ('config_local.php');
 
 
 include ('config_local.php');
 


@@ -12,7 +12,7 @@ require_once ('jpgraph/jpgraph_regstat.php');
 
 if (! ($db = new PDO("mysql:host=$mysql_host;port=$mysql_port;dbname=$mysql_schema",$mysql_user,$mysql_pwd,array( PDO::ATTR_PERSISTENT => false)))) {
 
 
 if (! ($db = new PDO("mysql:host=$mysql_host;port=$mysql_port;dbname=$mysql_schema",$mysql_user,$mysql_pwd,array( PDO::ATTR_PERSISTENT => false)))) {
 

-  die('Не могу подключиться к БД');
+  die('Ð\9dе могу подключитьÑ\81Ñ\8f к БД');

 
 }  
 
 
 }  
 


@@ -65,12 +65,13 @@ if ($type and $param) {
   }  
 
   $q = $db -> prepare(
   }  
 
   $q = $db -> prepare(

-    'select u.name_short from units u where u.id='.$to_unit
+    'select u.name_short,u.prec from units u where u.id='.$to_unit

   );
   $q -> execute();
 
   while ($row = $q -> fetch(PDO::FETCH_ASSOC)) {
     $param_unit = $row['name_short'];
   );
   $q -> execute();
 
   while ($row = $q -> fetch(PDO::FETCH_ASSOC)) {
     $param_unit = $row['name_short'];

+    $precision = $row['prec'];

   }                                                                
   
   $xdata = array();
   }                                                                
   
   $xdata = array();


@@ -198,18 +199,24 @@ if ($type and $param) {
     $g->xaxis->HideLabels(True);
   }
   $g->xaxis->SetPos("min");
     $g->xaxis->HideLabels(True);
   }
   $g->xaxis->SetPos("min");

+  $g->yaxis->SetLabelFormat("%0.".$precision."f");

 #  $g->xaxis->scale->SetTimeAlign( HOURADJ_1 );
 
 #  $g->xaxis->scale->SetTimeAlign( HOURADJ_1 );
 

-  // We use a scatterplot to illustrate the original
-  // contro points.
-  $splot = new ScatterPlot($ydata,$xdata);
-  $g->Add($splot);

 
 

-  // 
-  $splot->mark->SetFillColor($dot_color);
-  $splot->mark->SetColor($dot_color);
-  $splot->mark->SetType(MARK_FILLEDCIRCLE);
-  $splot->mark->SetSize(2);
+  if ($type!="last24small") {
+
+    // We use a scatterplot to illustrate the original
+    // contro points.
+    $splot = new ScatterPlot($ydata,$xdata);
+    $g->Add($splot);
+
+    // 
+    $splot->mark->SetFillColor($dot_color);
+    $splot->mark->SetColor($dot_color);
+    $splot->mark->SetType(MARK_FILLEDCIRCLE);
+    $splot->mark->SetSize(2);
+
+  }

 
   $fplot = new LinePlot($f_ydata,$xdata);
   $g->Add($fplot);
 
   $fplot = new LinePlot($f_ydata,$xdata);
   $g->Add($fplot);


@@ -234,7 +241,7 @@ if ($type and $param) {
 } else {
 
   header("Content-Type: text/html; charset=UTF-8");
 } else {
 
   header("Content-Type: text/html; charset=UTF-8");

-  die('СенÑ\81оÑ\80 не вÑ\8bбÑ\80ан!');
+  die('Ã\90¡Ã\90µÃ\90½Ã\91Â\81Ã\90¾Ã\91â\82¬ Ã\90½Ã\90µ Ã\90²Ã\91â\80¹Ã\90±Ã\91â\82¬Ã\90°Ã\90½!');

 
 }  
 
 
 }