Make automatically disabling slice-spacing an opt-in feature

DzonyKalafut · Oct 31, 2016 · fb8094e · fb8094e
1 parent 9a19bf6
commit fb8094e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/PieDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/PieDataSet.java
@@ -11,6 +11,7 @@ public class PieDataSet extends DataSet<PieEntry> implements IPieDataSet {
 
     /** the space in pixels between the chart-slices, default 0f */
     private float mSliceSpace = 0f;
+    private boolean mAutomaticallyDisableSliceSpacing;
 
     /** indicates the selection distance of a pie slice */
     private float mShift = 18f;
@@ -75,6 +76,27 @@ public float getSliceSpace() {
         return mSliceSpace;
     }
 
+    /**
+     * When enabled, slice spacing will be 0.0 when the smallest value is going to be
+     *   smaller than the slice spacing itself.
+     *
+     * @param autoDisable
+     */
+    public void setAutomaticallyDisableSliceSpacing(boolean autoDisable) {
+        mAutomaticallyDisableSliceSpacing = autoDisable;
+    }
+
+    /**
+     * When enabled, slice spacing will be 0.0 when the smallest value is going to be
+     *   smaller than the slice spacing itself.
+     *
+     * @return
+     */
+    @Override
+    public boolean isAutomaticallyDisableSliceSpacing() {
+        return mAutomaticallyDisableSliceSpacing;
+    }
+
     /**
      * sets the distance the highlighted piechart-slice of this DataSet is
      * "shifted" away from the center of the chart, default 12f

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IPieDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IPieDataSet.java
@@ -17,6 +17,14 @@ public interface IPieDataSet extends IDataSet<PieEntry> {
      */
     float getSliceSpace();
 
+    /**
+     * When enabled, slice spacing will be 0.0 when the smallest value is going to be
+     *   smaller than the slice spacing itself.
+     *
+     * @return
+     */
+    boolean isAutomaticallyDisableSliceSpacing();
+
     /**
      * Returns the distance a highlighted piechart slice is "shifted" away from
      * the chart-center in dp.

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.java
@@ -199,6 +199,9 @@ protected float calculateMinimumRadiusForSpacedSlice(
      */
     protected float getSliceSpace(IPieDataSet dataSet) {
 
+        if (!dataSet.isAutomaticallyDisableSliceSpacing())
+            return dataSet.getSliceSpace();
+
         float spaceSizeRatio = dataSet.getSliceSpace() / mViewPortHandler.getSmallestContentExtension();
         float minValueRatio = dataSet.getYMin() / mChart.getData().getYValueSum() * 2;