From f233e6bd22c72ac1dcc9348177d4eaf993553040 Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@maiol.ru> Date: Sun, 26 Mar 2017 08:32:38 +0200 Subject: [PATCH] ylegend is no ok when log scaling is on --- nbproject/private/private.xml | 7 +++++-- nbproject/project.properties | 2 +- src/chart/Chart.java | 15 +++++++-------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index ecd5ffe..a6f31d5 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -4,13 +4,16 @@ file:/home/tube/NetBeansProjects/SeSim/src/traders/RandomTraderA.java + file:/home/tube/NetBeansProjects/SeSim/test/sesim/Test.java file:/home/tube/NetBeansProjects/SeSim/src/gui/StatisticsPanel.java + file:/home/tube/NetBeansProjects/SeSim/src/sesim/OHLCData.java + file:/home/tube/NetBeansProjects/SeSim/src/sesim/MinMax.java file:/home/tube/NetBeansProjects/SeSim/build.xml - file:/home/tube/NetBeansProjects/SeSim/src/chart/FullChart.java - file:/home/tube/NetBeansProjects/SeSim/nbproject/jnlp-impl.xml file:/home/tube/NetBeansProjects/SeSim/src/sesim/AutoTraderLoader.java file:/home/tube/NetBeansProjects/SeSim/src/traders/ManTrader/ManTrader.java file:/home/tube/NetBeansProjects/SeSim/src/gui/NewMDIApplication.java + file:/home/tube/NetBeansProjects/SeSim/src/chart/FullChart.java + file:/home/tube/NetBeansProjects/SeSim/nbproject/jnlp-impl.xml file:/home/tube/NetBeansProjects/SeSim/src/gui/EditStrategies.java file:/home/tube/NetBeansProjects/SeSim/src/chart/Chart.java diff --git a/nbproject/project.properties b/nbproject/project.properties index 6bd2513..da4a492 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,4 +1,4 @@ -#Sat, 25 Mar 2017 17:41:45 +0100 +#Sat, 25 Mar 2017 19:09:34 +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 d5556d0..4fd34f9 100644 --- a/src/chart/Chart.java +++ b/src/chart/Chart.java @@ -301,14 +301,13 @@ public class Chart extends javax.swing.JPanel implements QuoteReceiver, Scrollab //val = return c_rect.height + c_rect.y - ((float)Math.log(y) - c_mm.getMin()) * ys; - // ((float)Math.log(y) - c_mm.getMin()) * ys = c_rect.height + c_rect.y - // ((float)Math.log(y) - c_mm.getMin()) = (c_rect.height + c_rect.y)/ys - // ((float)Math.log(y) = (c_rect.height + c_rect.y)/ys + c_mm.getMin()) + // val + ((float)Math.log(y) - c_mm.getMin()) * ys = c_rect.height + c_rect.y + // val/ys + ((float)Math.log(y) - c_mm.getMin()) = (c_rect.height + c_rect.y)/ys + // val/ys + ((float)Math.log(y) = (c_rect.height + c_rect.y)/ys + c_mm.getMin()) //return (-(Math.exp(y)-c_rect.y-c_rect.height))/ys+c_mm.getMin(); - - - return Math.exp( (c_rect.height + c_rect.y)/ys + c_mm.getMin() ); + + return Math.exp( (c_rect.height + c_rect.y)/ys + c_mm.getMin() - y/ys); } @@ -566,8 +565,8 @@ System.out.printf("v1 %f, v2 %f\n",v1,v2); ctx.iwidth = (float) ((x_unit_width * em_size) * 0.9f); this.ct = ChartType.CANDLESTICK; - logs=false; - c_mm.setLog(false); + logs=true; + c_mm.setLog(true); drawChart(ctx); c_mm = data.getVolMinMax(first_bar, last_bar);