Fix #242 => Add AABubble for AAPlotOptions

Author: AAChartModel

AAInfographics/AAChartCreator/AASeriesElement.swift

@@ -52,8 +52,9 @@
     public var colorByPoint: Bool?         //When using automatic point colors pulled from the `options.colors` collection, this option determines whether the chart should receive one color per series or one color per point.
     public var allowPointSelect: Bool?     //Allow this series' points to be selected by clicking on the markers, bars or pie slices
     public var zIndex: Int?                //Define the visual z index of the series.
-    public var size: Any?                  //The innder size for pie chart
-    public var innerSize: String?          //The innder size for pie chart
+    public var size: Any?                  //The innder size for pie chart (String | Number)
+    public var innerSize: Any?             //The innder size for pie chart (String | Number)
+    public var minSize: Any?               //The minimum size for a pie in response to auto margins, Only useful for pie, bubble, funnel, Pyramid (String | Number)
     public var shadow: AAShadow?
     public var zones: [AAZonesElement]?
     public var zoneAxis: String?           //Defines the Axis on which the zones are applied. defalut value：y.
@@ -197,11 +198,17 @@
     }
 
     @discardableResult
-    public func innerSize(_ prop: String) -> AASeriesElement {
+    public func innerSize(_ prop: Any) -> AASeriesElement {
         innerSize = prop
         return self
     }
 
+    @discardableResult
+    public func minSize(_ prop: Any) -> AASeriesElement {
+        minSize = prop
+        return self
+    }
+        
     @discardableResult
     public func shadow(_ prop: AAShadow) -> AASeriesElement {
         shadow = prop

AAInfographics/AAOptionsModel/AAPlotOptions.swift

@@ -40,6 +40,7 @@ public class AAPlotOptions: AAObject {
     public var area: AAArea?
     public var areaspline: AAAreaspline?
     public var pie: AAPie?
+    public var bubble: AABubble?
     public var columnrange: AAColumnrange?
     public var arearange: AAArearange?
     public var series: AASeries?
@@ -51,20 +52,14 @@ public class AAPlotOptions: AAObject {
     }
 
     @discardableResult
-    public func line(_ prop: AALine) -> AAPlotOptions {
-        line = prop
-        return self
-    }
-    
-    @discardableResult
-    public func pie(_ prop: AAPie) -> AAPlotOptions {
-        pie = prop
+    public func bar(_ prop: AABar) -> AAPlotOptions {
+        bar = prop
         return self
     }
 
     @discardableResult
-    public func bar(_ prop: AABar) -> AAPlotOptions {
-        bar = prop
+    public func line(_ prop: AALine) -> AAPlotOptions {
+        line = prop
         return self
     }
 
@@ -86,6 +81,18 @@ public class AAPlotOptions: AAObject {
         return self
     }
 
+    @discardableResult
+    public func pie(_ prop: AAPie) -> AAPlotOptions {
+        pie = prop
+        return self
+    }
+    
+    @discardableResult
+    public func bubble(_ prop: AABubble) -> AAPlotOptions {
+        bubble = prop
+        return self
+    }
+    
     @discardableResult
     public func columnrange(_ prop: AAColumnrange) -> AAPlotOptions {
         columnrange = prop
@@ -449,6 +456,48 @@ public class AAPie: AAObject {
 
 }
 
+public class AABubble: AAObject {
+    public var minSize: Float?
+    public var maxSize: Float?
+    public var zMin: Float?
+    public var zMax: Float?
+    public var dataLabels:AADataLabels?
+    
+    @discardableResult
+    public func minSize(_ prop: Float?) -> AABubble {
+        minSize = prop
+        return self
+    }
+    
+    @discardableResult
+    public func maxSize(_ prop: Float?) -> AABubble {
+        maxSize = prop
+        return self
+    }
+    
+    @discardableResult
+    public func zMin(_ prop: Float?) -> AABubble {
+        zMin = prop
+        return self
+    }
+    
+    @discardableResult
+    public func zMax(_ prop: Float?) -> AABubble {
+        zMax = prop
+        return self
+    }
+    
+    @discardableResult
+    public func dataLabels(_ prop: AADataLabels?) -> AABubble {
+        dataLabels = prop
+        return self
+    }
+    
+    public override init() {
+        
+    }
+}
+
 public class AAColumnrange: AAObject {
     public var borderRadius: Float?//The color of the border surrounding each column or bar
     public var borderWidth: Float?//The corner radius of the border surrounding each column or bar. default：0