Skip to content

Commit 5e3d4d5

Browse files
committed
Simplify code for BasicChartVC
1 parent 3b5c963 commit 5e3d4d5

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

AAInfographicsDemo/Demo/BasicChartVC.swift

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -281,19 +281,21 @@ class BasicChartVC: UIViewController {
281281
}
282282

283283
@objc func segmentDidSelected(segmentedControl:UISegmentedControl) {
284+
let selectedSegmentIndex = segmentedControl.selectedSegmentIndex
285+
284286
switch segmentedControl.tag {
285287
case 0:
286288
let stackingArr = [
287289
AAChartStackingType.none,
288290
.normal,
289291
.percent
290292
]
291-
aaChartModel!.stacking(stackingArr[segmentedControl.selectedSegmentIndex])
293+
aaChartModel!.stacking(stackingArr[selectedSegmentIndex])
292294

293295
case 1:
294296
if chartType == .column || chartType == .bar {
295297
let borderRadiusArr: [Float] = [0,10,100]
296-
aaChartModel!.borderRadius(borderRadiusArr[segmentedControl.selectedSegmentIndex])
298+
aaChartModel!.borderRadius(borderRadiusArr[selectedSegmentIndex])
297299
} else {
298300
let symbolArr = [
299301
AAChartSymbolType.circle,
@@ -302,7 +304,7 @@ class BasicChartVC: UIViewController {
302304
.triangle,
303305
.triangleDown
304306
]
305-
aaChartModel!.markerSymbol(symbolArr[segmentedControl.selectedSegmentIndex])
307+
aaChartModel!.markerSymbol(symbolArr[selectedSegmentIndex])
306308
}
307309

308310
default: break
@@ -363,13 +365,15 @@ class BasicChartVC: UIViewController {
363365
}
364366

365367
@objc func switchDidChange(switchView:UISwitch) {
368+
let isOn = switchView.isOn
369+
366370
switch switchView.tag {
367-
case 0: aaChartModel!.xAxisReversed(switchView.isOn)
368-
case 1: aaChartModel!.yAxisReversed(switchView.isOn)
369-
case 2: aaChartModel!.inverted(switchView.isOn)
370-
case 3: aaChartModel!.polar(switchView.isOn)
371-
case 4: aaChartModel!.dataLabelsEnabled(switchView.isOn)
372-
case 5: aaChartModel!.markerRadius(switchView.isOn ? 0 : 5)//Polyline connection point radius length.A value of 0 is equivalent to no polyline connection point.
371+
case 0: aaChartModel!.xAxisReversed(isOn)
372+
case 1: aaChartModel!.yAxisReversed(isOn)
373+
case 2: aaChartModel!.inverted(isOn)
374+
case 3: aaChartModel!.polar(isOn)
375+
case 4: aaChartModel!.dataLabelsEnabled(isOn)
376+
case 5: aaChartModel!.markerRadius(isOn ? 0 : 5)//Polyline connection point radius length.A value of 0 is equivalent to no polyline connection point.
373377
default:
374378
break
375379
}

0 commit comments

Comments
 (0)