From f74c620464d3a060ec677b495ec9771f82bb5547 Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Sun, 7 Jan 2018 22:44:27 +0100 Subject: [PATCH] Work on y legend detail --- nbproject/project.properties | 2 +- src/chart/Chart.java | 1 + src/chart/MasterChart.java | 1 + src/chart/painter/ChartPainter.java | 6 ++++++ src/chart/painter/YLegendPainter.java | 3 ++- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index 906e9a6..205ebbb 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,4 +1,4 @@ -#Fri, 05 Jan 2018 12:28:51 +0100 +#Sat, 06 Jan 2018 13:11:03 +0100 annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= diff --git a/src/chart/Chart.java b/src/chart/Chart.java index dca031f..e15ca6c 100644 --- a/src/chart/Chart.java +++ b/src/chart/Chart.java @@ -17,6 +17,7 @@ import javax.swing.JViewport; import javax.swing.Scrollable; import sesim.MinMax; import sesim.Scheduler; + diff --git a/src/chart/MasterChart.java b/src/chart/MasterChart.java index 065e47e..787c946 100644 --- a/src/chart/MasterChart.java +++ b/src/chart/MasterChart.java @@ -125,6 +125,7 @@ public class MasterChart extends javax.swing.JPanel implements QuoteReceiver { chartDef = new ChartDef(); chartDef.x_unit_width = 3.0; + chartDef.mainChart=this.chart; if (Globals.se == null) { return; diff --git a/src/chart/painter/ChartPainter.java b/src/chart/painter/ChartPainter.java index 4667eb7..92dbcec 100644 --- a/src/chart/painter/ChartPainter.java +++ b/src/chart/painter/ChartPainter.java @@ -96,6 +96,11 @@ abstract public class ChartPainter implements ChartPainterInterface{ return (-(y - y_height)) / y_scaling + y_min; } + + float getRoundNumber(float n){ + return (float)0.0; + + } void initGetY(MinMax minmax, Dimension dim) { y_height = dim.height; @@ -103,6 +108,7 @@ abstract public class ChartPainter implements ChartPainterInterface{ y_min = minmax.getMin(); } + @Override abstract public void drawChart(Graphics2D g, ChartPanel p, ChartDef def); } diff --git a/src/chart/painter/YLegendPainter.java b/src/chart/painter/YLegendPainter.java index dfe5631..087fd89 100644 --- a/src/chart/painter/YLegendPainter.java +++ b/src/chart/painter/YLegendPainter.java @@ -50,7 +50,8 @@ public class YLegendPainter extends OHLCChartPainter { public void drawChart(Graphics2D g, ChartPanel p, ChartDef def) { init(g); - Dimension dim = master.getSize(); + + Dimension dim = def.mainChart.getSize(); int first_bar = getFirstBar(master); int last_bar = first_bar + getBars(master,def); MinMax minmax = this.getData().getMinMax(first_bar, last_bar);