added logarithmic axes

6a457128 · Tim Molter · 979461e5 · 6a457128 · 6a457128 · 6a457128
Commit 6a457128 authored 12 years ago by Tim Molter
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/XChartDemo.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/XChartDemo.java
@@ -48,6 +48,7 @@ import com.xeiam.xchart.demo.charts.line.LineChart09;
 import com.xeiam.xchart.demo.charts.line.LineChart10;
 import com.xeiam.xchart.demo.charts.line.LineChart11;
 import com.xeiam.xchart.demo.charts.scatter.ScatterChart01;
+import com.xeiam.xchart.demo.charts.scatter.ScatterChart02;

 /**
 * Class containing all XChart example charts
@@ -173,6 +174,8 @@ public class XChartDemo extends JPanel implements TreeSelectionListener {

    chart = new DefaultMutableTreeNode(new ChartInfo("ScatterChart01 - Gaussian Blob", new ScatterChart01().getChart()));
    category.add(chart);
+    chart = new DefaultMutableTreeNode(new ChartInfo("ScatterChart02 - Logarithmic Data", new ScatterChart02().getChart()));
+    category.add(chart);

    // Area category
    category = new DefaultMutableTreeNode("Area Charts");

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/ExampleChart.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/ExampleChart.java
@@ -19,12 +19,10 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package com.xeiam.xchart.demo.charts.line;
+package com.xeiam.xchart.demo.charts;

 import com.xeiam.xchart.Chart;

-/**
- */
 public interface ExampleChart {

  public Chart getChart();

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart01.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart01.java
@@ -18,7 +18,7 @@ package com.xeiam.xchart.demo.charts.area;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.line.ExampleChart;
+import com.xeiam.xchart.demo.charts.ExampleChart;
 import com.xeiam.xchart.style.StyleManager.ChartType;
 import com.xeiam.xchart.style.StyleManager.LegendPosition;


--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart01.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart01.java
@@ -24,7 +24,7 @@ package com.xeiam.xchart.demo.charts.bar;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.line.ExampleChart;
+import com.xeiam.xchart.demo.charts.ExampleChart;
 import com.xeiam.xchart.style.StyleManager.ChartType;
 import com.xeiam.xchart.style.StyleManager.LegendPosition;


--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart01.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart01.java
@@ -24,9 +24,9 @@ import java.util.Date;
 import java.util.Random;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.line.ExampleChart;
-import com.xeiam.xchart.style.Series;
+import com.xeiam.xchart.demo.charts.ExampleChart;

 /**
 * Millisecond scale

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart02.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart02.java
@@ -24,9 +24,9 @@ import java.util.Date;
 import java.util.Random;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.line.ExampleChart;
-import com.xeiam.xchart.style.Series;
+import com.xeiam.xchart.demo.charts.ExampleChart;

 /**
 * Second scale

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart03.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart03.java
@@ -24,9 +24,9 @@ import java.util.Date;
 import java.util.Random;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.line.ExampleChart;
-import com.xeiam.xchart.style.Series;
+import com.xeiam.xchart.demo.charts.ExampleChart;

 /**
 * Minute scale

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart04.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart04.java
@@ -24,9 +24,9 @@ import java.util.Date;
 import java.util.Random;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.line.ExampleChart;
-import com.xeiam.xchart.style.Series;
+import com.xeiam.xchart.demo.charts.ExampleChart;

 /**
 * Hour scale

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart05.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart05.java
@@ -24,9 +24,9 @@ import java.util.Date;
 import java.util.Random;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.line.ExampleChart;
-import com.xeiam.xchart.style.Series;
+import com.xeiam.xchart.demo.charts.ExampleChart;

 /**
 * Day scale

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart06.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart06.java
@@ -24,9 +24,9 @@ import java.util.Date;
 import java.util.Random;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.line.ExampleChart;
-import com.xeiam.xchart.style.Series;
+import com.xeiam.xchart.demo.charts.ExampleChart;

 /**
 * Month scale

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart07.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart07.java
@@ -24,9 +24,9 @@ import java.util.Date;
 import java.util.Random;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.line.ExampleChart;
-import com.xeiam.xchart.style.Series;
+import com.xeiam.xchart.demo.charts.ExampleChart;

 /**
 * Year scale

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart01.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart01.java
@@ -19,8 +19,9 @@ import java.util.Arrays;
 import java.util.Collection;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.style.Series;
+import com.xeiam.xchart.demo.charts.ExampleChart;
 import com.xeiam.xchart.style.SeriesMarker;

 /**

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart02.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart02.java
@@ -19,8 +19,9 @@ import java.util.ArrayList;
 import java.util.List;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.style.Series;
+import com.xeiam.xchart.demo.charts.ExampleChart;
 import com.xeiam.xchart.style.SeriesColor;
 import com.xeiam.xchart.style.SeriesLineStyle;
 import com.xeiam.xchart.style.SeriesMarker;

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart03.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart03.java
@@ -20,6 +20,7 @@ import java.util.Collection;

 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.demo.charts.ExampleChart;

 /**
 * Multiple curves on one Chart

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart05.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart05.java
@@ -18,6 +18,7 @@ package com.xeiam.xchart.demo.charts.line;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.demo.charts.ExampleChart;
 import com.xeiam.xchart.style.theme.GGPlot2Theme;

 /**

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart06.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart06.java
@@ -17,6 +17,7 @@ package com.xeiam.xchart.demo.charts.line;

 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.demo.charts.ExampleChart;

 /**
 * Single point

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart07.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart07.java
@@ -20,6 +20,7 @@ import java.util.Collection;

 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.demo.charts.ExampleChart;

 /**
 * Longs as X-Axis data

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart08.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart08.java
@@ -19,8 +19,9 @@ import java.util.ArrayList;
 import java.util.Collection;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.style.Series;
+import com.xeiam.xchart.demo.charts.ExampleChart;
 import com.xeiam.xchart.style.SeriesColor;
 import com.xeiam.xchart.style.SeriesLineStyle;
 import com.xeiam.xchart.style.SeriesMarker;

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart09.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart09.java
@@ -26,9 +26,10 @@ import java.util.Date;
 import java.util.Locale;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.demo.charts.ExampleChart;
 import com.xeiam.xchart.style.ChartColor;
-import com.xeiam.xchart.style.Series;
 import com.xeiam.xchart.style.SeriesColor;
 import com.xeiam.xchart.style.SeriesLineStyle;
 import com.xeiam.xchart.style.SeriesMarker;

--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart10.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart10.java
@@ -16,8 +16,9 @@
 package com.xeiam.xchart.demo.charts.line;

 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.Series;
 import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.style.Series;
+import com.xeiam.xchart.demo.charts.ExampleChart;
 import com.xeiam.xchart.style.SeriesColor;
 import com.xeiam.xchart.style.SeriesLineStyle;
 import com.xeiam.xchart.style.SeriesMarker;