Changeset 85

Timestamp:

06/01/07 02:27:19 (5 years ago)

Author:

nigel

Message:

Introduced X labels as defined by key values

File:

• openweather/graph.php (modified) (4 diffs)

openweather/graph.php

@@ -278 +278 @@
   //print "set $set<BR>";
   //expand_pre($this->calculated['y_plot']);
-
-  foreach ($this->x_data as $index => $x) {
-    
+  $index = -1;
+  foreach ($this->x_data as $x) {
+    $index++;
     
     //print "index $index<BR>";
@@ -722 +722 @@
 
     // calculate y coords for plotting data
-    foreach ($this->x_data as $index => $x) {
+    $index = -1;
+    foreach ($this->x_data as $x) {
+      $index++;
       $this->calculated['y_plot'][$set][$index] = $this->y_data[$set][$index];
 
@@ -1060 +1062 @@
       $data = $this->x_data;
       for ($i=0; $i < $this->calculated['x_axis']['num_ticks']; $i++) {
+        $key = key($data);
         $value = array_shift($data); // grab value from begin of array
+        if (is_numeric($key)) $key = $value;
         $this->calculated['x_axis']['data'][$i]  = $value;
-        $this->calculated['x_axis']['text'][$i]  = $value; // raw data and text are both the same in this case
+        $this->calculated['x_axis']['text'][$i]  = $key; // raw data and text are both the same in this case
         $size = $this->get_boundaryBox(
           array('points' => $axis_size,
@@ -1068 +1072 @@
                 'angle'  => $axis_angle,
                 'colour' => $axis_colour,
-                'text'   => $value));
+                'text'   => $key));
         $this->calculated['x_axis']['boundary_box'][$i] = $size;
         if ($size['height'] > $this->calculated['x_axis']['boundary_box_max']['height'])