Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modification to LegendRenderer.java #507

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/main/java/com/jjoe64/graphview/LegendRenderer.java
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,13 @@ public void draw(Canvas canvas) {
if (mGraphView.mSecondScale != null) {
allSeries.addAll(mGraphView.getSecondScale().getSeries());
}

int numSeries = allSeries.size();
for (Series s : allSeries){
if (s.getTitle() == null){
numSeries--;
}
}

// width
int legendWidth = mStyles.width;
Expand All @@ -190,7 +197,7 @@ public void draw(Canvas canvas) {
}

// rect
float legendHeight = (mStyles.textSize+mStyles.spacing)*allSeries.size() -mStyles.spacing;
float legendHeight = (mStyles.textSize+mStyles.spacing)*numSeries -mStyles.spacing;
float lLeft;
float lTop;
if (mStyles.fixedPosition != null) {
Expand All @@ -217,13 +224,14 @@ public void draw(Canvas canvas) {

int i=0;
for (Series series : allSeries) {
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);
if (series.getTitle() != null) {
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);
}
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++;
}

}
}

Expand Down