From be01c39c3ab39129a4b452cdba0ab5106250ca1a Mon Sep 17 00:00:00 2001 From: xloem <0xloem@gmail.com> Date: Fri, 30 Sep 2016 16:56:57 -0400 Subject: [PATCH 1/2] Empty graph hack fixes #4722 and fixes #5316 --- app/src/processing/app/SerialPlotter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/processing/app/SerialPlotter.java b/app/src/processing/app/SerialPlotter.java index 4cfb9da49..93dc5b662 100644 --- a/app/src/processing/app/SerialPlotter.java +++ b/app/src/processing/app/SerialPlotter.java @@ -87,8 +87,10 @@ public class SerialPlotter extends AbstractMonitor { minY = Double.POSITIVE_INFINITY; maxY = Double.NEGATIVE_INFINITY; for(Graph g : graphs) { - minY = Math.min(g.buffer.min(), minY); - maxY = Math.max(g.buffer.max(), maxY); + if (!g.buffer.isEmpty()) { + minY = Math.min(g.buffer.min(), minY); + maxY = Math.max(g.buffer.max(), maxY); + } } final double MIN_DELTA = 10.0; From 8b5a900ae16332e92511878a32e88d33904d5d6d Mon Sep 17 00:00:00 2001 From: xloem <0xloem@gmail.com> Date: Fri, 30 Sep 2016 17:04:01 -0400 Subject: [PATCH 2/2] Message parsing logic fix comparison was invalid if some parts were not parsable numbers --- app/src/processing/app/SerialPlotter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/processing/app/SerialPlotter.java b/app/src/processing/app/SerialPlotter.java index 93dc5b662..ffe15ae44 100644 --- a/app/src/processing/app/SerialPlotter.java +++ b/app/src/processing/app/SerialPlotter.java @@ -241,7 +241,7 @@ public class SerialPlotter extends AbstractMonitor { for(int i = 0; i < parts.length; ++i) { try { double value = Double.valueOf(parts[i]); - if(i >= graphs.size()) { + if(validParts >= graphs.size()) { graphs.add(new Graph(validParts)); } graphs.get(validParts).buffer.add(value);