Fix #501 => add clip property for AASeriesElement

AAChartModel · Oct 18, 2024 · bbdd661 · bbdd661
1 parent bab475f
commit bbdd661
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/AAInfographics/AAChartCreator/AASeriesElement.swift b/AAInfographics/AAChartCreator/AASeriesElement.swift
@@ -89,6 +89,7 @@ public class AASeriesElement: AAObject {
     public var connectNulls: Bool?         //Whether to connect a graph line across null points. default value：false.
     public var enabledCrosshairs: Bool?
     public var jitter: AAJitter?           //Only useful for scatter chart and bubble chart
+    public var clip: Bool?
 
     @discardableResult
     public func type(_ prop: AAChartType) -> AASeriesElement {
@@ -390,6 +391,12 @@ public class AASeriesElement: AAObject {
         return self
     }
 
+    @discardableResult
+    public func clip(_ prop: Bool) -> AASeriesElement {
+        clip = prop
+        return self
+    }
+
     public  override init() {
 
     }

diff --git a/AAInfographicsDemo/Demo/AAChartListVC/AAChartModelListVC.swift b/AAInfographicsDemo/Demo/AAChartListVC/AAChartModelListVC.swift
@@ -242,6 +242,7 @@ class AAChartModelListVC: AABaseListVC {
                 "connectNullsForSingleAASeriesElementLineChart",
                 "largeDifferencesInTheNumberOfDataInDifferentSeriesElementLineChart",
                 "customDifferentDataLabelsShapeForLineChart",
+                "clipForAASeriesElementLineChart",
             ],
             /*Custom Style For Spline Chart*/
             [
@@ -432,6 +433,7 @@ class AAChartModelListVC: AABaseListVC {
                 "connectNullsForSingleAASeriesElementLineChart",
                 "largeDifferencesInTheNumberOfDataInDifferentSeriesElementLineChart",
                 "customDifferentDataLabelsShapeForLineChart",
+                "clipForAASeriesElementLineChart",
             ],
             /*Custom Style For Spline Chart*/
             [

diff --git a/AAInfographicsDemo/Demo/AAChartModel/Composer/CustomStyleForLineChartComposer.swift b/AAInfographicsDemo/Demo/AAChartModel/Composer/CustomStyleForLineChartComposer.swift
@@ -947,4 +947,28 @@ class CustomStyleForLineChartComposer {
                     ])
             ])
     }
+
+
+
+    static func clipForAASeriesElementLineChart() -> AAChartModel {
+        AAChartModel()
+            .series([
+                AASeriesElement()
+                    .lineWidth(15)
+                    .clip(false)
+                    .type(.area)
+                    .name("Non clipped series")
+                    .data([100, 100, 50, 50, 0, 0])
+                ,
+                AASeriesElement()
+                    .lineWidth(26)
+                    .clip(false)
+                    .type(.line)
+                    .name("Clipped series")
+                    .data([0, 0, 50, 50, 100, 100])
+            ])
+    }
+
+
+
 }
diff --git a/AAInfographicsDemo/Demo/AAChartModel/ViewController/CustomStyleForLineChartVC.swift b/AAInfographicsDemo/Demo/AAChartModel/ViewController/CustomStyleForLineChartVC.swift
@@ -42,6 +42,7 @@ class CustomStyleForLineChartVC: AABaseChartVC {
         case "connectNullsForSingleAASeriesElementLineChart": return CustomStyleForLineChartComposer.connectNullsForSingleAASeriesElementLineChart()
         case "largeDifferencesInTheNumberOfDataInDifferentSeriesElementLineChart": return CustomStyleForLineChartComposer.largeDifferencesInTheNumberOfDataInDifferentSeriesElementLineChart()
         case "customDifferentDataLabelsShapeForLineChart": return CustomStyleForLineChartComposer.customDifferentDataLabelsShapeForLineChart()
+        case "clipForAASeriesElementLineChart": return CustomStyleForLineChartComposer.clipForAASeriesElementLineChart()
 
         default: return nil
         }