Fix pie chart values animation on X axis

danielgindi · danielgindi · commit 996948e829d9 · 2016-01-28T11:41:06.000+02:00
diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/PieChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/PieChartRenderer.java
@@ -190,7 +190,8 @@ public void drawValues(Canvas c) {
 
         boolean drawXVals = mChart.isDrawSliceTextEnabled();
 
-        int cnt = 0;
+        float angle;
+        int xIndex = 0;
 
         for (int i = 0; i < dataSets.size(); i++) {
 
@@ -212,10 +213,19 @@ public void drawValues(Canvas c) {
 
                 Entry entry = dataSet.getEntryForIndex(j);
 
+                if (xIndex == 0)
+                    angle = 0.f;
+                else
+                    angle = absoluteAngles[xIndex - 1] * phaseX;
+
+                final float sliceAngle = drawAngles[xIndex];
+                final float sliceSpace = dataSet.getSliceSpace();
+
                 // offset needed to center the drawn text in the slice
-                float offset = drawAngles[cnt] / 2;
+                final float offset = (sliceAngle - sliceSpace / 2.f) / 2.f;
+
+                angle = angle + offset;
 
-                float angle = (absoluteAngles[cnt] - offset) * phaseY;
                 // calculate the text position
                 float x = (float) (r
                         * Math.cos(Math.toRadians(rotationAngle + angle))
@@ -248,7 +258,7 @@ public void drawValues(Canvas c) {
                     drawValue(c, formatter, value, entry, 0, x, y + lineHeight / 2f);
                 }
 
-                cnt++;
+                xIndex++;
             }
         }
     }
