Remove barspace from BarDataSet

Author: PhilJay

MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivitySinus.java

@@ -229,14 +229,14 @@ private void setData(int count) {
             mChart.notifyDataSetChanged();
         } else {
             set = new BarDataSet(entries, "Sinus Function");
-            set.setBarSpace(40f);
             set.setColor(Color.rgb(240, 120, 124));
         }
 
         BarData data = new BarData(xVals, set);
         data.setValueTextSize(10f);
         data.setValueTypeface(mTf);
         data.setDrawValues(false);
+        data.setBarWidth(0.8f);
 
         mChart.setData(data);
     }

MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartPositiveNegative.java

@@ -119,14 +119,14 @@ private void setData(List<Data> dataList) {
             mChart.notifyDataSetChanged();
         } else {
             set = new BarDataSet(values, "Values");
-            set.setBarSpace(40f);
             set.setColors(colors);
             set.setValueTextColors(colors);
 
             BarData data = new BarData(dates, set);
             data.setValueTextSize(13f);
             data.setValueTypeface(mTf);
             data.setValueFormatter(new ValueFormatter());
+            data.setBarWidth(0.8f);
 
             mChart.setData(data);
             mChart.invalidate();

MPChartExample/src/com/xxmassdeveloper/mpchartexample/ListViewBarChartActivity.java

@@ -135,15 +135,15 @@ private BarData generateData(int cnt) {
             entries.add(new BarEntry((int) (Math.random() * 70) + 30, i));
         }
 
-        BarDataSet d = new BarDataSet(entries, "New DataSet " + cnt);    
-        d.setBarSpace(20f);
+        BarDataSet d = new BarDataSet(entries, "New DataSet " + cnt);
         d.setColors(ColorTemplate.VORDIPLOM_COLORS);
         d.setBarShadowColor(Color.rgb(203, 203, 203));
 
         ArrayList<IBarDataSet> sets = new ArrayList<IBarDataSet>();
         sets.add(d);
 
         BarData cd = new BarData(getMonths(), sets);
+        cd.setBarWidth(0.9f);
         return cd;
     }
 }

MPChartExample/src/com/xxmassdeveloper/mpchartexample/ListViewMultiChartActivity.java

@@ -143,11 +143,11 @@ private BarData generateDataBar(int cnt) {
         }
 
         BarDataSet d = new BarDataSet(entries, "New DataSet " + cnt);
-        d.setBarSpace(20f);
         d.setColors(ColorTemplate.VORDIPLOM_COLORS);
         d.setHighLightAlpha(255);
 
         BarData cd = new BarData(getMonths(), d);
+        cd.setBarWidth(0.9f);
         return cd;
     }
 

MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivityNegative.java

@@ -96,7 +96,6 @@ protected void onCreate(Bundle savedInstanceState) {
         set.setValueFormatter(new CustomFormatter());
         set.setValueTextSize(7f);
         set.setAxisDependency(YAxis.AxisDependency.RIGHT);
-        set.setBarSpace(40f);
         set.setColors(new int[] {Color.rgb(67,67,72), Color.rgb(124,181,236)});
         set.setStackLabels(new String[]{
                 "Men", "Women"
@@ -110,6 +109,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         BarData data = new BarData(xVals, set);
+        data.setBarWidth(0.8f);
         mChart.setData(data);
         mChart.invalidate();
     }

MPChartLib/src/main/java/com/github/mikephil/charting/buffer/BarBuffer.java

@@ -6,7 +6,6 @@
 
 public class BarBuffer extends AbstractBuffer<IBarDataSet> {
 
-    protected float mBarSpace = 0f;
     protected float mGroupSpace = 0f;
     protected int mDataSetIndex = 0;
     protected int mDataSetCount = 1;
@@ -27,10 +26,6 @@ public void setBarWidth(float barWidth) {
         this.mBarWidth = barWidth;
     }
 
-    public void setBarSpace(float barspace) {
-        this.mBarSpace = barspace;
-    }
-
     public void setDataSet(int index) {
         this.mDataSetIndex = index;
     }

MPChartLib/src/main/java/com/github/mikephil/charting/buffer/HorizontalBarBuffer.java

@@ -14,26 +14,23 @@ public HorizontalBarBuffer(int size, float groupspace, int dataSetCount, boolean
     public void feed(IBarDataSet data) {
 
         float size = data.getEntryCount() * phaseX;
-
-        int dataSetOffset = (mDataSetCount - 1);
-        float barSpaceHalf = mBarSpace / 2f;
-        float groupSpaceHalf = mGroupSpace / 2f;
-        float barWidth = 0.5f;
+        float barWidthHalf = mBarWidth / 2f;
 
         for (int i = 0; i < size; i++) {
 
             BarEntry e = data.getEntryForIndex(i);
 
-            // calculate the xPx-position, depending on datasetcount
-            float x = e.getX() + e.getX() * dataSetOffset + mDataSetIndex
-                    + mGroupSpace * e.getX() + groupSpaceHalf;
+            if(e == null)
+                continue;
+
+            float x = e.getX();
             float y = e.getY();
             float[] vals = e.getYVals();
 
             if (!mContainsStacks || vals == null) {
 
-                float bottom = x - barWidth + barSpaceHalf;
-                float top = x + barWidth - barSpaceHalf;
+                float top = x - barWidthHalf;
+                float bottom = x + barWidthHalf;
                 float left, right;
                 if (mInverted) {
                     left = y >= 0 ? y : 0;
@@ -72,8 +69,8 @@ public void feed(IBarDataSet data) {
                         negY += Math.abs(value);
                     }
 
-                    float bottom = x - barWidth + barSpaceHalf;
-                    float top = x + barWidth - barSpaceHalf;
+                    float top = x - barWidthHalf;
+                    float bottom = x + barWidthHalf;
                     float left, right;
                     if (mInverted) {
                         left = y >= yStart ? y : yStart;

MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.java

@@ -106,15 +106,13 @@ public RectF getBarBounds(BarEntry e) {
 		if (set == null)
 			return null;
 
-		float barspace = set.getBarSpace();
 		float y = e.getY();
 		float x = e.getX();
 
-		float barWidth = 0.5f;
+		float barWidth = mData.getBarWidth();
 
-		float spaceHalf = barspace / 2f;
-		float left = x - barWidth + spaceHalf;
-		float right = x + barWidth - spaceHalf;
+		float left = x - barWidth / 2f;
+		float right = x + barWidth / 2f;
 		float top = y >= 0 ? y : 0;
 		float bottom = y <= 0 ? y : 0;
 

MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.java

@@ -152,14 +152,13 @@ public RectF getBarBounds(BarEntry e) {
         if (set == null)
             return null;
 
-        float barspace = set.getBarSpace();
         float y = e.getY();
         float x = e.getX();
 
-        float spaceHalf = barspace / 2f;
+        float barWidth = mData.getBarWidth();
 
-        float top = x - 0.5f + spaceHalf;
-        float bottom = x + 0.5f - spaceHalf;
+        float top = x - barWidth / 2f;
+        float bottom = x + barWidth / 2f;
         float left = y >= 0 ? y : 0;
         float right = y <= 0 ? y : 0;
 

MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.java

@@ -10,11 +10,6 @@
 
 public class BarDataSet extends BarLineScatterCandleBubbleDataSet<BarEntry> implements IBarDataSet {
 
-    /**
-     * space indicator between the bars 0.1f == 10 %
-     */
-    private float mBarSpace = 0.15f;
-
     /**
      * the maximum number of bars that are stacked upon each other, this yValue
      * is calculated from the Entries that are added to the DataSet
@@ -68,7 +63,6 @@ public DataSet<BarEntry> copy() {
         BarDataSet copied = new BarDataSet(yVals, getLabel());
         copied.mColors = mColors;
         copied.mStackSize = mStackSize;
-        copied.mBarSpace = mBarSpace;
         copied.mBarShadowColor = mBarShadowColor;
         copied.mStackLabels = mStackLabels;
         copied.mHighLightColor = mHighLightColor;
@@ -185,30 +179,6 @@ public int getEntryCountStacks() {
         return mEntryCountStacks;
     }
 
-    /**
-     * returns the space between bars in percent of the whole width of one yValue
-     *
-     * @return
-     */
-    public float getBarSpacePercent() {
-        return mBarSpace * 100f;
-    }
-
-    @Override
-    public float getBarSpace() {
-        return mBarSpace;
-    }
-
-    /**
-     * Sets the space between the bars in values (not pixels).
-     * Default 0.15f
-     *
-     * @param barSpace
-     */
-    public void setBarSpace(float barSpace) {
-        mBarSpace = barSpace;
-    }
-
     /**
      * Sets the color used for drawing the bar-shadows. The bar shadows is a
      * surface behind the bar that indicates the maximum yValue. Don't for get to