Skip to content

Commit 34816ba

Browse files
committed
Add bar chart option to drilldown demo
Generalize the drilldown chart composer by extracting a browserDrilldownChartWithType: helper and add convenience methods columnChart and barChart. Update the drilldown VC to return the bar chart for the second selection and add the "barChart---条形图" entry to the demo list in FirstViewController.
1 parent ef4a569 commit 34816ba

4 files changed

Lines changed: 13 additions & 7 deletions

File tree

AAChartKit-ProDemo/ChartsDemo/AAPlugins/AADrilldown/AADrilldownChartComposer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
1515
@interface AADrilldownChartComposer : NSObject
1616

1717
+ (AAOptions *)columnChart;
18+
+ (AAOptions *)barChart;
1819

1920
@end
2021

AAChartKit-ProDemo/ChartsDemo/AAPlugins/AADrilldown/AADrilldownChartComposer.m

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,10 @@ @implementation AADrilldownChartComposer
332332
});
333333
334334
*/
335-
+ (AAOptions *)columnChart {
335+
+ (AAOptions *)browserDrilldownChartWithType:(AAChartType)chartType {
336336
return AAOptions.new
337337
.chartSet(AAChart.new
338-
.typeSet(AAChartTypeColumn))
338+
.typeSet(chartType))
339339
.titleSet(AATitle.new
340340
.alignSet(AAChartAlignTypeLeft)
341341
.textSet(@"Browser market shares. January, 2022"))
@@ -462,4 +462,12 @@ + (AAOptions *)columnChart {
462462
;
463463
}
464464

465+
+ (AAOptions *)columnChart {
466+
return [self browserDrilldownChartWithType:AAChartTypeColumn];
467+
}
468+
469+
+ (AAOptions *)barChart {
470+
return [self browserDrilldownChartWithType:AAChartTypeBar];
471+
}
472+
465473
@end

AAChartKit-ProDemo/ChartsDemo/AAPlugins/AADrilldown/AADrilldownChartVC.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,8 @@ - (void)viewDidLoad {
4444

4545
- (id)chartConfigurationWithSelectedIndex:(NSUInteger)selectedIndex {
4646
switch (self.selectedIndex) {
47-
48-
4947
case 0: return [AADrilldownChartComposer columnChart];
50-
51-
52-
48+
case 1: return [AADrilldownChartComposer barChart];
5349
}
5450
return nil;
5551
}

AAChartKit-ProDemo/ChartsDemo/FirstViewController.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ - (void)listView:(AAListViewController *)listViewController didSelectRowAtIndexP
299299
],
300300
@[
301301
@"columnChart---柱形图",
302+
@"barChart---条形图",
302303
],
303304
@[
304305
@"_3DColumnWithStackingRandomData---3D堆积随机柱形图",

0 commit comments

Comments
 (0)