Добавлена корректная обработка падения процесса-поставщика данных (в моем случае...

[weathermon.git] / web / image.php

diff --git a/web/image.php b/web/image.php
index 0e513a1e2fe2ff39f73a28b1b8e7fc2929911e74..bf511f2d03bdf2dff3e66bf39dd6cfc437559498 100644 (file)
--- a/web/image.php
+++ b/web/image.php
@@ -82,7 +82,23 @@ if ($type and $param) {
       'select unix_timestamp(timestamp) as x,unitconv(value,'.$from_unit.','.$to_unit.') as y from sensor_values where timestamp>adddate(now(), -1) and sensor_id='.$sensor.' and parameter_id='.$param.' order by timestamp'
     );
 
       'select unix_timestamp(timestamp) as x,unitconv(value,'.$from_unit.','.$to_unit.') as y from sensor_values where timestamp>adddate(now(), -1) and sensor_id='.$sensor.' and parameter_id='.$param.' order by timestamp'
     );
 

-    $height = 130;
+    $bottomheight = 130;
+    $topheight = 40;
+    $sizex = 1000;
+    $sizey = 800;
+    $scale = True;
+    
+  } elseif ($type == 'last24small') {
+
+    $q = $db -> prepare(
+      'select unix_timestamp(timestamp) as x,unitconv(value,'.$from_unit.','.$to_unit.') as y from sensor_values where timestamp>adddate(now(), -1) and sensor_id='.$sensor.' and parameter_id='.$param.' order by timestamp'
+    );
+
+    $bottomheight = 20;
+    $topheight = 20;
+    $sizex = 400;
+    $sizey = 300;
+    $scale = False;

     
   } elseif ($type == 'range') {
 
     
   } elseif ($type == 'range') {
 


@@ -101,11 +117,15 @@ if ($type and $param) {
       'select unix_timestamp(timestamp) as x,unitconv(value,'.$from_unit.','.$to_unit.') as y from sensor_values where timestamp>=str_to_date("'.$from.'","%Y%m%d%H%i%s") and timestamp<=str_to_date("'.$to.'","%Y%m%d%H%i%s") and sensor_id='.$sensor.' and parameter_id='.$param.' order by timestamp'
     );
   
       'select unix_timestamp(timestamp) as x,unitconv(value,'.$from_unit.','.$to_unit.') as y from sensor_values where timestamp>=str_to_date("'.$from.'","%Y%m%d%H%i%s") and timestamp<=str_to_date("'.$to.'","%Y%m%d%H%i%s") and sensor_id='.$sensor.' and parameter_id='.$param.' order by timestamp'
     );
   

-    $height = 60;
+    $bottomheight = 60;
+    $topheight = 40;
+    $sizex = 1000;
+    $sizey = 800;
+    $scale = True;

   
   }
 
   
   }
 

-  $g = new Graph(640,480);
+  $g = new Graph($sizex,$sizey);

   
   if ($cachefilename) {
       if ($g->cache->IsValid($cachefilename)) {
   
   if ($cachefilename) {
       if ($g->cache->IsValid($cachefilename)) {


@@ -172,30 +192,41 @@ if ($type and $param) {
   // We need a datlin scale since we provide both
   // x and y coordinates for the data points, but x is unix timestamp.
   $g->SetScale('datlin');
   // We need a datlin scale since we provide both
   // x and y coordinates for the data points, but x is unix timestamp.
   $g->SetScale('datlin');

-  $g->xaxis->SetLabelAngle(90);
+  if ($scale) {
+    $g->xaxis->SetLabelAngle(90);
+  } else {
+    $g->xaxis->HideLabels(True);
+  }

   $g->xaxis->SetPos("min");
   $g->xaxis->SetPos("min");

-  $g->xaxis->scale->SetTimeAlign( HOURADJ_1 );
+#  $g->xaxis->scale->SetTimeAlign( HOURADJ_1 );
+
+
+  if ($type!="last24small") {

 
 

-  // We use a scatterplot to illustrate the original
-  // contro points.
-  $splot = new ScatterPlot($ydata,$xdata);
-  $g->Add($splot);
+    // 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);
+    // 
+    $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->SetColor($line_color);
   $fplot->SetWeight(2);
 
 
   $fplot = new LinePlot($f_ydata,$xdata);
   $g->Add($fplot);
   $fplot->SetColor($line_color);
   $fplot->SetWeight(2);
 

-  $g->SetMargin(50,30,40,$height);
-  $g->title->Set($sensor_name.'/'.$param_name.', '.$param_unit);
-  $g->title->SetFont(FF_DV_SANSSERIF,FS_BOLD,12);
-  $g->SetMarginColor('silver');
+  $g->SetMargin(50,30,$topheight,$bottomheight);
+  if ($scale) {
+    $g->title->Set($sensor_name.'/'.$param_name.', '.$param_unit);
+    $g->title->SetFont(FF_DV_SANSSERIF,FS_BOLD,12);
+  }  
+  $g->SetMarginColor('lightgray');

 
   $g->xgrid->Show();
   $g->xgrid->SetLineStyle('dotted');
 
   $g->xgrid->Show();
   $g->xgrid->SetLineStyle('dotted');