Minor perf for pie chart

danielgindi · danielgindi · commit 21fc088f0daf · 2016-01-28T11:07:42.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
@@ -131,6 +131,9 @@ protected void drawDataSet(Canvas c, IPieDataSet dataSet) {
         float angle = 0;
         float rotationAngle = mChart.getRotationAngle();
 
+        float phaseX = mAnimator.getPhaseX();
+        float phaseY = mAnimator.getPhaseY();
+
         float[] drawAngles = mChart.getDrawAngles();
 
         for (int j = 0; j < dataSet.getEntryCount(); j++) {
@@ -148,13 +151,13 @@ protected void drawDataSet(Canvas c, IPieDataSet dataSet) {
 
                     mRenderPaint.setColor(dataSet.getColor(j));
                     mBitmapCanvas.drawArc(mChart.getCircleBox(),
-                            rotationAngle + (angle + sliceSpace / 2f) * mAnimator.getPhaseY(),
-                            (sliceAngle - sliceSpace / 2f) * mAnimator.getPhaseY(),
+                            rotationAngle + (angle + sliceSpace / 2f) * phaseY,
+                            (sliceAngle - sliceSpace / 2f) * phaseY,
                             true, mRenderPaint);
                 }
             }
 
-            angle += sliceAngle * mAnimator.getPhaseX();
+            angle += sliceAngle * phaseX;
         }
     }
 
@@ -169,6 +172,9 @@ public void drawValues(Canvas c) {
         float[] drawAngles = mChart.getDrawAngles();
         float[] absoluteAngles = mChart.getAbsoluteAngles();
 
+        float phaseX = mAnimator.getPhaseX();
+        float phaseY = mAnimator.getPhaseY();
+
         float off = r / 10f * 3.6f;
 
         if (mChart.isDrawHoleEnabled()) {
@@ -202,14 +208,14 @@ public void drawValues(Canvas c) {
             int entryCount = dataSet.getEntryCount();
 
             for (int j = 0, maxEntry = Math.min(
-                    (int) Math.ceil(entryCount * mAnimator.getPhaseX()), entryCount); j < maxEntry; j++) {
+                    (int) Math.ceil(entryCount * phaseX), entryCount); j < maxEntry; j++) {
 
                 Entry entry = dataSet.getEntryForIndex(j);
 
                 // offset needed to center the drawn text in the slice
                 float offset = drawAngles[cnt] / 2;
 
-                float angle = (absoluteAngles[cnt] - offset) * mAnimator.getPhaseY();
+                float angle = (absoluteAngles[cnt] - offset) * phaseY;
                 // calculate the text position
                 float x = (float) (r
                         * Math.cos(Math.toRadians(rotationAngle + angle))
@@ -390,8 +396,11 @@ protected void drawCenterText(Canvas c) {
     @Override
     public void drawHighlighted(Canvas c, Highlight[] indices) {
 
+        float phaseX = mAnimator.getPhaseX();
+        float phaseY = mAnimator.getPhaseY();
+
+        float angle;
         float rotationAngle = mChart.getRotationAngle();
-        float angle = 0f;
 
         float[] drawAngles = mChart.getDrawAngles();
         float[] absoluteAngles = mChart.getAbsoluteAngles();
@@ -413,7 +422,7 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
             if (xIndex == 0)
                 angle = 0.f;
             else
-                angle = absoluteAngles[xIndex - 1] * mAnimator.getPhaseX();
+                angle = absoluteAngles[xIndex - 1] * phaseX;
             
             float sliceAngle = drawAngles[xIndex];
             float sliceSpace = set.getSliceSpace();
@@ -437,8 +446,8 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
             // redefine the rect that contains the arc so that the
             // highlighted pie is not cut off
             mBitmapCanvas.drawArc(highlighted,
-                    rotationAngle + (angle + sliceSpace / 2f) * mAnimator.getPhaseY(),
-                    (sliceAngle - sliceSpace / 2f) * mAnimator.getPhaseY(),
+                    rotationAngle + (angle + sliceSpace / 2f) * phaseY,
+                    (sliceAngle - sliceSpace / 2f) * phaseY,
                     true, mRenderPaint);
         }
     }
@@ -458,6 +467,9 @@ protected void drawRoundedSlices(Canvas c) {
         if (!dataSet.isVisible())
             return;
 
+        float phaseX = mAnimator.getPhaseX();
+        float phaseY = mAnimator.getPhaseY();
+
         PointF center = mChart.getCenterCircleBox();
         float r = mChart.getRadius();
 
@@ -478,16 +490,16 @@ protected void drawRoundedSlices(Canvas c) {
 
                 float x = (float) ((r - circleRadius)
                         * Math.cos(Math.toRadians((angle + sliceAngle)
-                        * mAnimator.getPhaseY())) + center.x);
+                        * phaseY)) + center.x);
                 float y = (float) ((r - circleRadius)
                         * Math.sin(Math.toRadians((angle + sliceAngle)
-                        * mAnimator.getPhaseY())) + center.y);
+                        * phaseY)) + center.y);
 
                 mRenderPaint.setColor(dataSet.getColor(j));
                 mBitmapCanvas.drawCircle(x, y, circleRadius, mRenderPaint);
             }
 
-            angle += sliceAngle * mAnimator.getPhaseX();
+            angle += sliceAngle * phaseX;
         }
     }
 
