From 410ea289cd183e5cef0d96a982190433dc571b2b Mon Sep 17 00:00:00 2001 From: Georg Hieronimus Date: Mon, 20 Mar 2017 13:44:42 +0100 Subject: [PATCH] series with titel null will not be shown in the legend --- .../java/com/jjoe64/graphview/LegendRenderer.java | 15 +++++++++++---- .../com/jjoe64/graphview/series/BaseSeries.java | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jjoe64/graphview/LegendRenderer.java b/src/main/java/com/jjoe64/graphview/LegendRenderer.java index 9286cb776..a12ed537f 100644 --- a/src/main/java/com/jjoe64/graphview/LegendRenderer.java +++ b/src/main/java/com/jjoe64/graphview/LegendRenderer.java @@ -189,8 +189,15 @@ public void draw(Canvas canvas) { } } + int SeriesWithLegendCount = 0; + for (Series s : allSeries) { + if (s.getTitle() != null) { + SeriesWithLegendCount++; + } + } + // rect - float legendHeight = (mStyles.textSize+mStyles.spacing)*allSeries.size() -mStyles.spacing; + float legendHeight = (mStyles.textSize+mStyles.spacing)*SeriesWithLegendCount -mStyles.spacing; float lLeft; float lTop; if (mStyles.fixedPosition != null) { @@ -217,13 +224,13 @@ public void draw(Canvas canvas) { int i=0; for (Series series : allSeries) { - mPaint.setColor(series.getColor()); - canvas.drawRect(new RectF(lLeft+mStyles.padding, lTop+mStyles.padding+(i*(mStyles.textSize+mStyles.spacing)), lLeft+mStyles.padding+shapeSize, lTop+mStyles.padding+(i*(mStyles.textSize+mStyles.spacing))+shapeSize), mPaint); if (series.getTitle() != null) { + mPaint.setColor(series.getColor()); + canvas.drawRect(new RectF(lLeft+mStyles.padding, lTop+mStyles.padding+(i*(mStyles.textSize+mStyles.spacing)), lLeft+mStyles.padding+shapeSize, lTop+mStyles.padding+(i*(mStyles.textSize+mStyles.spacing))+shapeSize), mPaint); mPaint.setColor(mStyles.textColor); canvas.drawText(series.getTitle(), lLeft+mStyles.padding+shapeSize+mStyles.spacing, lTop+mStyles.padding+mStyles.textSize+(i*(mStyles.textSize+mStyles.spacing)), mPaint); + i++; } - i++; } } diff --git a/src/main/java/com/jjoe64/graphview/series/BaseSeries.java b/src/main/java/com/jjoe64/graphview/series/BaseSeries.java index 141b7497d..66ec0ce53 100644 --- a/src/main/java/com/jjoe64/graphview/series/BaseSeries.java +++ b/src/main/java/com/jjoe64/graphview/series/BaseSeries.java @@ -260,6 +260,7 @@ public String getTitle() { /** * set the title of the series. This will be used in * the legend. + * Use null if you want to hide the legend entry * * @param mTitle title of the series */