[Swift-commit] r8250 - in usertools/plotter: . src/plotter

[wozniak at ci.uchicago.edu]

Author: wozniak
Date: 2014-09-18 11:54:20 -0500 (Thu, 18 Sep 2014)
New Revision: 8250

Modified:
   usertools/plotter/README.txt
   usertools/plotter/src/plotter/Lines.java
Log:
Support Log and Logarithmic


Modified: usertools/plotter/README.txt
===================================================================
--- usertools/plotter/README.txt	2014-09-15 15:12:54 UTC (rev 8249)
+++ usertools/plotter/README.txt	2014-09-18 16:54:20 UTC (rev 8250)
@@ -71,8 +71,10 @@
 Defaults to an auto-selection made by JFreeChart.
 +bw+:: If true, use black and white only.  Default: +false+.
 +legend.enabled+:: If true, show a legend.  Default: +true+.
-+axis.x,axis.y+:: May be +normal+, +logarithmic+, or +date+.  For +date+, provide date data as decimal milliseconds since the Unix Epoch.  Default: +normal+.
-Default: +normal+.
++axis.x,axis.y+:: May be +normal+, +logarithmic+ (tends to use
+scientific notation in labels), +log+, or +date+.  For +date+, provide
+date data as decimal milliseconds since the Unix Epoch.  Default:
++normal+.
 +label._filename_+:: Set the legend label for the data series from
 file +_filename_+.
 +shape._filename_+:: If +none+, use no shape for the data series from

Modified: usertools/plotter/src/plotter/Lines.java
===================================================================
--- usertools/plotter/src/plotter/Lines.java	2014-09-15 15:12:54 UTC (rev 8249)
+++ usertools/plotter/src/plotter/Lines.java	2014-09-18 16:54:20 UTC (rev 8250)
@@ -320,9 +320,14 @@
   {
     if (axis_x_type.equals("logarithmic"))
     {
-      NumberAxis domainAxis = new LogarithmicAxis(xlabel);
+      ValueAxis domainAxis = new LogarithmicAxis(xlabel);
       plot.setDomainAxis(domainAxis);
     }
+    else if (axis_x_type.equals("log"))
+    {
+      ValueAxis domainAxis = new LogAxis(xlabel);
+      plot.setDomainAxis(domainAxis);
+    }
     else if (axis_x_type.equals("date"))
     {
       DateAxis domainAxis = new DateAxis();
@@ -334,6 +339,12 @@
 
     if (axis_y_type.equals("logarithmic"))
     {
+      //
+      ValueAxis rangeAxis = new LogarithmicAxis(ylabel);
+      plot.setRangeAxis(rangeAxis);
+    }
+    else if (axis_y_type.equals("log"))
+    {
       ValueAxis rangeAxis = new LogAxis(ylabel);
       plot.setRangeAxis(rangeAxis);
     }