Optimize AAOptions samples

Author: AAChartModel

AAInfographics/AAOptionsModel/AALayoutAlgorithm.swift

@@ -12,6 +12,7 @@ public class AALayoutAlgorithm: AAObject {
     public var seriesInteraction: Bool?
     public var dragBetweenSeries: Bool?
     public var parentNodeLimit: Bool?
+    public var enableSimulation: Bool?
 
     @discardableResult
     public func gravitationalConstant(_ prop: Any?) -> AALayoutAlgorithm {
@@ -43,6 +44,12 @@ public class AALayoutAlgorithm: AAObject {
         return self
     }
 
+    @discardableResult
+    public func enableSimulation(_ prop: Bool?) -> AALayoutAlgorithm {
+        enableSimulation = prop
+        return self
+    }
+    
     public override init() {
 
     }

AAInfographicsDemo/Demo/AAChartModel/Composer/ChartSampleProvider.swift

@@ -141,6 +141,16 @@ class ChartSampleProvider: NSObject {
             MixedTypesChartOptionsComposer.polarThermometerChart(),
             MixedTypesChartOptionsComposer.polarLollipopChart(),
 
+            BubbleLegendChartOptionsComposer.bubbleLegendChart(),
+            BubbleLegendChartOptionsComposer.customBubbleLegendChart(),
+            BubbleLegendChartOptionsComposer.packedbubbleChart(),
+            BubbleLegendChartOptionsComposer.packedbubbleSplitChart(),
+            BubbleLegendChartOptionsComposer.packedbubbleSpiralChart(),
+            
+            BubbleChartOptionsComposer.punchCardChart(),
+            BubbleChartOptionsComposer.punchCardChart2(),
+            BubbleChartOptionsComposer.punchCardChart3(),
+            
             AreaChartOptionsVC.configureComplicatedCustomAreasplineChart(),//复杂自定义曲线填充图 1
             AreaChartOptionsVC.configureComplicatedCustomAreasplineChart2(),//复杂自定义曲线填充图 2
             AreaChartOptionsVC.configureComplicatedCustomAreasplineChart3(),//复杂自定义曲线填充图 3
@@ -180,15 +190,7 @@ class ChartSampleProvider: NSObject {
 
             MultiYAxesChartOptionsVC.disableGroupingBoxplotMixedScatterChart(),
 
-            BubbleLegendChartOptionsComposer.bubbleLegendChart(),
-            BubbleLegendChartOptionsComposer.customBubbleLegendChart(),
-            BubbleLegendChartOptionsComposer.packedbubbleChart(),
-            BubbleLegendChartOptionsComposer.packedbubbleSplitChart(),
-            BubbleLegendChartOptionsComposer.packedbubbleSpiralChart(),
-            
-            BubbleChartOptionsComposer.punchCardChart(),
-            BubbleChartOptionsComposer.punchCardChart2(),
-            BubbleChartOptionsComposer.punchCardChart3(),
+
 
 
 

AAInfographicsDemo/Demo/AAChartModel/Composer/SpecialChartComposer.swift

@@ -156,17 +156,18 @@ class SpecialChartComposer {
             .yAxisTitle("℃")
             .yAxisGridLineWidth(0)
             .colorsTheme([
-                AAGradientColor.radialGradient(position: .topCenter, startColor: AAColor.red, endColor: AAColor.green),
+//                AAGradientColor.radialGradient(position: .topCenter, startColor: AAColor.red, endColor: AAColor.green),
                 AAGradientColor.deepSea,
-                AAGradientColor.lemonDrizzle
+                AAGradientColor.lemonDrizzle,
+                AAGradientColor.wroughtIron,
             ])
             .series([
                 AASeriesElement()
                     .name("BubbleOne")
                     .colorByPoint(true)
-                    .marker(AAMarker()
-                        .lineColor(AAColor.red)
-                        .lineWidth(3))
+//                    .marker(AAMarker()
+//                        .lineColor(AAColor.red)
+//                        .lineWidth(3))
                     .data([
                         [97, 36, 79],
                         [94, 74, 60],
@@ -183,9 +184,9 @@ class SpecialChartComposer {
                 ,
                 AASeriesElement()
                     .name("BubbleTwo")
-                    .marker(AAMarker()
-                        .lineColor(AAColor.blue)
-                        .lineWidth(3))
+//                    .marker(AAMarker()
+//                        .lineColor(AAColor.blue)
+//                        .lineWidth(3))
                     .data([
                         [25, 60, 87],
                         [2,  75, 59],
@@ -202,9 +203,9 @@ class SpecialChartComposer {
                 ,
                 AASeriesElement()
                     .name("BubbleThree")
-                    .marker(AAMarker()
-                        .lineColor(AAColor.yellow)
-                        .lineWidth(3))
+//                    .marker(AAMarker()
+//                        .lineColor(AAColor.yellow)
+//                        .lineWidth(3))
                     .data([
                         [47, 47, 21],
                         [20, 12, 66],

AAInfographicsDemo/Demo/AAOptions/BubbleLegendChartOptionsComposer.swift

@@ -61,6 +61,8 @@ class BubbleLegendChartOptionsComposer {
      */
     class func bubbleLegendChart() -> AAOptions {
         AAOptions()
+            .title(AATitle()
+                .text("Bubble Legend"))
             .chart(AAChart()
                 .type(.bubble))
             .legend(AALegend()
@@ -162,6 +164,8 @@ class BubbleLegendChartOptionsComposer {
     */
     class func customBubbleLegendChart() -> AAOptions {
         AAOptions()
+            .title(AATitle()
+                .text("Bubble Legend"))
             .chart(AAChart()
                 .type(.bubble))
             .legend(AALegend()
@@ -225,7 +229,8 @@ class BubbleLegendChartOptionsComposer {
                 .zMax(1000)
                 .layoutAlgorithm(AALayoutAlgorithm() //packedbubbleChart 和 packedbubbleSplitChart 只有layoutAlgorithm这一段不一样
                     .gravitationalConstant(0.02)
-                    .splitSeries(false))
+                    .splitSeries(false)
+                    .enableSimulation(false))
                     .dataLabels(AADataLabels()
                         .enabled(true)
                         .format("{point.name}")
@@ -253,7 +258,8 @@ class BubbleLegendChartOptionsComposer {
                     .splitSeries(true)
                     .seriesInteraction(false)
                     .dragBetweenSeries(true)
-                    .parentNodeLimit(true))
+                    .parentNodeLimit(true)
+                    .enableSimulation(false))
                     .dataLabels(AADataLabels()
                         .enabled(true)
                         .format("{point.name}")