Allow bubble sizes to not be normalized against the dataset max (#930)

ChartsOrg · Apr 13, 2016 · 3938d5b · 3938d5b
1 parent 375d7ba
commit 3938d5b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/Charts/Classes/Data/Implementations/Standard/BubbleChartDataSet.swift b/Charts/Classes/Data/Implementations/Standard/BubbleChartDataSet.swift
@@ -24,6 +24,8 @@ public class BubbleChartDataSet: BarLineScatterCandleBubbleChartDataSet, IBubble
     public var xMin: Double { return _xMin }
     public var xMax: Double { return _xMax }
     public var maxSize: CGFloat { return _maxSize }
+    public var normalizeSizeEnabled: Bool = true
+    public var isNormalizeSizeEnabled: Bool { return normalizeSizeEnabled }
 
     public override func calcMinMax(start start: Int, end: Int)
     {

diff --git a/Charts/Classes/Data/Interfaces/IBubbleChartDataSet.swift b/Charts/Classes/Data/Interfaces/IBubbleChartDataSet.swift
@@ -22,6 +22,7 @@ public protocol IBubbleChartDataSet: IBarLineScatterCandleBubbleChartDataSet
     var xMin: Double { get }
     var xMax: Double { get }
     var maxSize: CGFloat { get }
+    var isNormalizeSizeEnabled: Bool { get }
 
     // MARK: - Styling functions and accessors
 

diff --git a/Charts/Classes/Renderers/BubbleChartRenderer.swift b/Charts/Classes/Renderers/BubbleChartRenderer.swift
@@ -41,9 +41,15 @@ public class BubbleChartRenderer: ChartDataRendererBase
         }
     }
 
-    private func getShapeSize(entrySize entrySize: CGFloat, maxSize: CGFloat, reference: CGFloat) -> CGFloat
+    private func getShapeSize(
+        entrySize entrySize: CGFloat,
+                  maxSize: CGFloat,
+                  reference: CGFloat,
+                  normalizeSize: Bool) -> CGFloat
     {
-        let factor: CGFloat = (maxSize == 0.0) ? 1.0 : sqrt(entrySize / maxSize)
+        let factor: CGFloat = normalizeSize
+            ? ((maxSize == 0.0) ? 1.0 : sqrt(entrySize / maxSize))
+            : entrySize
         let shapeSize: CGFloat = reference * factor
         return shapeSize
     }
@@ -84,6 +90,8 @@ public class BubbleChartRenderer: ChartDataRendererBase
 
         CGContextSaveGState(context)
 
+        let normalizeSize = dataSet.isNormalizeSizeEnabled
+
         // calcualte the full width of 1 step on the x-axis
         let maxBubbleWidth: CGFloat = abs(_sizeBuffer[1].x - _sizeBuffer[0].x)
         let maxBubbleHeight: CGFloat = abs(viewPortHandler.contentBottom - viewPortHandler.contentTop)
@@ -97,7 +105,7 @@ public class BubbleChartRenderer: ChartDataRendererBase
             _pointBuffer.y = CGFloat(entry.value) * phaseY
             _pointBuffer = CGPointApplyAffineTransform(_pointBuffer, valueToPixelMatrix)
 
-            let shapeSize = getShapeSize(entrySize: entry.size, maxSize: dataSet.maxSize, reference: referenceSize)
+            let shapeSize = getShapeSize(entrySize: entry.size, maxSize: dataSet.maxSize, reference: referenceSize, normalizeSize: normalizeSize)
             let shapeHalf = shapeSize / 2.0
 
             if (!viewPortHandler.isInBoundsTop(_pointBuffer.y + shapeHalf)
@@ -261,6 +269,8 @@ public class BubbleChartRenderer: ChartDataRendererBase
 
             trans.pointValuesToPixel(&_sizeBuffer)
 
+            let normalizeSize = dataSet.isNormalizeSizeEnabled
+
             // calcualte the full width of 1 step on the x-axis
             let maxBubbleWidth: CGFloat = abs(_sizeBuffer[1].x - _sizeBuffer[0].x)
             let maxBubbleHeight: CGFloat = abs(viewPortHandler.contentBottom - viewPortHandler.contentTop)
@@ -270,7 +280,7 @@ public class BubbleChartRenderer: ChartDataRendererBase
             _pointBuffer.y = CGFloat(entry.value) * phaseY
             trans.pointValueToPixel(&_pointBuffer)
 
-            let shapeSize = getShapeSize(entrySize: entry.size, maxSize: dataSet.maxSize, reference: referenceSize)
+            let shapeSize = getShapeSize(entrySize: entry.size, maxSize: dataSet.maxSize, reference: referenceSize, normalizeSize: normalizeSize)
             let shapeHalf = shapeSize / 2.0
 
             if (!viewPortHandler.isInBoundsTop(_pointBuffer.y + shapeHalf)

diff --git a/ChartsRealm/Classes/Data/RealmBubbleDataSet.swift b/ChartsRealm/Classes/Data/RealmBubbleDataSet.swift
@@ -60,6 +60,8 @@ public class RealmBubbleDataSet: RealmBarLineScatterCandleBubbleDataSet, IBubble
     public var xMin: Double { return _xMin }
     public var xMax: Double { return _xMax }
     public var maxSize: CGFloat { return _maxSize }
+    public var normalizeSizeEnabled: Bool = true
+    public var isNormalizeSizeEnabled: Bool { return normalizeSizeEnabled }
 
     internal override func buildEntryFromResultObject(object: RLMObject, atIndex: UInt) -> ChartDataEntry
     {