Skip to content

Commit 609c193

Browse files
AAChartModelAAChartModel
committed
Optimize multiple attribute setter function names for AAChartModel
1 parent 2adfdff commit 609c193

11 files changed

+43
-43
lines changed

‎AAInfographics/AAChartCreator/AAChartModel.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,19 @@ public class AAChartModel: AAObject {
274274
}
275275

276276
@discardableResult
277-
public func symbol(_ prop: AAChartSymbolType) -> AAChartModel {
277+
public func markerRadius(_ prop: Int) -> AAChartModel {
278+
markerRadius = prop
279+
return self
280+
}
281+
282+
@discardableResult
283+
public func markerSymbol(_ prop: AAChartSymbolType) -> AAChartModel {
278284
markerSymbol = prop
279285
return self
280286
}
281287

282288
@discardableResult
283-
public func symbolStyle(_ prop: AAChartSymbolStyleType) -> AAChartModel {
289+
public func markerSymbolStyle(_ prop: AAChartSymbolStyleType) -> AAChartModel {
284290
markerSymbolStyle = prop
285291
return self
286292
}
@@ -477,12 +483,6 @@ public class AAChartModel: AAObject {
477483
return self
478484
}
479485

480-
@discardableResult
481-
public func markerRadius(_ prop: Int) -> AAChartModel {
482-
markerRadius = prop
483-
return self
484-
}
485-
486486
@discardableResult
487487
public func touchEventEnabled(_ prop: Bool) -> AAChartModel {
488488
touchEventEnabled = prop

‎AAInfographicsDemo/Demo/AdditionalContent/CustomTooltipWithJSFunctionVC.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class CustomTooltipWithJSFunctionVC: UIViewController {
8181
.chartType(.area)//图形类型
8282
.title("近三个月金价起伏周期图")//图表主标题
8383
.subtitle("金价(元/克)")//图表副标题
84-
.symbolStyle(.borderBlank)//折线连接点样式为外边缘空白
84+
.markerSymbolStyle(.borderBlank)//折线连接点样式为外边缘空白
8585
.dataLabelsEnabled(false)
8686
.categories([
8787
"10-01","10-02","10-03","10-04","10-05","10-06","10-07","10-08","10-09","10-10","10-11",
@@ -139,7 +139,7 @@ function () {
139139
.chartType(.area)//图形类型
140140
.title("2014 ~ 2020 汪星人生存指数")//图表主标题
141141
.subtitle("数据来源：www.无任何可靠依据.com")//图表副标题
142-
.symbolStyle(.borderBlank)//折线连接点样式为外边缘空白
142+
.markerSymbolStyle(.borderBlank)//折线连接点样式为外边缘空白
143143
.colorsTheme(["#1e90ff","#ef476f",])
144144
.dataLabelsEnabled(false)
145145
.stacking(.normal)
@@ -182,7 +182,7 @@ function () {
182182
.chartType(.line)//图形类型
183183
.title("")//图表主标题
184184
.subtitle("")//图表副标题
185-
.symbolStyle(.borderBlank)//折线连接点样式为外边缘空白
185+
.markerSymbolStyle(.borderBlank)//折线连接点样式为外边缘空白
186186
.dataLabelsEnabled(false)
187187
.categories(["临床一期","临床二期","临床三期"])
188188
.series([
@@ -234,7 +234,7 @@ function () {
234234
.chartType(.areaspline)//图形类型
235235
.title("")//图表主标题
236236
.subtitle("")//图表副标题
237-
.symbolStyle(.borderBlank)//折线连接点样式为外边缘空白
237+
.markerSymbolStyle(.borderBlank)//折线连接点样式为外边缘空白
238238
.dataLabelsEnabled(false)
239239
.colorsTheme(["#04d69f","#1e90ff","#ef476f","#ffd066",])
240240
.stacking(.normal)
@@ -342,7 +342,7 @@ function () {
342342
.chartType(.line)//图形类型
343343
.title("")//图表主标题
344344
.subtitle("")//图表副标题
345-
.symbolStyle(.borderBlank)//折线连接点样式为外边缘空白
345+
.markerSymbolStyle(.borderBlank)//折线连接点样式为外边缘空白
346346
.dataLabelsEnabled(false)
347347
.colorsTheme(["#04d69f","#1e90ff","#ef476f","#ffd066",])
348348
.stacking(.normal)
@@ -385,7 +385,7 @@ function () {
385385
.chartType(.line)//图形类型
386386
.title("")//图表主标题
387387
.subtitle("")//图表副标题
388-
.symbolStyle(.borderBlank)//折线连接点样式为外边缘空白
388+
.markerSymbolStyle(.borderBlank)//折线连接点样式为外边缘空白
389389
.dataLabelsEnabled(false)
390390
.colorsTheme(["#04d69f","#1e90ff","#ef476f","#ffd066",])
391391
.stacking(.normal)

‎AAInfographicsDemo/Demo/AdditionalContent/DoubleChartsLinkedWorkVC.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class DoubleChartsLinkedWorkVC: UIViewController, AAChartViewDelegate {
110110
.subtitle("")//图形副标题
111111
.dataLabelsEnabled(false)//是否显示数字
112112
.markerRadius(4)//折线连接点半径长度,为0时相当于没有折线连接点
113-
.symbolStyle(.innerBlank)
113+
.markerSymbolStyle(.innerBlank)
114114
.legendEnabled(false)
115115
.tooltipEnabled(false)
116116
.categories([

‎AAInfographicsDemo/Demo/AdditionalContent/DrawChartWithAAOptionsVC.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ class DrawChartWithAAOptionsVC: UIViewController {
9898
AAGradientColor.lusciousLime,
9999
AAGradientColor.mysticMauve
100100
])
101-
.symbol(.circle)
102-
.symbolStyle(.innerBlank)
101+
.markerSymbol(.circle)
102+
.markerSymbolStyle(.innerBlank)
103103
.stacking(.normal)
104104
.series([
105105
AASeriesElement()
@@ -172,7 +172,7 @@ class DrawChartWithAAOptionsVC: UIViewController {
172172
.chartType(.line)//图表类型
173173
.title("yAxis on the right side 📈")//图表主标题
174174
.subtitle("set aaOptions.yAxis.opposite = YES")//图表副标题
175-
.symbolStyle(.borderBlank)
175+
.markerSymbolStyle(.borderBlank)
176176
.categories(["Jan", "Feb", "Mar", "Apr", "May", "Jun","Jul", "Aug", "Sep", "Oct", "Nov", "Dec"])
177177
.markerRadius(8)
178178
.series([
@@ -561,7 +561,7 @@ class DrawChartWithAAOptionsVC: UIViewController {
561561
.chartType(.area)//图形类型
562562
.title("近三个月金价起伏周期图")//图表主标题
563563
.subtitle("金价(元/克)")//图表副标题
564-
.symbolStyle(.borderBlank)//折线连接点样式为外边缘空白
564+
.markerSymbolStyle(.borderBlank)//折线连接点样式为外边缘空白
565565
.dataLabelsEnabled(false)
566566
.categories([
567567
"10-01","10-02","10-03","10-04","10-05","10-06","10-07","10-08","10-09","10-10","10-11",
@@ -836,7 +836,7 @@ function () {
836836
.yAxisTitle("")
837837
.yAxisGridLineWidth(0)
838838
.markerRadius(8)
839-
.symbolStyle(.innerBlank)
839+
.markerSymbolStyle(.innerBlank)
840840
.series([
841841
AASeriesElement()
842842
.name("New York Hot")

‎AAInfographicsDemo/Demo/AdditionalContent/EvaluateJSStringFunctionVC.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class EvaluateJSStringFunctionVC: UIViewController, AAChartViewDelegate {
6767
if self.sampleChartTypeIndex == 0 || self.sampleChartTypeIndex == 1 {
6868
aaChartModel
6969
.chartType(.line)//图形类型
70-
.symbolStyle(.borderBlank)
70+
.markerSymbolStyle(.borderBlank)
7171
.categories(["Jan", "Feb", "Mar", "Apr", "May", "Jun","Jul", "Aug", "Sep", "Oct", "Nov", "Dec"])
7272
.series([
7373
AASeriesElement()

‎AAInfographicsDemo/Demo/AdditionalContent/OnlyRefreshChartDataVC.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class OnlyRefreshChartDataVC: UIViewController {
104104
.step(step!)
105105
,
106106
])
107-
aaChartModel?.symbolStyle(.innerBlank)
107+
aaChartModel?.markerSymbolStyle(.innerBlank)
108108
} else {
109109
let gradientColorDic = AAGradientColor.linearGradient(
110110
direction: .toBottom,
@@ -127,7 +127,7 @@ class OnlyRefreshChartDataVC: UIViewController {
127127
,
128128
])
129129
if step! != true {
130-
aaChartModel?.symbolStyle(.borderBlank)
130+
aaChartModel?.markerSymbolStyle(.borderBlank)
131131
.markerRadius(7)
132132
}
133133
}

‎AAInfographicsDemo/Demo/AdditionalContent/ShowManyChartViewVC.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class ShowManyChartViewVC: UIViewController {
107107
.subtitle("2020年08月08日")//图形副标题
108108
.dataLabelsEnabled(false)//是否显示数字
109109
.markerRadius(4)//折线连接点半径长度,为0时相当于没有折线连接点
110-
.symbolStyle(.innerBlank)
110+
.markerSymbolStyle(.innerBlank)
111111
.legendEnabled(true)
112112
.tooltipEnabled(false)
113113
.categories([

‎AAInfographicsDemo/Demo/CommonChartVC.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ class CommonChartVC: UIViewController {
158158

159159
private func configureAreaChartAndAreasplineChartStyle() {
160160
aaChartModel!
161-
.symbolStyle(.innerBlank)//设置折线连接点样式为:内部白色
161+
.markerSymbolStyle(.innerBlank)//设置折线连接点样式为:内部白色
162162
.animationType(.easeOutQuart)
163163
.legendEnabled(true)
164164
.markerRadius(5)
165-
.symbol(.circle)
165+
.markerSymbol(.circle)
166166

167167
if chartType == .areaspline {
168168
let gradientColorDic = AAGradientColor.linearGradient(
@@ -197,7 +197,7 @@ class CommonChartVC: UIViewController {
197197

198198
private func configureLineChartAndSplineChartStyle() {
199199
aaChartModel!
200-
.symbolStyle(.borderBlank)//设置折线连接点样式为:边缘白色
200+
.markerSymbolStyle(.borderBlank)//设置折线连接点样式为:边缘白色
201201
.markerRadius(6)
202202
if chartType == .spline {
203203
aaChartModel!
@@ -307,7 +307,7 @@ class CommonChartVC: UIViewController {
307307
.triangle,
308308
.triangleDown
309309
]
310-
aaChartModel!.symbol(symbolArr[segmentedControl.selectedSegmentIndex])
310+
aaChartModel!.markerSymbol(symbolArr[segmentedControl.selectedSegmentIndex])
311311
}
312312

313313
default: break

‎AAInfographicsDemo/Demo/CustomStyleChartVC.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ class CustomStyleChartVC: UIViewController {
338338
.title("STEP LINE CHART")//图形标题
339339
.subtitle("2020/08/08")//图形副标题
340340
.dataLabelsEnabled(false)//是否显示数字
341-
.symbolStyle(.borderBlank)//折线连接点样式
341+
.markerSymbolStyle(.borderBlank)//折线连接点样式
342342
.markerRadius(7)//折线连接点半径长度,为0时相当于没有折线连接点
343343
.series([
344344
AASeriesElement()
@@ -364,7 +364,7 @@ class CustomStyleChartVC: UIViewController {
364364
.title("STEP AREA CHART")//图形标题
365365
.subtitle("2020/08/08")//图形副标题
366366
.dataLabelsEnabled(false)//是否显示数字
367-
.symbolStyle(.innerBlank)//折线连接点样式
367+
.markerSymbolStyle(.innerBlank)//折线连接点样式
368368
.markerRadius(0)//折线连接点半径长度,为0时相当于没有折线连接点
369369
.series([
370370
AASeriesElement()
@@ -443,7 +443,7 @@ class CustomStyleChartVC: UIViewController {
443443
.chartType(.spline)
444444
.legendEnabled(false)//隐藏图例(底部可点按的小圆点)
445445
.categories(["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"])
446-
.symbolStyle(.innerBlank)
446+
.markerSymbolStyle(.innerBlank)
447447
.markerRadius(8)
448448
.dataLabelsEnabled(false)
449449
.series([
@@ -540,8 +540,8 @@ class CustomStyleChartVC: UIViewController {
540540
"七月", "八月", "九月", "十月", "十一月", "十二月"])
541541
.yAxisTitle("")
542542
.markerRadius(8)//marker点半径为8个像素
543-
.symbolStyle(.innerBlank)//marker点为空心效果
544-
.symbol(.circle)//marker点为圆形点○
543+
.markerSymbolStyle(.innerBlank)//marker点为空心效果
544+
.markerSymbol(.circle)//marker点为圆形点○
545545
.legendEnabled(false)
546546
.dataLabelsEnabled(false)
547547
.series([
@@ -636,8 +636,8 @@ class CustomStyleChartVC: UIViewController {
636636
.categories(["Jan", "Feb", "Mar", "Apr", "May", "Jun","July", "Aug", "Spe", "Oct", "Nov", "Dec"])
637637
.dataLabelsEnabled(false)//是否显示值
638638
.markerRadius(8)
639-
.symbol(.circle)
640-
.symbolStyle(.innerBlank)
639+
.markerSymbol(.circle)
640+
.markerSymbolStyle(.innerBlank)
641641
.legendEnabled(false)
642642
.series([
643643
AASeriesElement()

‎AAInfographicsDemo/Demo/MixedChartVC.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class MixedChartVC: UIViewController {
181181
.subtitle("")//图形副标题
182182
.chartType(.line)
183183
.dataLabelsEnabled(false)
184-
.symbolStyle(.borderBlank)
184+
.markerSymbolStyle(.borderBlank)
185185
.series([
186186
AASeriesElement()
187187
.name("Temperature")
@@ -333,8 +333,8 @@ class MixedChartVC: UIViewController {
333333
return AAChartModel()
334334
.dataLabelsEnabled(false)//是否显示数字
335335
.chartType(.scatter)
336-
.symbolStyle(.innerBlank)
337-
.symbol(.circle)
336+
.markerSymbolStyle(.innerBlank)
337+
.markerSymbol(.circle)
338338
.markerRadius(10)
339339
.series([
340340
AASeriesElement()
@@ -802,7 +802,7 @@ class MixedChartVC: UIViewController {
802802
.categories(["Jan", "Feb", "Mar", "Apr", "May", "Jun","Jul", "Aug", "Sep", "Oct", "Nov", "Dec"])
803803
.legendEnabled(false)
804804
.dataLabelsEnabled(false)
805-
.symbolStyle(.borderBlank)
805+
.markerSymbolStyle(.borderBlank)
806806
.series([
807807
AASeriesElement()
808808
.data([7.0, 6.9, 9.5, 9.6, 13.9, 14.5, 18.3, 18.2, 21.5, 25.2, 26.5, 23.3])

0 commit comments

Comments
 (0)