added horizontal chart bar gradient

ChartsOrg · Feb 17, 2018 · abfaadb · abfaadb
1 parent 85c0c8d
commit abfaadb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/Source/Charts/Renderers/BarChartRenderer.swift b/Source/Charts/Renderers/BarChartRenderer.swift
@@ -296,22 +296,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
                 break
             }
 
-            context.saveGState()
-            if let gradientColors = dataSet.barGradientColors, gradientColors.count > 0
-            {
-                if let gradientColor = dataSet.barGradientColor(atIndex: j)
-                {
-                    drawGradient(context: context, barRect: barRect, gradientColors: gradientColor, orientation: dataSet.barGradientOrientation)
-                }
-            }
-            else
-            {
-                // Set the color for the currently drawn value. If the index is out of bounds, reuse colors.
-                let fillColor = dataSet.color(atIndex: j).cgColor
-                context.setFillColor(fillColor)
-                context.fill(barRect)
-            }
-            context.restoreGState()
+            drawBar(context: context, dataSet: dataSet, index: j, barRect: barRect)
 
             if drawBorder
             {
@@ -326,6 +311,28 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
         context.restoreGState()
     }
 
+    open func drawBar(context: CGContext, dataSet: IBarChartDataSet, index: Int, barRect: CGRect)
+    {
+        context.saveGState()
+
+        if let gradientColors = dataSet.barGradientColors, gradientColors.count > 0
+        {
+            if let gradientColor = dataSet.barGradientColor(atIndex: index)
+            {
+                drawGradient(context: context, barRect: barRect, gradientColors: gradientColor, orientation: dataSet.barGradientOrientation)
+            }
+        }
+        else
+        {
+            // Set the color for the currently drawn value. If the index is out of bounds, reuse colors.
+            let fillColor = dataSet.color(atIndex: index).cgColor
+            context.setFillColor(fillColor)
+            context.fill(barRect)
+        }
+
+        context.restoreGState()
+    }
+
     open func drawGradient(context: CGContext, barRect: CGRect, gradientColors: Array<NSUIColor>, orientation: BarChartDataSet.BarGradientOrientation)
     {
         let cgColors = gradientColors.map{ $0.cgColor } as CFArray

diff --git a/Source/Charts/Renderers/HorizontalBarChartRenderer.swift b/Source/Charts/Renderers/HorizontalBarChartRenderer.swift
@@ -248,10 +248,7 @@ open class HorizontalBarChartRenderer: BarChartRenderer
                 continue
             }
 
-            // Set the color for the currently drawn value. If the index is out of bounds, reuse colors.
-            context.setFillColor(dataSet.color(atIndex: j).cgColor)
-
-            context.fill(barRect)
+            drawBar(context: context, dataSet: dataSet, index: j, barRect: barRect)
 
             if drawBorder
             {