From b19186739d1f3ca713a30ee281ffe7831c0bd0b3 Mon Sep 17 00:00:00 2001 From: Robert Fisch Date: Mon, 18 Apr 2016 21:20:09 +0200 Subject: [PATCH] Trying to fix issue #310 --- .../main/java/lu/fisch/canze/changelog.txt | 1 + .../java/lu/fisch/canze/widgets/Timeplot.java | 74 ++++++++++--------- 2 files changed, 40 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/lu/fisch/canze/changelog.txt b/app/src/main/java/lu/fisch/canze/changelog.txt index ab7f2266..4be6d5ce 100644 --- a/app/src/main/java/lu/fisch/canze/changelog.txt +++ b/app/src/main/java/lu/fisch/canze/changelog.txt @@ -1,3 +1,4 @@ +2016.04.18 [Bob] Trying to fix issue #310 2016.04.18 [Bob] The plotter on the Battery screen has been fixed ---< Version 1.12 / 2016.04.11 >--- diff --git a/app/src/main/java/lu/fisch/canze/widgets/Timeplot.java b/app/src/main/java/lu/fisch/canze/widgets/Timeplot.java index 7893d163..4b6d0c84 100644 --- a/app/src/main/java/lu/fisch/canze/widgets/Timeplot.java +++ b/app/src/main/java/lu/fisch/canze/widgets/Timeplot.java @@ -285,49 +285,53 @@ public void draw(Graphics g) { if (i < values.size() - 1) { if(getOptions().getOption(sid)!=null && getOptions().getOption(sid).contains("full")) { - Polygon p = new Polygon(); - p.addPoint(getX() + getWidth() - barWidth + (int) lastX-spaceAlt, - getY() + (int) lastY); - p.addPoint(getX() + getWidth() - barWidth + (int) mx-spaceAlt, - getY() + (int) my); - p.addPoint(getX() + getWidth() - barWidth + (int) mx-spaceAlt, - (int) (getY() + zy)); - p.addPoint(getX() + getWidth() - barWidth + (int) lastX-spaceAlt, - (int) (getY() + zy)); - g.fillPolygon(p); - } - else if(getOptions().getOption(sid)!=null && - getOptions().getOption(sid).contains("gradient")) { - - if(i 0 && tp.value > 0) || (values.get(i + 1).value < 0 && tp.value < 0)) { - if (tp.value > 0) - g.fillPolygon(p, 0, (int) zy, 0, 0, colorRanges.getColors(sid, tp.value > 0), colorRanges.getSpacings(sid, 0, max, tp.value > 0)); + if(i 0 && tp.value > 0) || (values.get(i + 1).value < 0 && tp.value < 0)) { + if (tp.value > 0) + g.fillPolygon(p, 0, (int) zy, 0, 0, colorRanges.getColors(sid, tp.value > 0), colorRanges.getSpacings(sid, 0, max, tp.value > 0)); + else + g.fillPolygon(p, 0, graphHeight, 0, (int) zy, colorRanges.getColors(sid, tp.value > 0), colorRanges.getSpacings(sid, min, 0, tp.value > 0)); + } else - g.fillPolygon(p, 0, graphHeight, 0, (int) zy, colorRanges.getColors(sid, tp.value > 0), colorRanges.getSpacings(sid, min, 0, tp.value > 0)); + { + g.fillPolygon(p, 0, graphHeight, 0, 0, colorRanges.getColors(sid), colorRanges.getSpacings(sid, min, max)); + }*/ + int[] colors = colorRanges.getColors(sid); + float[] spacings = colorRanges.getSpacings(sid, min, max); + if (colors.length == spacings.length) + g.setGradient(0, graphHeight, 0, 0, colors, spacings); + g.fillPolygon(p); + g.clearGradient(); + + //else MainActivity.debug("size not equal: "+colors.length+"=="+spacings.length); } - else - { - g.fillPolygon(p, 0, graphHeight, 0, 0, colorRanges.getColors(sid), colorRanges.getSpacings(sid, min, max)); - }*/ - int[] colors = colorRanges.getColors(sid); - float[] spacings = colorRanges.getSpacings(sid, min, max); - if(colors.length==spacings.length) - g.setGradient(0, graphHeight, 0, 0, colors, spacings); - g.fillPolygon(p); - g.clearGradient(); - - //else MainActivity.debug("size not equal: "+colors.length+"=="+spacings.length); } } else