organicmaps/MPAndroidChart
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixed bug in LineChart. Circles now drawn in correct color.

Browse source
This commit is contained in:
Philipp Jahoda 2014-05-27 12:40:58 +02:00
parent 2895a014b8
commit c73d50dc51
3 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
MPChartExample/src/com/example/mpchartexample/MultiLineChartActivity.java
View file

@ -1,7 +1,5 @@
package com.example.mpchartexample;
import java.util.ArrayList;
import android.app.Activity;
import android.graphics.Color;
import android.os.Bundle;
@ -14,12 +12,13 @@ import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.TextView;
import com.github.mikephil.charting.Approximator;
import com.github.mikephil.charting.Approximator.ApproximatorType;
import com.github.mikephil.charting.ChartData;
import com.github.mikephil.charting.ColorTemplate;
import com.github.mikephil.charting.DataSet;
import com.github.mikephil.charting.LineChart;
import com.github.mikephil.charting.Point;
import com.github.mikephil.charting.Series;
import com.github.mikephil.charting.Approximator.ApproximatorType;
import java.util.ArrayList;
public class MultiLineChartActivity extends Activity implements OnSeekBarChangeListener {
@ -43,14 +42,15 @@ public class MultiLineChartActivity extends Activity implements OnSeekBarChangeL
mSeekBarY.setOnSeekBarChangeListener(this);
mChart = (LineChart) findViewById(R.id.chart1);
// mChart.setColorTemplate(new ColorTemplate(ColorTemplate.getColors(this, ColorTemplate.LIBERTY_COLORS)));
mChart.setColorTemplate(new ColorTemplate(ColorTemplate.getColors(this, ColorTemplate.JOYFUL_COLORS)));
mChart.setDrawTopYLegendEntry(false);
// mChart.setDrawFilled(true);
// mChart.setRoundedYLegend(false);
// mChart.setStartAtZero(true);
mChart.setDrawYValues(false);
mChart.setLineWidth(4f);
mChart.setCircleSize(4f);
mChart.setLineWidth(5f);
mChart.setCircleSize(5f);
// mChart.setSpacePercent(20, 10);
mChart.setYLegendCount(6);
mChart.setTouchEnabled(true);

13
MPChartLib/src/com/github/mikephil/charting/LineChart.java
View file

@ -84,7 +84,7 @@ public class LineChart extends BarLineChartBase {
for (int i = 0; i < ct.getColors().size(); i++) {
mDrawPaints[i] = new Paint(Paint.ANTI_ALIAS_FLAG);
mDrawPaints[i].setStrokeWidth(mLineWidth);
mDrawPaints[i].setStyle(Style.STROKE);
mDrawPaints[i].setStyle(Style.FILL);
mDrawPaints[i].setColor(ct.getColors().get(i));
}
}
@ -241,7 +241,7 @@ public class LineChart extends BarLineChartBase {
if (positions[j] < mContentRect.left || positions[j] > mContentRect.right)
continue;
mDrawCanvas.drawCircle(positions[j], positions[j + 1], mCircleSize, mCirclePaintOuter);
mDrawCanvas.drawCircle(positions[j], positions[j + 1], mCircleSize, mDrawPaints[i % mDrawPaints.length]);
mDrawCanvas.drawCircle(positions[j], positions[j + 1], mCircleSize / 2, mCirclePaintInner);
}
}
@ -331,15 +331,6 @@ public class LineChart extends BarLineChartBase {
return mLineWidth;
}
/**
* sets the color for the outer circle paint
*
* @param color
*/
public void setCircleColor(int color) {
mCirclePaintOuter.setColor(color);
}
/**
* sets the color for the fill-paint
*

BIN
screenshots/linechart_multiline.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 42 KiB