Refactoring, putting chart painters into separate directory

src/chart/painter/CandleStickChartPainter.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2017, 7u83 <7u83@mail.ru>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package chart.painter;
+
+import chart.painter.OHLCChartPainter;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import javax.swing.JScrollBar;
+import sesim.OHLCData;
+import sesim.OHLCDataItem;
+
+/**
+ *
+ * @author 7u83 <7u83@mail.ru>
+ */
+public class CandleStickChartPainter extends OHLCChartPainter {
+
+    @Override
+    protected void drawItem(Graphics2D g, int prevx, int x, OHLCDataItem prev, OHLCDataItem i) {
+
+        if (i.open < i.close) {
+            int xl = (int) (x + iwidth / 2);
+
+            g.setColor(Color.BLACK);
+            g.drawLine(xl, (int) getY(i.close), xl, (int) getY(i.high));
+            g.drawLine(xl, (int) getY(i.low), xl, (int) getY(i.open));
+
+            float w = iwidth;
+            float h = (int) (getY(i.open) - getY(i.close));
+
+            g.setColor(Color.GREEN);
+            g.fillRect((int) (x), (int) getY(i.close), (int) w, (int) h);
+            g.setColor(Color.BLACK);
+            g.drawRect((int) (x), (int) getY(i.close), (int) w, (int) h);
+
+        } else {
+            int xl = (int) (x + iwidth / 2);
+            g.setColor(Color.RED);
+            g.drawLine(xl, (int) getY(i.high), xl, (int) getY(i.close));
+            g.drawLine(xl, (int) getY(i.open), xl, (int) getY(i.low));
+
+            float w = iwidth;
+            float h = (int) (getY(i.close) - getY(i.open));
+
+            g.fillRect((int) (x), (int) getY(i.open), (int) w, (int) h);
+            g.setColor(Color.BLACK);
+            g.drawRect((int) (x), (int) getY(i.open), (int) w, (int) h);
+        }
+    }
+
+
+
+ 
+}

src/chart/painter/ChartCrossPainter.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, 7u83 <7u83@mail.ru>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package chart.painter;
+
+import chart.ChartDef;
+import chart.ChartPanel;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
+import sesim.OHLCData;
+
+/**
+ *
+ * @author 7u83 <7u83@mail.ru>
+ */
+public class ChartCrossPainter extends ChartPainter{
+
+    @Override
+    public void drawChart(Graphics2D g, ChartPanel p, ChartDef def) {
+        Point mp = p.mouse;
+        if (mp==null)
+            return;
+        
+        g.drawLine(0, p.mouse.y-1, p.getSize().width, p.mouse.y-1);
+        g.drawLine(p.mouse.x-1, 0, p.mouse.x-1, p.getSize().height);        
+        
+    }
+    
+    
+}

src/chart/painter/ChartPainter.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2017, 7u83 <7u83@mail.ru>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package chart.painter;
+
+import chart.ChartDef;
+import chart.ChartPanel;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
+import sesim.OHLCData;
+
+/**
+ *
+ * @author 7u83 <7u83@mail.ru>
+ */
+abstract public class ChartPainter {
+
+    int em_size;
+    //OHLCData data=null;
+    
+    public abstract interface DataProvider {
+        abstract OHLCData get();
+    }
+
+    DataProvider dataProvider=null;
+    
+   public void setDataProvider(DataProvider dataProvider){
+        this.dataProvider = dataProvider;
+    }
+   
+   protected OHLCData getData(){
+       if (dataProvider==null)
+           return null;
+       return dataProvider.get();
+   }
+
+    protected int getFirstBar(ChartPanel p) {
+        if (p.x_scrollbar != null) {
+            return p.x_scrollbar.getValue();
+        }
+        return 0;
+    }
+
+    protected final void init(Graphics2D g) {
+
+        // Calculate the number of pixels for 1 em
+        em_size = g.getFontMetrics().stringWidth("M");
+
+    }
+
+    int big_tick = 10;
+    int y = 0;
+
+    abstract public void drawChart(Graphics2D g, ChartPanel p, ChartDef def);
+
+}

src/chart/painter/LineChartPainter.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2017, 7u83 <7u83@mail.ru>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package chart.painter;
+
+import chart.painter.OHLCChartPainter;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import sesim.OHLCDataItem;
+
+/**
+ *
+ * @author 7u83 <7u83@mail.ru>
+ */
+public class LineChartPainter extends OHLCChartPainter{
+
+    
+    
+    @Override
+    void drawItem(Graphics2D g, int prevx, int x, OHLCDataItem prev, OHLCDataItem i) {
+
+        if (prev == null) {
+            prev = i;
+        }
+        int y1 = (int) getY(prev.close);
+        int y2 = (int) getY(i.close);
+        Color cur = g.getColor();
+        g.setColor(Color.RED);
+    
+        g.drawLine(prevx, y1, x, y2);
+        g.setColor(cur);
+    }
+    
+    
+}

src/chart/painter/OHLCChartPainter.java

@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2017, 7u83 <7u83@mail.ru>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package chart.painter;
+
+import chart.ChartDef;
+import chart.ChartPanel;
+import chart.painter.ChartPainter;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
+import sesim.MinMax;
+import sesim.OHLCData;
+import sesim.OHLCDataItem;
+import static sun.awt.geom.Curve.prev;
+
+/**
+ *
+ * @author 7u83 <7u83@mail.ru>
+ */
+public abstract class OHLCChartPainter extends ChartPainter {
+
+    protected float iwidth;
+    private MinMax mm;
+    private Dimension dim;
+    private float y_scaling;
+
+    float getY(float y) {
+//c_yscaling = ctx.rect.height / c_mm.getDiff();
+//               float ys = dim.height / mm.getDiff();
+        if (mm.isLog()) {
+//            return rect.height + rect.y - ((float) Math.log(y) - c_mm.getMin()) * ys;
+        }
+        return (dim.height - ((y - mm.getMin()) * y_scaling));
+
+    }
+
+    abstract void drawItem(Graphics2D g, int prevx, int x, OHLCDataItem prev, OHLCDataItem i);
+    
+
+
+    @Override
+    public void drawChart(Graphics2D g, ChartPanel p, ChartDef def) {
+        OHLCData data = getData();
+        if (data==null)
+            return;
+        
+        init(g);
+
+        iwidth = (float) ((def.x_unit_width * em_size) * 0.9f);
+
+        int first_bar = getFirstBar(p); 
+        
+        
+        dim = p.getSize();
+        int bars = (int) (dim.width / (def.x_unit_width * em_size));
+
+        int last_bar = first_bar + bars+1;
+
+        mm = data.getMinMax(first_bar, last_bar);
+
+        y_scaling = dim.height / mm.getDiff();
+
+        OHLCDataItem prevd = null;
+        int prevx;
+
+System.out.printf("Firstbar %d - %d",first_bar,last_bar);        
+        
+        if (data.size() > 0 && first_bar < data.size()) {
+            prevd = data.get(first_bar);
+        }
+        
+ 
+
+        for (int b = first_bar, n = 0; b < last_bar && b < data.size(); b++, n++) {
+            OHLCDataItem d = data.get(b);
+
+            int x = (int) (n * em_size * def.x_unit_width); //em_width;
+            drawItem(g, (int) (x - em_size * def.x_unit_width), x, prevd, d);
+            prevd = d;
+
+            //this.drawCandleItem(g, (int)((n-1)*def.x_unit_width*em_size), (int)(n*def.x_unit_width*em_size), prevd, d);
+        }
+    }
+
+}

src/chart/painter/XLegendChartPainter.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2017, 7u83 <7u83@mail.ru>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package chart.painter;
+
+import chart.ChartDef;
+import chart.ChartPanel;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
+import sesim.OHLCData;
+
+/**
+ *
+ * @author 7u83 <7u83@mail.ru>
+ */
+public class XLegendChartPainter extends ChartPainter {
+
+    private String getTimeStrAt(OHLCData data, int unit) {
+
+        int fs = data.getFrameSize();
+        return sesim.Scheduler.formatTimeMillis(0 + unit * fs);
+
+    }
+    
+ 
+    @Override
+    public void drawChart(Graphics2D g,  ChartPanel p, ChartDef def)
+    {
+        OHLCData data = getData();
+        if (data ==null)
+            return;
+        
+        init(g);
+        
+        g.setColor(Color.black);
+        Dimension size = p.getSize();
+
+        int bars = (int) (size.width / (def.x_unit_width * em_size));
+
+        int first_bar = getFirstBar(p);
+        
+        int n;
+        int x;
+        for (n = first_bar, x = 0; x < size.width; x += em_size * def.x_unit_width) {
+            if (n % big_tick == 1) {
+                g.drawLine((int) x, y, (int) x, y + em_size);
+                String text;
+                text = getTimeStrAt(data, n);
+
+                int swidth = g.getFontMetrics().stringWidth(text);
+                g.drawString(text, (int) x - swidth / 2, y + em_size * 2);
+
+            } else {
+                g.drawLine((int) x, y, (int) x, y + em_size / 2);
+            }
+
+            if (n % big_tick == 0) {
+
+            }
+
+            n += 1;
+        }
+
+    }
+
+}