Skip to content

Commit 44f1835

Browse files
AAChartModelAAChartModel
committed
Add AABoostFractalChartComposer
1 parent 6d45f1c commit 44f1835

File tree

5 files changed

+336
-73
lines changed

5 files changed

+336
-73
lines changed

‎AAChartKit-ProDemo/ChartsDemo/AAPlugins/AABoost/AABoostChartVC.m

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#import "AABoostChartVC.h"
1010
#import "AABoostChartComposer.h"
1111
#import "AAOptions+boost.h"
12+
#import "AABoostFractalChartComposer.h"
1213

1314
static NSString * const kBoostPath = @"https://code.highcharts.com/modules/boost.js";
1415

@@ -35,10 +36,13 @@ - (void)viewDidLoad {
3536
// [self.aaChartView aa_drawChartWithOptions:aaOptions];
3637

3738
//https://code.highcharts.com/{version}/modules/boost.js
38-
//https://code.highcharts.com/9.3.2/modules/boost.js
39+
//https://code.highcharts.com/10.0.0/modules/boost.js
3940
//<script src="https://code.highcharts.com/modules/drilldown.js"></script>
4041
//https://code.highcharts.com/11.0.1/modules/drilldown.js
4142

43+
NSNumber *boolNumber = [[NSNumber alloc] initWithBool:true];
44+
NSLog(@"🚀🚀🚀 查看 boolNumber 是否正常: %@",boolNumber);
45+
4246
}
4347

4448
- (id)chartConfigurationWithSelectedIndex:(NSUInteger)selectedIndex {
@@ -56,7 +60,7 @@ - (id)chartConfigurationWithSelectedIndex:(NSUInteger)selectedIndex {
5660
// + (NSDictionary *)stackingColumnChart;
5761

5862

59-
case 0: return [AABoostChartComposer lineChart];
63+
case 0: return [AABoostFractalChartComposer boostFractalChart];
6064
case 1: return [AABoostChartComposer areaChart];
6165
case 2: return [AABoostChartComposer columnChart];
6266
case 3: return [AABoostChartComposer lineChartWithHundredsOfSeries];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ - (void)viewDidLoad {
3636
//https://code.highcharts.com/{version}/modules/boost.js
3737
//https://code.highcharts.com/9.3.2/modules/boost.js
3838
//<script src="https://code.highcharts.com/modules/drilldown.js"></script>
39-
//https://code.highcharts.com/11.0.1/modules/drilldown.js
39+
//https://code.highcharts.com/10.0.0/modules/drilldown.js
4040
//<script src="https://code.highcharts.com/highcharts-3d.js"></script>
4141
//https://code.highcharts.com/11.0.1/highcharts-3d.js
4242

‎AAChartKit-ProDemo/ChartsDemo/AAPlugins/AAOptions3D/AAOptions3DChartComposer.m

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -115,68 +115,6 @@ + (AAOptions *)_3DColumnWithStackingRandomData {
115115
return AAOptions.new
116116
.chartSet(AAChart.new
117117
.typeSet(AAChartTypeColumn)
118-
.eventsSet(AAChartEvents.new
119-
.loadSet(@AAJSFunc(function () {
120-
var chart = this;
121-
// Add mouse events for rotation
122-
chart.container.addEventListener('mousedown', function(eStart) {
123-
eStart = chart.pointer.normalize(eStart);
124-
var posX = eStart.pageX,
125-
posY = eStart.pageY,
126-
alpha = chart.options.chart.options3d.alpha,
127-
beta = chart.options.chart.options3d.beta,
128-
newAlpha,
129-
newBeta,
130-
sensitivity = 1; // lower is more sensitive
131-
132-
function onMouseMove(e) {
133-
// Run beta
134-
newBeta = beta + (posX - e.pageX) / sensitivity;
135-
chart.options.chart.options3d.beta = newBeta;
136-
// Run alpha
137-
newAlpha = alpha + (e.pageY - posY) / sensitivity;
138-
chart.options.chart.options3d.alpha = newAlpha;
139-
chart.redraw(false);
140-
}
141-
142-
function onMouseUp() {
143-
document.removeEventListener('mousemove', onMouseMove);
144-
document.removeEventListener('mouseup', onMouseUp);
145-
}
146-
147-
document.addEventListener('mousemove', onMouseMove);
148-
document.addEventListener('mouseup', onMouseUp);
149-
});
150-
151-
chart.container.addEventListener('touchstart', function(eStart) {
152-
eStart = chart.pointer.normalize(eStart);
153-
var posX = eStart.pageX,
154-
posY = eStart.pageY,
155-
alpha = chart.options.chart.options3d.alpha,
156-
beta = chart.options.chart.options3d.beta,
157-
newAlpha,
158-
newBeta,
159-
sensitivity = 1; // lower is more sensitive
160-
161-
function onTouchMove(e) {
162-
// Run beta
163-
newBeta = beta + (posX - e.touches[0].pageX) / sensitivity;
164-
chart.options.chart.options3d.beta = newBeta;
165-
// Run alpha
166-
newAlpha = alpha + (e.touches[0].pageY - posY) / sensitivity;
167-
chart.options.chart.options3d.alpha = newAlpha;
168-
chart.redraw(false);
169-
}
170-
171-
function onTouchEnd() {
172-
document.removeEventListener('touchmove', onTouchMove);
173-
document.removeEventListener('touchend', onTouchEnd);
174-
}
175-
176-
document.addEventListener('touchmove', onTouchMove);
177-
document.addEventListener('touchend', onTouchEnd);
178-
});
179-
})))
180118
.options3dSet(AAOptions3D.new
181119
.enabledSet(true)
182120
.alphaSet(@20)
@@ -219,12 +157,7 @@ function onTouchEnd() {
219157
.groupPaddingSet(@0)
220158
.groupingSet(false)
221159
)
222-
// .columnSet((id)@{
223-
// @"groupZPadding": @10,
224-
// @"depth": @100,
225-
// @"groupPadding": @0,
226-
// @"grouping": @false,
227-
// })
160+
228161
)
229162
.seriesSet(@[
230163
AASeriesElement.new

‎AAChartKit-ProDemo/ChartsDemo/AAPlugins/AAOptions3D/AAOptions3DChartVC.m

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,21 @@ @implementation AAOptions3DChartVC
1919
- (void)viewDidLoad {
2020
[super viewDidLoad];
2121
// Do any additional setup after loading the view.
22-
NSString *jsPath = [[NSBundle mainBundle] pathForResource:@"AAHighcharts-3D" ofType:@"js"];
23-
self.aaChartView.pluginsArray = @[jsPath];
22+
//AAHighcharts-3D
23+
NSString *_3DJSPath = [[NSBundle mainBundle] pathForResource:@"AAHighcharts-3D" ofType:@"js"];
24+
//AAExporting
25+
// NSString *exportingJSPath = [[NSBundle mainBundle] pathForResource:@"AAExporting" ofType:@"js"];
26+
// //AAOffline-Exporting
27+
// NSString *offlineExportingJSPath = [[NSBundle mainBundle] pathForResource:@"AAOffline-Exporting" ofType:@"js"];
28+
//AANavigator
29+
// NSString *navigatorJSPath = [[NSBundle mainBundle] pathForResource:@"AANavigator" ofType:@"js"];
30+
31+
self.aaChartView.pluginsArray = @[
32+
_3DJSPath,
33+
// exportingJSPath,
34+
// offlineExportingJSPath,
35+
// navigatorJSPath,
36+
];
2437

2538
// AAOptions *aaOptions = [self configureChartOptions];
2639
// NSDictionary *jsonDic = [AABoostChartComposer lineChartOptions];
@@ -38,6 +51,12 @@ - (void)viewDidLoad {
3851
//https://code.highcharts.com/11.0.1/modules/drilldown.js
3952
//<script src="https://code.highcharts.com/highcharts-3d.js"></script>
4053
//https://code.highcharts.com/11.0.1/highcharts-3d.js
54+
//<script src="https://code.highcharts.com/modules/exporting.js"></script>
55+
//https://code.highcharts.com/11.0.1/modules/exporting.js
56+
//<script src="https://code.highcharts.com/modules/offline-exporting.js"></script>
57+
//https://code.highcharts.com/11.0.1/modules/offline-exporting.js
58+
//<script src="https://code.highcharts.com/modules/navigator.js"></script>
59+
//https://code.highcharts.com/11.0.1/modules/navigator.js
4160

4261
}
4362

0 commit comments

Comments
 (0)