Final fixes for version 2.23

CHANGES.txt

@@ -1,3 +1,11 @@
+Version 2.23 (22/06/2016)
+------------
+- Added date/time axis.
+- Added callback function support to logarithmic axis.
+- Added exception_throw option to disable catching exceptions.
+- Fixed axis callback functions not working with associative data.
+- Fixed legend display for line graphs when marker size is 0.
+
 Version 2.22 (05/05/2016)
 ------------
 - Added support for legend entries from structured data.

README.txt

@@ -1,4 +1,4 @@
-SVGGraph Library version 2.22
+SVGGraph Library version 2.23
 =============================
 
 This library provides PHP classes and functions for easily creating SVG

SVGGraph.php

@@ -19,7 +19,7 @@
  * For more information, please contact <graham@goat1000.com>
  */
 
-define('SVGGRAPH_VERSION', 'SVGGraph 2.22');
+define('SVGGRAPH_VERSION', 'SVGGraph 2.23');
 
 require_once 'SVGGraphColours.php';
 

SVGGraphAxisDateTime.php

@@ -134,6 +134,11 @@ public function __construct($length, $max_val, $min_val, $min_space,
     $start_date = new DateTime('@' . $min_val);
     $end_date = new DateTime('@' . $max_val);
 
+    // set the week start day before finding divisions
+    if(isset($options['datetime_week_start']) &&
+      isset(AxisDateTime::$weekdays[$options['datetime_week_start']]))
+      AxisDateTime::$week_start = $options['datetime_week_start'];
+
     if(!empty($fixed_division)) {
       list($units, $count) = AxisDateTime::ParseFixedDivisions($fixed_division,
         $min_val, $max_val, $length);
@@ -154,10 +159,6 @@ public function __construct($length, $max_val, $min_val, $min_space,
       }
 
     } else {
-      // set the week start day before finding divisions
-      if(isset($options['datetime_week_start']) &&
-        isset(AxisDateTime::$weekdays[$options['datetime_week_start']]))
-        AxisDateTime::$week_start = $options['datetime_week_start'];
 
       // find a sensible division
       $div = AxisDateTime::FindDivision($start_date, $end_date, $length,
@@ -204,7 +205,7 @@ private static function FindDivision($start, $end, $length, $min_space,
   {
     $max_divisions = floor($length / $min_space);
     $duration_s = $end->format('U') - $start->format('U');
-    $avg_duration = (int)ceil($duration_s / $max_divisions);
+    $avg_duration = ceil($duration_s / $max_divisions);
 
     $choice = NULL;
     $divisions = 1;
@@ -224,7 +225,7 @@ private static function FindDivision($start, $end, $length, $min_space,
       $div_duration = $d[1] * AxisDateTime::$unit_sizes[$d[0]];
 
       if($div_duration >= $avg_duration) {
-        $divisions = (int)floor($duration_s / $div_duration);
+        $divisions = floor($duration_s / $div_duration);
         $unit = $d[0];
         $nunits = $d[1];
 
@@ -391,11 +392,8 @@ private static function EndTime($time, $unit, $n, $start)
           $seconds = $seconds - ($seconds % $n) + $n - 1;
           $datetime = clone $start;
           $datetime->modify("+{$seconds} second");
-        } else {
-          $s = $datetime->format('s');
-          $newtime = $datetime->format(sprintf('H:i:%02d', $s));
-          $datetime->modify($newtime);
         }
+        // if $n == 1, no modifications are required
         break;
       }
     }

SVGGraphAxisFixedDoubleEnded.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (C) 2013-2015 Graham Breach
+ * Copyright (C) 2013-2016 Graham Breach
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by