Merge pull request #987 from danielgindi/improvements-and-bugfixes

Improvements and bugfixes
PhilJay · Sep 3, 2015 · 5a028c5 · 5a028c5
2 parents 8c5e694 + f9d8e36
commit 5a028c5
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 27 deletions.
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/PieChart.java b/MPChartLib/src/com/github/mikephil/charting/charts/PieChart.java
@@ -125,14 +125,27 @@ public void calculateOffsets() {
             return;
 
         float diameter = getDiameter();
-        float boxSize = diameter / 2f;
+        float radius = diameter / 2f;
 
         PointF c = getCenterOffsets();
 
+        final List<PieDataSet> dataSets = mData.getDataSets();
+
+        float maxShift = 0.f;
+        for (int i = 0; i < dataSets.size(); i++) {
+            final float shift = dataSets.get(i).getSelectionShift();
+            if (shift > maxShift)
+                maxShift = shift;
+        }
+
+        final float halfMaxShift = maxShift / 2.f;
+
         // create the circle box that will contain the pie-chart (the bounds of
         // the pie-chart)
-        mCircleBox.set(c.x - boxSize, c.y - boxSize,
-                c.x + boxSize, c.y + boxSize);
+        mCircleBox.set(c.x - radius + halfMaxShift,
+                c.y - radius + halfMaxShift,
+                c.x + radius - halfMaxShift,
+                c.y + radius - halfMaxShift);
     }
 
     @Override

diff --git a/MPChartLib/src/com/github/mikephil/charting/data/CandleDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/CandleDataSet.java
@@ -79,7 +79,7 @@ protected void calcMinMax(int start, int end) {
 
         int endValue;
 
-        if (end == 0)
+        if (end == 0 || end >= mYVals.size())
             endValue = mYVals.size() - 1;
         else
             endValue = end;

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/BarChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/BarChartRenderer.java
@@ -71,7 +71,7 @@ public void drawData(Canvas c) {
 
             BarDataSet set = barData.getDataSetByIndex(i);
 
-            if (set.isVisible()) {
+            if (set.isVisible() && set.getEntryCount() > 0) {
                 drawDataSet(c, set, i);
             }
         }
@@ -187,7 +187,7 @@ public void drawValues(Canvas c) {
 
                 BarDataSet dataSet = dataSets.get(i);
 
-                if (!dataSet.isDrawValuesEnabled())
+                if (!dataSet.isDrawValuesEnabled() || dataSet.getEntryCount() == 0)
                     continue;
 
                 // apply the text-styling defined by the DataSet

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/BubbleChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/BubbleChartRenderer.java
@@ -49,7 +49,7 @@ public void drawData(Canvas c) {
 
         for (BubbleDataSet set : bubbleData.getDataSets()) {
 
-            if (set.isVisible())
+            if (set.isVisible() && set.getEntryCount() > 0)
                 drawDataSet(c, set);
         }
     }
@@ -133,7 +133,7 @@ public void drawValues(Canvas c) {
 
             for (BubbleDataSet dataSet : dataSets) {
 
-                if (!dataSet.isDrawValuesEnabled())
+                if (!dataSet.isDrawValuesEnabled() || dataSet.getEntryCount() == 0)
                     continue;
 
                 // apply the text-styling defined by the DataSet

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/CandleStickChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/CandleStickChartRenderer.java
@@ -53,7 +53,7 @@ public void drawData(Canvas c) {
 
         for (CandleDataSet set : candleData.getDataSets()) {
 
-            if (set.isVisible())
+            if (set.isVisible() && set.getEntryCount() > 0)
                 drawDataSet(c, set);
         }
     }
@@ -69,11 +69,8 @@ protected void drawDataSet(Canvas c, CandleDataSet dataSet) {
 
         List<CandleEntry> entries = dataSet.getYVals();
 
-        Entry entryFrom = dataSet.getEntryForXIndex(mMinX);
-        Entry entryTo = dataSet.getEntryForXIndex(mMaxX);
-
-        int minx = Math.max(dataSet.getEntryPosition(entryFrom), 0);
-        int maxx = Math.min(dataSet.getEntryPosition(entryTo) + 1, entries.size());
+        int minx = Math.max(mMinX, 0);
+        int maxx = Math.min(mMaxX + 1, entries.size());
 
         int range = (maxx - minx) * 4;
         int to = (int)Math.ceil((maxx - minx) * phaseX + minx);
@@ -233,7 +230,7 @@ public void drawValues(Canvas c) {
 
                 CandleDataSet dataSet = dataSets.get(i);
 
-                if (!dataSet.isDrawValuesEnabled())
+                if (!dataSet.isDrawValuesEnabled() || dataSet.getEntryCount() == 0)
                     continue;
 
                 // apply the text-styling defined by the DataSet
@@ -243,11 +240,8 @@ public void drawValues(Canvas c) {
 
                 List<CandleEntry> entries = dataSet.getYVals();
 
-                Entry entryFrom = dataSet.getEntryForXIndex(mMinX);
-                Entry entryTo = dataSet.getEntryForXIndex(mMaxX);
-
-                int minx = Math.max(dataSet.getEntryPosition(entryFrom), 0);
-                int maxx = Math.min(dataSet.getEntryPosition(entryTo) + 1, entries.size());
+                int minx = Math.max(mMinX, 0);
+                int maxx = Math.min(mMaxX + 1, entries.size());
 
                 float[] positions = trans.generateTransformedValuesCandle(
                         entries, mAnimator.getPhaseX(), mAnimator.getPhaseY(), minx, maxx);

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.java
@@ -107,7 +107,7 @@ public void drawValues(Canvas c) {
 
                 BarDataSet dataSet = dataSets.get(i);
 
-                if (!dataSet.isDrawValuesEnabled())
+                if (!dataSet.isDrawValuesEnabled() || dataSet.getEntryCount() == 0)
                     continue;
 
                 boolean isInverted = mChart.isInverted(dataSet.getAxisDependency());

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/LineChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/LineChartRenderer.java
@@ -94,7 +94,7 @@ public void drawData(Canvas c) {
 
         for (LineDataSet set : lineData.getDataSets()) {
 
-            if (set.isVisible())
+            if (set.isVisible() && set.getEntryCount() > 0)
                 drawDataSet(c, set);
         }
 
@@ -410,7 +410,7 @@ public void drawValues(Canvas c) {
 
                 LineDataSet dataSet = dataSets.get(i);
 
-                if (!dataSet.isDrawValuesEnabled())
+                if (!dataSet.isDrawValuesEnabled() || dataSet.getEntryCount() == 0)
                     continue;
 
                 // apply the text-styling defined by the DataSet

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/PieChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/PieChartRenderer.java
@@ -117,7 +117,7 @@ public void drawData(Canvas c) {
 
         for (PieDataSet set : pieData.getDataSets()) {
 
-            if (set.isVisible())
+            if (set.isVisible() && set.getEntryCount() > 0)
                 drawDataSet(c, set);
         }
     }

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/RadarChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/RadarChartRenderer.java
@@ -56,7 +56,7 @@ public void drawData(Canvas c) {
 
         for (RadarDataSet set : radarData.getDataSets()) {
 
-            if (set.isVisible())
+            if (set.isVisible() && set.getEntryCount() > 0)
                 drawDataSet(c, set);
         }
     }
@@ -131,7 +131,7 @@ public void drawValues(Canvas c) {
 
             RadarDataSet dataSet = mChart.getData().getDataSetByIndex(i);
 
-            if (!dataSet.isDrawValuesEnabled())
+            if (!dataSet.isDrawValuesEnabled() || dataSet.getEntryCount() == 0)
                 continue;
 
             // apply the text-styling defined by the DataSet

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/ScatterChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/ScatterChartRenderer.java
@@ -209,7 +209,7 @@ public void drawValues(Canvas c) {
 
                 ScatterDataSet dataSet = dataSets.get(i);
 
-                if (!dataSet.isDrawValuesEnabled())
+                if (!dataSet.isDrawValuesEnabled() || dataSet.getEntryCount() == 0)
                     continue;
 
                 // apply the text-styling defined by the DataSet