Fix #168 finally

Author: AAChartModel

AAInfographics/AAChartCreator/AASeriesElement.swift

@@ -32,28 +32,28 @@
 
  public class AASeriesElement: AAObject {
 
-    private var type: String?               //A chart type series. If the type option is not specified, it is inherited from `chart.type`.
-    private var name: String?               //The name of the series as shown in the legend, tooltip etc.
-    private var data: [Any]?                //An array of data points for the series
-    private var color: Any?                 //The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the options.colors array.
-    private var lineWidth: Float?           //折线图、曲线图、直方折线图、折线填充图、曲线填充图、直方折线填充图的线条宽度
-    private var borderWidth: Float?         //柱形图、条形图、扇形图等图形的描边宽度
-    private var borderColor: String?        //柱形图、条形图、扇形图等图形的描边颜色
-    private var fillColor: Any?             //折线填充图、曲线填充图、直方折线填充图等填充图类型的填充颜色
-    private var fillOpacity: Float?         //折线填充图、曲线填充图、直方折线填充图等填充图类型的填充颜色透明度 Fill opacity for the area. Note that when you set an explicit fillColor, the fillOpacity is not applied. Instead, you should define the opacity in the fillColor with an rgba color definition. 默认是：0.75. https://api.hcharts.cn/highcharts#plotOptions.area.fillOpacity
-    private var threshold: Float?           //The threshold, also called zero level or base level. For line type series this is only used in conjunction with negativeColor. default：0.
-    private var negativeColor: String?      //The color for the parts of the graph or points that are below the threshold
-    private var dashStyle: String?          //A name for the dash style to use for the graph. Applies only to series type having a graph, like line, spline, area and scatter in case it has a lineWidth.
-    private var dataLabels: AADataLabels?  //Individual data label for each point. The options are the same as the ones for `plotOptions.series.dataLabels`.
-    private var marker: AAMarker?      //Enable or disable the point marker. If null, the markers are hidden when the data is dense, and shown for more widespread data points.
-    private var step: Any?                  //Whether to apply steps to the line. Possible values are left, center and right.
-    private 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.
-    private var allowPointSelect: Bool?     //Allow this series' points to be selected by clicking on the markers, bars or pie slices
-    private var zIndex: Int?                //Define the visual z index of the series.
-    private var innerSize: String?          //内部圆环半径大小占比(内部圆环半径/扇形图半径)
-    private var shadow: Any?
-    private var zones: [Any]?
-    private var stack: String?
+    public var type: String?               //A chart type series. If the type option is not specified, it is inherited from `chart.type`.
+    public var name: String?               //The name of the series as shown in the legend, tooltip etc.
+    public var data: [Any]?                //An array of data points for the series
+    public var color: Any?                 //The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the options.colors array.
+    public var lineWidth: Float?           //折线图、曲线图、直方折线图、折线填充图、曲线填充图、直方折线填充图的线条宽度
+    public var borderWidth: Float?         //柱形图、条形图、扇形图等图形的描边宽度
+    public var borderColor: String?        //柱形图、条形图、扇形图等图形的描边颜色
+    public var fillColor: Any?             //折线填充图、曲线填充图、直方折线填充图等填充图类型的填充颜色
+    public var fillOpacity: Float?         //折线填充图、曲线填充图、直方折线填充图等填充图类型的填充颜色透明度 Fill opacity for the area. Note that when you set an explicit fillColor, the fillOpacity is not applied. Instead, you should define the opacity in the fillColor with an rgba color definition. 默认是：0.75. https://api.hcharts.cn/highcharts#plotOptions.area.fillOpacity
+    public var threshold: Float?           //The threshold, also called zero level or base level. For line type series this is only used in conjunction with negativeColor. default：0.
+    public var negativeColor: String?      //The color for the parts of the graph or points that are below the threshold
+    public var dashStyle: String?          //A name for the dash style to use for the graph. Applies only to series type having a graph, like line, spline, area and scatter in case it has a lineWidth.
+    public var dataLabels: AADataLabels?  //Individual data label for each point. The options are the same as the ones for `plotOptions.series.dataLabels`.
+    public var marker: AAMarker?      //Enable or disable the point marker. If null, the markers are hidden when the data is dense, and shown for more widespread data points.
+    public var step: Any?                  //Whether to apply steps to the line. Possible values are left, center and right.
+    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 innerSize: String?          //内部圆环半径大小占比(内部圆环半径/扇形图半径)
+    public var shadow: Any?
+    public var zones: [Any]?
+    public var stack: String?
 
     @discardableResult
     public func type(_ prop: AAChartType) -> AASeriesElement {
@@ -192,11 +192,11 @@
 }
 
 public class AADataElement: AAObject {
-    private var name: String?
-    private var y: Float?
-    private var color: Any?
-    private var dataLabels: AADataLabels?
-    private var marker: AAMarker?
+    public var name: String?
+    public var y: Float?
+    public var color: Any?
+    public var dataLabels: AADataLabels?
+    public var marker: AAMarker?
 
     @discardableResult
     public func name(_ prop: String) -> AADataElement {
@@ -230,11 +230,11 @@ public class AADataElement: AAObject {
 }
 
 public class AAShadow: AAObject {
-    private var color: String?
-    private var offsetX: Float?
-    private var offsetY: Float?
-    private var opacity: Float?
-    private var width: Float?
+    public var color: String?
+    public var offsetX: Float?
+    public var offsetY: Float?
+    public var opacity: Float?
+    public var width: Float?
 
     @discardableResult
     public func color(_ prop: String) -> AAShadow {

AAInfographics/AAOptionsModel/AACrosshair.swift

@@ -33,9 +33,9 @@
 import UIKit
 
 public class AACrosshair: AAObject {
-    private var dashStyle: String? //准星线样式
-    private var color: String?  //准星线颜色
-    private var width: Float?  //准星线宽度
+    public var dashStyle: String? //准星线样式
+    public var color: String?  //准星线颜色
+    public var width: Float?  //准星线宽度
 
     @discardableResult
     public func dashStyle(_ prop: AALineDashStyleType) -> AACrosshair {

AAInfographics/AAOptionsModel/AADataLabels.swift

@@ -33,22 +33,22 @@
 import UIKit
 
 public class AADataLabels: AAObject {
-    private var enabled: Bool?
-    private var style: AAStyle?
-    private var format: String?
-    private var rotation: Float?
-    private var allowOverlap: Bool?
-    private var useHTML: Bool?
-    private var distance: Float?
-    private var verticalAlign: String?
-    private var x: Float?
-    private var y: Float?
-    private var color: String?
-    private var backgroundColor: String?
-    private var borderColor: String?
-    private var borderRadius: Float?
-    private var borderWidth: Float?
-    private var shape: String?
+    public var enabled: Bool?
+    public var style: AAStyle?
+    public var format: String?
+    public var rotation: Float?
+    public var allowOverlap: Bool?
+    public var useHTML: Bool?
+    public var distance: Float?
+    public var verticalAlign: String?
+    public var x: Float?
+    public var y: Float?
+    public var color: String?
+    public var backgroundColor: String?
+    public var borderColor: String?
+    public var borderRadius: Float?
+    public var borderWidth: Float?
+    public var shape: String?
 
     @discardableResult
     public func enabled(_ prop: Bool?) -> AADataLabels {
@@ -151,10 +151,10 @@ public class AADataLabels: AAObject {
 }
 
 public class AAStyle: AAObject {
-    private var color: String?
-    private var fontSize: String?
-    private var fontWeight: String?
-    private var textOutline: String?
+    public var color: String?
+    public var fontSize: String?
+    public var fontWeight: String?
+    public var textOutline: String?
 
     @discardableResult
     public func color(_ prop: String?) -> AAStyle {

AAInfographics/AAOptionsModel/AALabel.swift

@@ -32,15 +32,15 @@
 import UIKit
 
 public class AALabel: AAObject {
-    private var align :String?//轴标签的对齐方式，可用的值有 "left"、"center" 及 "right"。默认值是根据坐标轴的位置（在图表中的位置）即标签的旋转角度进行智能判断的。 默认是：center.
-    private var rotation: Float?//轴标签的旋转角度 默认是：0.
-    private var text: String?//文字
-    private var textAlign: String?//文字对齐
-    private var useHTML: Bool?//HTML渲染
-    private var verticalAlign: String?//竖直对齐
-    private var style: AAStyle?//轴标签的 CSS 样式
-    private var x: Float?//相对于坐标轴刻度线的水平偏移。 默认是：0.
-    private var y: Float?//相对于坐标轴刻度线的垂直平偏移。 默认是：null.
+    public var align :String?//轴标签的对齐方式，可用的值有 "left"、"center" 及 "right"。默认值是根据坐标轴的位置（在图表中的位置）即标签的旋转角度进行智能判断的。 默认是：center.
+    public var rotation: Float?//轴标签的旋转角度 默认是：0.
+    public var text: String?//文字
+    public var textAlign: String?//文字对齐
+    public var useHTML: Bool?//HTML渲染
+    public var verticalAlign: String?//竖直对齐
+    public var style: AAStyle?//轴标签的 CSS 样式
+    public var x: Float?//相对于坐标轴刻度线的水平偏移。 默认是：0.
+    public var y: Float?//相对于坐标轴刻度线的垂直平偏移。 默认是：null.
 
     @discardableResult
     public func align(_ prop: String) -> AALabel {

AAInfographics/AAOptionsModel/AALabels.swift

@@ -33,21 +33,21 @@
 import UIKit
 
 public class AALabels: AAObject {
-    private var align :String?//轴标签的对齐方式，可用的值有 "left"、"center" 及 "right"。默认值是根据坐标轴的位置（在图表中的位置）即标签的旋转角度进行智能判断的。 默认是：center.
-    private var autoRotation: AnyObject? //只针对水平轴有效，允许在防止轴标签重叠时自动旋转轴标签的角度。当空间足够时，轴标签不会被旋转。当图表变小时（主要是宽度变小） ，轴标签开始旋转对应的角度，然后会依次删除间隔的轴标签并尝试旋转数组中的角度。可以通过将此参数设置为 false 来关闭轴标签旋转（这将导致标签自动换行）。 默认是：[-45].
-    private var autoRotationLimit: Float?//当每个分类的宽度比该参数的值大很多（像素）时，轴标签将不会被自动旋转，而是以换行的形式展示轴标签。 当轴标签包含多个短词时换行展示轴标签可以使得轴标签有足够的空间，所以设置合理的自动旋转下限是非常有意义的。 默认是：80.
-    private var distance: Float?//只针对极地图有效，定义周标签与绘图区边缘的距离。 默认是：15.
-    private var enabled: Bool?//是否显示坐标轴标签 默认是：true.
-    private var format: String?//坐标轴格式化字符串。 默认是：{value}.
-    private var formatter: String?//坐标轴格式化字符串。 默认是：{value}.
-    private var padding: Float?//轴标签的内间距，作用是保证轴标签之间有空隙。 默认是：5.
-    private var rotation: Float?//轴标签的旋转角度 默认是：0.
-    private var staggerLines: Int?//只针对水平轴有效，定义轴标签显示行数。
-    private var step: Int?//显示 n 的倍数标签，例如设置为 2 则表示标签间隔一个轴标签显示。默认情况下，为了避免轴标签被覆盖，该参数会根据情况自动计算。可以通过设置此参数为 1 来阻止自动计算。
-    private var style: AAStyle?//轴标签的 CSS 样式
-    private var x: Float?//相对于坐标轴刻度线的水平偏移。 默认是：0.
-    private var y: Float?//相对于坐标轴刻度线的垂直平偏移。 默认是：null.
-    private var useHTML: Bool?//HTML渲染
+    public var align :String?//轴标签的对齐方式，可用的值有 "left"、"center" 及 "right"。默认值是根据坐标轴的位置（在图表中的位置）即标签的旋转角度进行智能判断的。 默认是：center.
+    public var autoRotation: AnyObject? //只针对水平轴有效，允许在防止轴标签重叠时自动旋转轴标签的角度。当空间足够时，轴标签不会被旋转。当图表变小时（主要是宽度变小） ，轴标签开始旋转对应的角度，然后会依次删除间隔的轴标签并尝试旋转数组中的角度。可以通过将此参数设置为 false 来关闭轴标签旋转（这将导致标签自动换行）。 默认是：[-45].
+    public var autoRotationLimit: Float?//当每个分类的宽度比该参数的值大很多（像素）时，轴标签将不会被自动旋转，而是以换行的形式展示轴标签。 当轴标签包含多个短词时换行展示轴标签可以使得轴标签有足够的空间，所以设置合理的自动旋转下限是非常有意义的。 默认是：80.
+    public var distance: Float?//只针对极地图有效，定义周标签与绘图区边缘的距离。 默认是：15.
+    public var enabled: Bool?//是否显示坐标轴标签 默认是：true.
+    public var format: String?//坐标轴格式化字符串。 默认是：{value}.
+    public var formatter: String?//坐标轴格式化字符串。 默认是：{value}.
+    public var padding: Float?//轴标签的内间距，作用是保证轴标签之间有空隙。 默认是：5.
+    public var rotation: Float?//轴标签的旋转角度 默认是：0.
+    public var staggerLines: Int?//只针对水平轴有效，定义轴标签显示行数。
+    public var step: Int?//显示 n 的倍数标签，例如设置为 2 则表示标签间隔一个轴标签显示。默认情况下，为了避免轴标签被覆盖，该参数会根据情况自动计算。可以通过设置此参数为 1 来阻止自动计算。
+    public var style: AAStyle?//轴标签的 CSS 样式
+    public var x: Float?//相对于坐标轴刻度线的水平偏移。 默认是：0.
+    public var y: Float?//相对于坐标轴刻度线的垂直平偏移。 默认是：null.
+    public var useHTML: Bool?//HTML渲染
 
     @discardableResult
     public func align(_ prop: String) -> AALabels {

AAInfographics/AAOptionsModel/AALegend.swift

@@ -45,21 +45,21 @@ public enum AAChartLegendVerticalAlignType: String {
 }
 
 public class AALegend: AAObject {
-    private var layout: String? //图例数据项的布局。布局类型： "horizontal" 或 "vertical" 即水平布局和垂直布局 默认是：horizontal.
-    private var align: String? //设定图例在图表区中的水平对齐方式，合法值有left，center 和 right。
-    private var verticalAlign: String? //设定图例在图表区中的垂直对齐方式，合法值有 top，middle 和 bottom。垂直位置可以通过 y 选项做进一步设定。
-    private var enabled: Bool?
-    private var borderColor: String?
-    private var borderWidth: Float?
-    private var itemMarginTop: Float? //图例的每一项的顶部外边距，单位px。 默认是：0.
-    private var itemMarginBottom: Float?
-    private var itemStyle: AAItemStyle?
-    private var symbolHeight: Float?
-    private var symbolPadding: Float?
-    private var symbolRadius: Float?
-    private var symbolWidth: Float?
-    private var x: Float?
-    private var y: Float?
+    public var layout: String? //图例数据项的布局。布局类型： "horizontal" 或 "vertical" 即水平布局和垂直布局 默认是：horizontal.
+    public var align: String? //设定图例在图表区中的水平对齐方式，合法值有left，center 和 right。
+    public var verticalAlign: String? //设定图例在图表区中的垂直对齐方式，合法值有 top，middle 和 bottom。垂直位置可以通过 y 选项做进一步设定。
+    public var enabled: Bool?
+    public var borderColor: String?
+    public var borderWidth: Float?
+    public var itemMarginTop: Float? //图例的每一项的顶部外边距，单位px。 默认是：0.
+    public var itemMarginBottom: Float?
+    public var itemStyle: AAItemStyle?
+    public var symbolHeight: Float?
+    public var symbolPadding: Float?
+    public var symbolRadius: Float?
+    public var symbolWidth: Float?
+    public var x: Float?
+    public var y: Float?
 
     @discardableResult
     public func layout(_ prop: AAChartLegendlLayoutType?) -> AALegend {
@@ -152,11 +152,11 @@ public class AALegend: AAObject {
 }
 
 public class AAItemStyle: AAObject {
-    private var color: String?
-    private var cursor: String?
-    private var pointer: String?
-    private var fontSize: String?
-    private var fontWeight: AAChartFontWeightType?
+    public var color: String?
+    public var cursor: String?
+    public var pointer: String?
+    public var fontSize: String?
+    public var fontWeight: AAChartFontWeightType?
 
     @discardableResult
     public func color(_ prop: String) -> AAItemStyle {

AAInfographics/AAOptionsModel/AAMarker.swift

@@ -33,11 +33,11 @@
 import UIKit
 
 public class AAMarker: AAObject {
-    private var radius: Int?
-    private var symbol: String?
-    private var fillColor: String?
-    private var lineWidth: Float?
-    private var lineColor: Any?
+    public var radius: Int?
+    public var symbol: String?
+    public var fillColor: String?
+    public var lineWidth: Float?
+    public var lineColor: Any?
 
     @discardableResult
     public func radius(_ prop: Int?) -> AAMarker {