Changeset 87

Timestamp:

06/01/07 16:59:30 (5 years ago)

Author:

nigel

Message:

Added the four graph types and auto scaling

File:

• openweather/openweather.module (modified) (4 diffs)

openweather/openweather.module

@@ -37 +37 @@
   if ($op == 'create') {
     return user_access('create weather station');
-  } else {
-    print "<p>$op $node</p>";
   }
 }
@@ -177 +175 @@
 
   //$output .= openweather_graph($res);
-  $output .= "<img src='?q=node/".$node->nid."/graph' />";
+  $output .= "<img src='?q=node/".$node->nid."/graph/temp_out' />";
+  $output .= "<img src='?q=node/".$node->nid."/graph/rel_hum_out' />";
+  $output .= "<img src='?q=node/".$node->nid."/graph/rel_pressure' />";
+  $output .= "<img src='?q=node/".$node->nid."/graph/windspeed' />";
 
   $node->links = $links;
@@ -321 +322 @@
   if ($user->uid) { 
     $node = node_load($nid);
-    watchdog('INFO', $node->type, WATCHDOG_WARNING);
     if ($node->type != 'openweather')
         return false;
@@ -340 +340 @@
   $type = arg(3);
   $node = node_load($nid);
-
-  if ($type == null) $type = 'temp_in';
-
-  $r = db_query("SELECT `time`, $type FROM {openweather_readings} WHERE nid = $nid AND `time` >= ".(time() - (60*60*24)) . " ORDER BY `time`" );
+  $title = '';
+  $units = '';
+  $autoScale = false;
+
+  switch ($type){
+  case null:
+  case 'temp_out':
+    $type = 'temp_out';
+    $title = t("Outdoor temperature");
+    $autoScale = true;
+    $units = 'deg C';
+    break;
+  
+  case 'rel_pressure':
+    $title = t("Relative pressure");
+    $autoScale = true;
+    break;
+  
+  case 'rel_hum_out':
+    $title = t("Outdoor relative humidity");
+    $autoScale = true;
+    $units = '%';
+    break;
+
+  case 'windspeed':
+    $title = t("Windspeed");
+    $autoScale = false;
+    $units = 'kMh';
+    break;
+
+  default:
+    return;
+  }
+
+  $r = db_query("SELECT time(`time`) AS `timevalue`, unix_timestamp(`time`) as `timestamp`, $type FROM {openweather_readings} WHERE nid = $nid AND `time` >= ".(time() - (60*60*24)) . " ORDER BY `time`" );
 
   #$results = openweather_get_values($node);
-  drupal_set_header('Content-Type: image/png');
+//  drupal_set_header('Content-Type: image/png');
   include 'graph.php';
   $g = new graph(400, 240);
   $g->parameter['path_to_fonts'] = 'modules/openweather/fonts/';
-  $g->parameter['title'] = $type;
+  $g->parameter['title'] = $title;
   $g->parameter['x_label'] = 'Date';
-  $g->parameter['y_label'] = '';
+  $g->parameter['y_label'] = $units;
+
+  $g->parameter['x_axis_text'] = 12;
 
   $g->x_data = array();
   $g->y_data = array( $type=>array() );
-  while ($e = db_fetch_array($r)) {
-    $g->x_data = array_merge($g->x_data, array($e[0]=>$e[0]));
-    $g->y_data[$type][] = $e[1];
-  }
+  $minY = null;
+  while ($e = db_fetch_object($r)) {
+    $g->x_data = array_merge($g->x_data, array($e->timevalue=>$e->timestamp));
+    $g->y_data[$type][] = $e->$type;
+    if ($minY == null || $e->$type < $minY) $minY = $e->$type;
+  }
+
+  $g->y_format[$type] = array('colour'=>'red', 'line'=>'brush', 'brush_size'=>2);
+  $g->y_order = array($type);
+
+  if ($autoScale) $g->parameter['y_min_left'] = $minY;
+  
   $g->draw();
 }