Merge commit '2545d27aacfe57c8f26fccfd45e382fbf5c111ac'

[weathermon.git] / web / image_minmax.php

diff --git a/web/image_minmax.php b/web/image_minmax.php
index 3736221a4311b0941ef7f8bca6eb843a948c5db4..183942ba18f568a5699ed9201effad4292177670 100644 (file)
--- a/web/image_minmax.php
+++ b/web/image_minmax.php
@@ -84,18 +84,19 @@ if ($type and $param) {
     $next_year = $year;
     $next_month = $month+1;
 
     $next_year = $year;
     $next_month = $month+1;
 

-    if ($month==13) {
+    if ($month==12) {

     
       $next_year++;
       $next_month=1;
     
       $next_year++;
       $next_month=1;

-    
+

     }
 
     $curr = date("Ym");
     }
 
     $curr = date("Ym");

+    $ym=sprintf('%04d%02d',$next_year,$next_month);

     
     

-    if ($curr>$next_year.$next_month) {
+    if ($curr>$ym) {

     
     

-      $cachefilename='meteo.month.'.$sensor.'.'.$param.'.'.$year.'-'.$month.'.'.$img_format;
+      $cachefilename='meteo.month.'.$sensor.'.'.$param.'.'.$to_unit.'.'.$year.'-'.$month.'.'.$img_format;

     
     }
 
     
     }
 


@@ -197,6 +198,7 @@ if ($type and $param) {
   $g->SetScale('datlin');
   $g->xaxis->SetLabelAngle(90);
   $g->xaxis->SetPos("min");
   $g->SetScale('datlin');
   $g->xaxis->SetLabelAngle(90);
   $g->xaxis->SetPos("min");

+  $g->xaxis->scale->SetTimeAlign( MINADJ_1 );

 
   // We use a scatterplot to illustrate the original
   // contro points.
 
   // We use a scatterplot to illustrate the original
   // contro points.


@@ -204,14 +206,14 @@ if ($type and $param) {
   $bplot = new LinePlot($maxdata,$xdata);
   $g->Add($bplot);
   $bplot->SetColor($fill_color_top);
   $bplot = new LinePlot($maxdata,$xdata);
   $g->Add($bplot);
   $bplot->SetColor($fill_color_top);

-  $bplot->SetFillGradient($fill_color_top,$fill_color_bottom,100,TRUE);
+  $bplot->SetFillGradient($fill_color_top.'@0.2',$fill_color_bottom.'@0.9',100,TRUE);

   $bplot->SetFillFromYMin(TRUE);       
   $bplot->SetWeight(4);
 
   $aplot = new LinePlot($mindata,$xdata);
   $g->Add($aplot);
   $aplot->SetColor($fill_color_bottom);
   $bplot->SetFillFromYMin(TRUE);       
   $bplot->SetWeight(4);
 
   $aplot = new LinePlot($mindata,$xdata);
   $g->Add($aplot);
   $aplot->SetColor($fill_color_bottom);

-  $aplot->SetFillGradient($fill_color_bottom,'white',100,TRUE);
+  $aplot->SetFillGradient($fill_color_bottom.'@0.2','white@0.9',100,TRUE);

   $aplot->SetFillFromYMin(TRUE);       
   $aplot->SetWeight(4);
 
   $aplot->SetFillFromYMin(TRUE);       
   $aplot->SetWeight(4);
 


@@ -222,6 +224,11 @@ if ($type and $param) {
   $g->subtitle->SetColor('darkred');
   $g->SetMarginColor('silver');
 
   $g->subtitle->SetColor('darkred');
   $g->SetMarginColor('silver');
 

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

   // Add the plots to the graph and stroke
   $g->Stroke();
   
   // Add the plots to the graph and stroke
   $g->Stroke();