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

Work on radarchart rendering

Browse source
This commit is contained in:
Philipp Jahoda 2016-06-02 20:10:37 +02:00
parent bfcbae4263
commit 4ae9950632
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartPositiveNegative.java
View file

@ -68,7 +68,6 @@ public class BarChartPositiveNegative extends DemoBase {
YAxis left = mChart.getAxisLeft();
left.setDrawLabels(false);
left.setStartAtZero(false);
left.setSpaceTop(25f);
left.setSpaceBottom(25f);
left.setDrawAxisLine(false);

5
MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.java
View file

@ -179,8 +179,7 @@ public class RadarChart extends PieRadarChartBase<RadarData> {
*/
public float getFactor() {
RectF content = mViewPortHandler.getContentRect();
return (float) Math.min(content.width() / 2f, content.height() / 2f)
/ mYAxis.mAxisRange;
return Math.min(content.width() / 2f, content.height() / 2f) / mYAxis.mAxisRange;
}
/**
@ -189,7 +188,7 @@ public class RadarChart extends PieRadarChartBase<RadarData> {
* @return
*/
public float getSliceAngle() {
return 360f / (float) mData.getEntryCount();
return 360f / (float) mData.getMaxEntryCountSet().getEntryCount();
}
@Override

11
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.java
View file

@ -59,13 +59,7 @@ public class RadarChartRenderer extends LineRadarRenderer {
RadarData radarData = mChart.getData();
int mostEntries = 0;
for (IRadarDataSet set : radarData.getDataSets()) {
if (set.getEntryCount() > mostEntries) {
mostEntries = set.getEntryCount();
}
}
int mostEntries = radarData.getMaxEntryCountSet().getEntryCount();
for (IRadarDataSet set : radarData.getDataSets()) {
@ -217,8 +211,9 @@ public class RadarChartRenderer extends LineRadarRenderer {
mWebPaint.setAlpha(mChart.getWebAlpha());
final int xIncrements = 1 + mChart.getSkipWebLineCount();
int maxEntryCount = mChart.getData().getMaxEntryCountSet().getEntryCount();
for (int i = 0; i < mChart.getData().getEntryCount(); i += xIncrements) {
for (int i = 0; i < maxEntryCount; i += xIncrements) {
PointF p = Utils.getPosition(
center,