Merge pull request #108 from mklkj/feature/bar-chart-rounded

Add option to make bars rounded in bar chart

Author: hannesa2

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartActivity.java

@@ -70,6 +70,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         chart = findViewById(R.id.chart1);
         chart.setOnChartValueSelectedListener(this);
+        chart.setRoundedBarRadius(50f);
 
         chart.setDrawBarShadow(false);
         chart.setDrawValueAboveBar(true);

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

@@ -36,6 +36,16 @@ public class BarChart extends BarLineChartBase<BarData> implements BarDataProvid
      */
     private boolean mDrawBarShadow = false;
 
+    /**
+     * if set to true, the bar chart's bars would be round on all corners instead of rectangular
+     */
+    private boolean mDrawRoundedBars;
+
+    /**
+     * the radius of the rounded bar chart bars
+     */
+    private float mRoundedBarRadius = 0f;
+
     private boolean mFitBars = false;
 
     public BarChart(Context context) {
@@ -54,7 +64,7 @@ public BarChart(Context context, AttributeSet attrs, int defStyle) {
     protected void init() {
         super.init();
 
-        mRenderer = new BarChartRenderer(this, mAnimator, mViewPortHandler);
+        mRenderer = new BarChartRenderer(this, mAnimator, mViewPortHandler, mDrawRoundedBars, mRoundedBarRadius);
 
         setHighlighter(new BarHighlighter(this));
 
@@ -255,4 +265,14 @@ public void groupBars(float fromX, float groupSpace, float barSpace) {
             notifyDataSetChanged();
         }
     }
+    /**
+     * Used to enable rounded bar chart bars and set the radius of the rounded bars
+     *
+     * @param mRoundedBarRadius - the radius of the rounded bars
+     */
+    public void setRoundedBarRadius(float mRoundedBarRadius) {
+        this.mRoundedBarRadius = mRoundedBarRadius;
+        this.mDrawRoundedBars = true;
+        init();
+    }
 }

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.java

@@ -37,6 +37,16 @@ public class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
     protected Paint mShadowPaint;
     protected Paint mBarBorderPaint;
 
+    /**
+     * if set to true, the bar chart's bars would be round on all corners instead of rectangular
+     */
+    private boolean mDrawRoundedBars;
+
+    /**
+     * the radius of the rounded bar chart bars
+     */
+    private float mRoundedBarRadius = 0f;
+
     public BarChartRenderer(BarDataProvider chart, ChartAnimator animator,
                             ViewPortHandler viewPortHandler) {
         super(animator, viewPortHandler);
@@ -55,6 +65,13 @@ public BarChartRenderer(BarDataProvider chart, ChartAnimator animator,
         mBarBorderPaint.setStyle(Paint.Style.STROKE);
     }
 
+    public BarChartRenderer(BarDataProvider chart, ChartAnimator animator,
+                            ViewPortHandler viewPortHandler, boolean mDrawRoundedBars, float mRoundedBarRadius) {
+        this(chart, animator, viewPortHandler);
+        this.mDrawRoundedBars = mDrawRoundedBars;
+        this.mRoundedBarRadius = mRoundedBarRadius;
+    }
+
     @Override
     public void initBuffers() {
 
@@ -133,7 +150,11 @@ protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {
                 mBarShadowRectBuffer.top = mViewPortHandler.contentTop();
                 mBarShadowRectBuffer.bottom = mViewPortHandler.contentBottom();
 
-                c.drawRect(mBarShadowRectBuffer, mShadowPaint);
+				if (mDrawRoundedBars) {
+					c.drawRoundRect(mBarShadowRectBuffer, mRoundedBarRadius, mRoundedBarRadius, mShadowPaint);
+				} else {
+					c.drawRect(mBarShadowRectBuffer, mShadowPaint);
+				}
             }
         }
 
@@ -178,16 +199,27 @@ protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {
                                 buffer.buffer[j + 1],
                                 buffer.buffer[j + 2],
                                 buffer.buffer[j + 3],
-                                isInverted ? Fill.Direction.DOWN : Fill.Direction.UP);
+                                isInverted ? Fill.Direction.DOWN : Fill.Direction.UP,
+                                mRoundedBarRadius);
             }
             else {
-                c.drawRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
-                        buffer.buffer[j + 3], mRenderPaint);
+                if (mDrawRoundedBars) {
+					c.drawRoundRect(new RectF(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
+							buffer.buffer[j + 3]), mRoundedBarRadius, mRoundedBarRadius, mRenderPaint);
+				} else {
+					c.drawRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
+							buffer.buffer[j + 3], mRenderPaint);
+				}
             }
 
             if (drawBorder) {
-                c.drawRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
-                        buffer.buffer[j + 3], mBarBorderPaint);
+				if (mDrawRoundedBars) {
+					c.drawRoundRect(new RectF(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
+							buffer.buffer[j + 3]), mRoundedBarRadius, mRoundedBarRadius, mBarBorderPaint);
+				} else {
+					c.drawRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
+							buffer.buffer[j + 3], mBarBorderPaint);
+				}
             }
         }
     }
@@ -487,7 +519,11 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
 
             setHighlightDrawPos(high, mBarRect);
 
-            c.drawRect(mBarRect, mHighlightPaint);
+            if (mDrawRoundedBars) {
+				c.drawRoundRect(new RectF(mBarRect), mRoundedBarRadius, mRoundedBarRadius, mHighlightPaint);
+			} else {
+				c.drawRect(mBarRect, mHighlightPaint);
+			}
         }
     }
 

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.java

@@ -143,7 +143,8 @@ protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {
                                 buffer.buffer[j + 1],
                                 buffer.buffer[j + 2],
                                 buffer.buffer[j + 3],
-                                isInverted ? Fill.Direction.LEFT : Fill.Direction.RIGHT);
+                                isInverted ? Fill.Direction.LEFT : Fill.Direction.RIGHT,
+                                0);
             }
             else {
                 c.drawRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],

MPChartLib/src/main/java/com/github/mikephil/charting/utils/Fill.java

@@ -160,7 +160,7 @@ private void calculateFinalColor()
 
     public void fillRect(Canvas c, Paint paint,
                          float left, float top, float right, float bottom,
-                         Direction gradientDirection)
+                         Direction gradientDirection, float mRoundedBarRadius)
     {
         switch (mType)
         {
@@ -190,7 +190,7 @@ public void fillRect(Canvas c, Paint paint,
                     paint.setStyle(Paint.Style.FILL);
                     paint.setColor(mFinalColor);
 
-                    c.drawRect(left, top, right, bottom, paint);
+                    c.drawRoundRect(new RectF(left, top, right, bottom), mRoundedBarRadius, mRoundedBarRadius, paint);
 
                     // restore
                     paint.setColor(previousColor);
@@ -230,7 +230,7 @@ public void fillRect(Canvas c, Paint paint,
 
                 paint.setShader(gradient);
 
-                c.drawRect(left, top, right, bottom, paint);
+                c.drawRoundRect(new RectF(left, top, right, bottom), mRoundedBarRadius, mRoundedBarRadius, paint);
             }
             break;