From b53790786fe780fc7dccdb9671b69a01ac03bac6 Mon Sep 17 00:00:00 2001 From: Vicne Date: Wed, 30 Dec 2015 19:12:06 +0100 Subject: [PATCH] Fixed plotter scaling by adapting margin computation based on sign --- app/src/processing/app/SerialPlotter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/processing/app/SerialPlotter.java b/app/src/processing/app/SerialPlotter.java index 24564373c6d..9cae2cf9e1b 100644 --- a/app/src/processing/app/SerialPlotter.java +++ b/app/src/processing/app/SerialPlotter.java @@ -87,12 +87,14 @@ private Ticks computeBounds() { minY = Double.POSITIVE_INFINITY; maxY = Double.NEGATIVE_INFINITY; for(Graph g : graphs) { - double bMin = g.buffer.min() / 2.0; - double bMax = g.buffer.max() * 2.0; + double bMin = g.buffer.min(); + double bMax = g.buffer.max(); minY = bMin < minY ? bMin : minY; maxY = bMax > maxY ? bMax : maxY; } - + minY = minY * ((minY<0)?2:0.5); + maxY = maxY * ((maxY<0)?0.5:2); + Ticks ticks = new Ticks(minY, maxY, 3); minY = Math.min(minY, ticks.getTick(0)); maxY = Math.max(maxY, ticks.getTick(ticks.getTickCount() - 1));