From 74ab5ec81dc80d80bd92250459f3ec59c4a73233 Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@mail.ru>
Date: Wed, 27 Dec 2017 08:44:58 +0100
Subject: [PATCH] charting x legend

---
 nbproject/project.properties          |  2 +-
 src/chart/MMChart.java                |  2 +-
 src/chart/MasterChart.java            |  2 +-
 src/chart/painter/XLegendPainter.java | 24 +++++++++++-------------
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 1f31653..406134f 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,4 +1,4 @@
-#Tue, 26 Dec 2017 10:12:17 +0100
+#Wed, 27 Dec 2017 08:42:22 +0100
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
 annotation.processing.processors.list=
diff --git a/src/chart/MMChart.java b/src/chart/MMChart.java
index f7c36d4..e4a162c 100644
--- a/src/chart/MMChart.java
+++ b/src/chart/MMChart.java
@@ -102,7 +102,7 @@ public class MMChart extends javax.swing.JPanel {
         add(xLegend, gbConstraints);
 
         OHLCChartPainter p;
-        OHLCData mydata = stock.getOHLCdata(60*20);
+        OHLCData mydata = stock.getOHLCdata(60000);
                 
 
 
diff --git a/src/chart/MasterChart.java b/src/chart/MasterChart.java
index 4ccdcac..f32a0b0 100644
--- a/src/chart/MasterChart.java
+++ b/src/chart/MasterChart.java
@@ -151,7 +151,7 @@ public class MasterChart extends javax.swing.JPanel implements QuoteReceiver {
         this.yLegend.setChartDef(chartDef);
 
         OHLCChartPainter p;
-        mydata = Globals.se.getOHLCdata(Globals.se.getDefaultStock(),60000 * 20);
+        mydata = Globals.se.getOHLCdata(Globals.se.getDefaultStock(),60000);
 
         this.xScrollBar.setMaximum(0);
 
diff --git a/src/chart/painter/XLegendPainter.java b/src/chart/painter/XLegendPainter.java
index 2ce212c..d3d3daf 100644
--- a/src/chart/painter/XLegendPainter.java
+++ b/src/chart/painter/XLegendPainter.java
@@ -34,6 +34,7 @@ import sesim.OHLCDataItem;
 
 /**
  * Paints an x-legend for OHLC charts
+ *
  * @author 7u83 <7u83@mail.ru>
  */
 public class XLegendPainter extends OHLCChartPainter {
@@ -41,29 +42,26 @@ public class XLegendPainter extends OHLCChartPainter {
     private String getTimeStrAt(OHLCData data, int unit) {
 
         int fs = data.getFrameSize();
-        return sesim.Scheduler.formatTimeMillis(0 + unit * fs);
+        return sesim.Scheduler.formatTimeMillis(0 + (long)unit * (long)fs);
 
     }
-    
-    int big_tick = 10;
+
+    int big_tick = 2;
     int y = 0;
+
     @Override
-    public void drawChart(Graphics2D g,  ChartPanel p, ChartDef def)
-    {
-        OHLCData data = getData();
-        if (data ==null)
-            return;
-        
+    public void drawChart(Graphics2D g, ChartPanel p, ChartDef def) {
+
         init(g);
-        
+
         Dimension size = p.getSize();
-        
+
         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) {
+            if (n % big_tick == 0) {
                 g.drawLine((int) x, y, (int) x, y + em_size);
                 String text;
                 text = getTimeStrAt(data, n);