@nativescript-community/ui-chart 1.1.43 → 1.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +46 -0
- package/animation/ChartAnimator.d.ts +6 -60
- package/animation/ChartAnimator.js +31 -45
- package/animation/ChartAnimator.js.map +1 -1
- package/animation/ChartAnimator2.d.ts +18 -0
- package/animation/ChartAnimator2.js +69 -0
- package/animation/ChartAnimator2.js.map +1 -0
- package/animation/Tween.d.ts +4 -0
- package/animation/Tween.js +14 -0
- package/animation/Tween.js.map +1 -0
- package/buffer/AbstractBuffer.js +1 -1
- package/charts/BarChart.d.ts +4 -4
- package/charts/BarChart.js +0 -3
- package/charts/BarChart.js.map +1 -1
- package/charts/BarLineChartBase.d.ts +5 -5
- package/charts/BarLineChartBase.js +10 -27
- package/charts/BarLineChartBase.js.map +1 -1
- package/charts/CandleStickChart.d.ts +3 -3
- package/charts/Chart.d.ts +19 -23
- package/charts/Chart.js +12 -31
- package/charts/Chart.js.map +1 -1
- package/charts/CombinedChart.d.ts +4 -4
- package/charts/CombinedChart.js +0 -2
- package/charts/CombinedChart.js.map +1 -1
- package/charts/HorizontalBarChart.d.ts +0 -1
- package/charts/HorizontalBarChart.js +6 -10
- package/charts/HorizontalBarChart.js.map +1 -1
- package/charts/LineChart.d.ts +5 -5
- package/charts/LineChart.js +1 -1
- package/charts/LineChart.js.map +1 -1
- package/charts/PieChart.js +0 -3
- package/charts/PieChart.js.map +1 -1
- package/charts/RadarChart.d.ts +2 -2
- package/charts/RadarChart.js +6 -6
- package/charts/RadarChart.js.map +1 -1
- package/components/Legend.js +1 -1
- package/components/Legend.js.map +1 -1
- package/data/BaseDataSet.js.map +1 -1
- package/highlight/ChartHighlighter.js +1 -1
- package/highlight/ChartHighlighter.js.map +1 -1
- package/jobs/AnimatedMoveViewJob.js +11 -9
- package/jobs/AnimatedMoveViewJob.js.map +1 -1
- package/jobs/AnimatedViewPortJob.d.ts +8 -9
- package/jobs/AnimatedViewPortJob.js +18 -19
- package/jobs/AnimatedViewPortJob.js.map +1 -1
- package/jobs/AnimatedZoomJob.d.ts +8 -10
- package/jobs/AnimatedZoomJob.js +34 -33
- package/jobs/AnimatedZoomJob.js.map +1 -1
- package/jobs/MoveViewJob.js +10 -8
- package/jobs/MoveViewJob.js.map +1 -1
- package/jobs/ViewPortJob.d.ts +3 -4
- package/jobs/ViewPortJob.js +7 -9
- package/jobs/ViewPortJob.js.map +1 -1
- package/jobs/ZoomJob.d.ts +3 -5
- package/jobs/ZoomJob.js +24 -23
- package/jobs/ZoomJob.js.map +1 -1
- package/package.json +5 -5
- package/renderer/AxisRenderer.d.ts +4 -4
- package/renderer/AxisRenderer.js +8 -21
- package/renderer/AxisRenderer.js.map +1 -1
- package/renderer/BarChartRenderer.d.ts +4 -7
- package/renderer/BarChartRenderer.js +17 -35
- package/renderer/BarChartRenderer.js.map +1 -1
- package/renderer/BarLineScatterCandleBubbleRenderer.d.ts +5 -5
- package/renderer/BarLineScatterCandleBubbleRenderer.js +1 -1
- package/renderer/BarLineScatterCandleBubbleRenderer.js.map +1 -1
- package/renderer/BubbleChartRenderer.d.ts +4 -7
- package/renderer/BubbleChartRenderer.js +38 -40
- package/renderer/BubbleChartRenderer.js.map +1 -1
- package/renderer/CandleStickChartRenderer.d.ts +5 -11
- package/renderer/CandleStickChartRenderer.js +56 -57
- package/renderer/CandleStickChartRenderer.js.map +1 -1
- package/renderer/CombinedChartRenderer.d.ts +1 -1
- package/renderer/CombinedChartRenderer.js.map +1 -1
- package/renderer/DataRenderer.d.ts +1 -1
- package/renderer/DataRenderer.js +6 -12
- package/renderer/DataRenderer.js.map +1 -1
- package/renderer/HorizontalBarChartRenderer.d.ts +3 -3
- package/renderer/HorizontalBarChartRenderer.js +12 -12
- package/renderer/HorizontalBarChartRenderer.js.map +1 -1
- package/renderer/LegendRenderer.js +4 -7
- package/renderer/LegendRenderer.js.map +1 -1
- package/renderer/LineChartRenderer.d.ts +6 -13
- package/renderer/LineChartRenderer.js +19 -33
- package/renderer/LineChartRenderer.js.map +1 -1
- package/renderer/LineRadarRenderer.d.ts +0 -1
- package/renderer/LineRadarRenderer.js +2 -5
- package/renderer/LineRadarRenderer.js.map +1 -1
- package/renderer/LineScatterCandleRadarRenderer.d.ts +3 -5
- package/renderer/LineScatterCandleRadarRenderer.js +3 -8
- package/renderer/LineScatterCandleRadarRenderer.js.map +1 -1
- package/renderer/PieChartRenderer.d.ts +3 -16
- package/renderer/PieChartRenderer.js +24 -73
- package/renderer/PieChartRenderer.js.map +1 -1
- package/renderer/RadarChartRenderer.d.ts +1 -7
- package/renderer/RadarChartRenderer.js +19 -33
- package/renderer/RadarChartRenderer.js.map +1 -1
- package/renderer/ScatterChartRenderer.d.ts +0 -3
- package/renderer/ScatterChartRenderer.js +1 -8
- package/renderer/ScatterChartRenderer.js.map +1 -1
- package/renderer/XAxisRenderer.d.ts +7 -12
- package/renderer/XAxisRenderer.js +21 -34
- package/renderer/XAxisRenderer.js.map +1 -1
- package/renderer/XAxisRendererHorizontalBarChart.d.ts +4 -7
- package/renderer/XAxisRendererHorizontalBarChart.js +11 -23
- package/renderer/XAxisRendererHorizontalBarChart.js.map +1 -1
- package/renderer/YAxisRenderer.d.ts +3 -13
- package/renderer/YAxisRenderer.js +10 -42
- package/renderer/YAxisRenderer.js.map +1 -1
- package/renderer/YAxisRendererHorizontalBarChart.d.ts +2 -5
- package/renderer/YAxisRendererHorizontalBarChart.js +16 -24
- package/renderer/YAxisRendererHorizontalBarChart.js.map +1 -1
- package/renderer/YAxisRendererRadarChart.js +3 -1
- package/renderer/YAxisRendererRadarChart.js.map +1 -1
- package/utils/ColorTemplate.d.ts +0 -7
- package/utils/ColorTemplate.js +0 -9
- package/utils/ColorTemplate.js.map +1 -1
- package/utils/ObjectPool.d.ts +9 -9
- package/utils/ObjectPool.js +49 -47
- package/utils/ObjectPool.js.map +1 -1
- package/utils/Transformer.d.ts +19 -20
- package/utils/Transformer.js +18 -21
- package/utils/Transformer.js.map +1 -1
- package/utils/Utils.d.ts +17 -13
- package/utils/Utils.js +104 -132
- package/utils/Utils.js.map +1 -1
- package/utils/ViewPortHandler.d.ts +3 -7
- package/utils/ViewPortHandler.js +20 -25
- package/utils/ViewPortHandler.js.map +1 -1
package/jobs/MoveViewJob.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { ObjectPool } from '../utils/ObjectPool';
|
|
2
|
+
import { Utils } from '../utils/Utils';
|
|
2
3
|
import { ViewPortJob } from './ViewPortJob';
|
|
3
4
|
export class MoveViewJob extends ViewPortJob {
|
|
4
5
|
static getInstance(viewPortHandler, xValue, yValue, trans, v) {
|
|
5
6
|
const result = pool.get();
|
|
6
7
|
result.mViewPortHandler = viewPortHandler;
|
|
7
|
-
result.
|
|
8
|
-
result.
|
|
8
|
+
result.mXValue = xValue;
|
|
9
|
+
result.mYValue = yValue;
|
|
9
10
|
result.mTrans = trans;
|
|
10
|
-
result.
|
|
11
|
+
result.mView = v;
|
|
11
12
|
return result;
|
|
12
13
|
}
|
|
13
14
|
static recycleInstance(instance) {
|
|
@@ -17,14 +18,15 @@ export class MoveViewJob extends ViewPortJob {
|
|
|
17
18
|
super(viewPortHandler, xValue, yValue, trans, v);
|
|
18
19
|
}
|
|
19
20
|
run() {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
this.
|
|
23
|
-
this.
|
|
21
|
+
const pts = Utils.getTempArray(2);
|
|
22
|
+
pts[0] = this.mXValue;
|
|
23
|
+
pts[1] = this.mYValue;
|
|
24
|
+
this.mTrans.pointValuesToPixel(pts);
|
|
25
|
+
this.mViewPortHandler.centerViewPort(pts, this.mView);
|
|
24
26
|
MoveViewJob.recycleInstance(this);
|
|
25
27
|
}
|
|
26
28
|
instantiate() {
|
|
27
|
-
return new MoveViewJob(this.mViewPortHandler, this.
|
|
29
|
+
return new MoveViewJob(this.mViewPortHandler, this.mXValue, this.mYValue, this.mTrans, this.mView);
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
32
|
const pool = ObjectPool.create(2, new MoveViewJob(null, 0, 0, null, null)).setReplenishPercentage(0.5);
|
package/jobs/MoveViewJob.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MoveViewJob.js","sourceRoot":"../src/","sources":["jobs/MoveViewJob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"MoveViewJob.js","sourceRoot":"../src/","sources":["jobs/MoveViewJob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C,MAAM,OAAO,WAAY,SAAQ,WAAW;IACjC,MAAM,CAAC,WAAW,CAAC,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAkC;QAC9H,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,CAAC,gBAAgB,GAAG,eAAe,CAAC;QAC1C,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QACxB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QACxB,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;QACtB,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;QACjB,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,QAAqB;QAC/C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,YAAY,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAkC;QAChH,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACrD,CAAC;IAEM,GAAG;QACN,MAAM,GAAG,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAClC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QACtB,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QAEtB,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAEtD,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACvG,CAAC;CACJ;AACD,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAc,CAAC,EAAE,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC"}
|
package/jobs/ViewPortJob.d.ts
CHANGED
|
@@ -3,12 +3,11 @@ import { Poolable } from '../utils/ObjectPool';
|
|
|
3
3
|
import { Transformer } from '../utils/Transformer';
|
|
4
4
|
import { ViewPortHandler } from '../utils/ViewPortHandler';
|
|
5
5
|
export declare abstract class ViewPortJob extends Poolable {
|
|
6
|
-
protected pts: any;
|
|
7
6
|
protected mViewPortHandler: ViewPortHandler;
|
|
8
|
-
protected
|
|
9
|
-
protected
|
|
7
|
+
protected mXValue: number;
|
|
8
|
+
protected mYValue: number;
|
|
10
9
|
protected mTrans: Transformer;
|
|
11
|
-
protected
|
|
10
|
+
protected mView: BarLineChartBase<any, any, any>;
|
|
12
11
|
abstract run(): any;
|
|
13
12
|
constructor(viewPortHandler: ViewPortHandler, xValue: any, yValue: any, trans: Transformer, v: any);
|
|
14
13
|
getXValue(): number;
|
package/jobs/ViewPortJob.js
CHANGED
|
@@ -1,22 +1,20 @@
|
|
|
1
1
|
import { Poolable } from '../utils/ObjectPool';
|
|
2
|
-
import { Utils } from '../utils/Utils';
|
|
3
2
|
export class ViewPortJob extends Poolable {
|
|
4
3
|
constructor(viewPortHandler, xValue, yValue, trans, v) {
|
|
5
4
|
super();
|
|
6
|
-
this.
|
|
7
|
-
this.
|
|
8
|
-
this.yValue = 0;
|
|
5
|
+
this.mXValue = 0;
|
|
6
|
+
this.mYValue = 0;
|
|
9
7
|
this.mViewPortHandler = viewPortHandler;
|
|
10
|
-
this.
|
|
11
|
-
this.
|
|
8
|
+
this.mXValue = xValue;
|
|
9
|
+
this.mYValue = yValue;
|
|
12
10
|
this.mTrans = trans;
|
|
13
|
-
this.
|
|
11
|
+
this.mView = v;
|
|
14
12
|
}
|
|
15
13
|
getXValue() {
|
|
16
|
-
return this.
|
|
14
|
+
return this.mXValue;
|
|
17
15
|
}
|
|
18
16
|
getYValue() {
|
|
19
|
-
return this.
|
|
17
|
+
return this.mYValue;
|
|
20
18
|
}
|
|
21
19
|
}
|
|
22
20
|
//# sourceMappingURL=ViewPortJob.js.map
|
package/jobs/ViewPortJob.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewPortJob.js","sourceRoot":"../src/","sources":["jobs/ViewPortJob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"ViewPortJob.js","sourceRoot":"../src/","sources":["jobs/ViewPortJob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAK/C,MAAM,OAAgB,WAAY,SAAQ,QAAQ;IAU9C,YAAY,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAC;QAC/E,KAAK,EAAE,CAAC;QARF,YAAO,GAAG,CAAC,CAAC;QACZ,YAAO,GAAG,CAAC,CAAC;QAQlB,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACnB,CAAC;IAEM,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAEM,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ"}
|
package/jobs/ZoomJob.d.ts
CHANGED
|
@@ -1,17 +1,15 @@
|
|
|
1
|
-
import { Matrix } from '@nativescript-community/ui-canvas';
|
|
2
1
|
import { BarLineChartBase } from '../charts/BarLineChartBase';
|
|
3
2
|
import { AxisDependency } from '../components/YAxis';
|
|
4
3
|
import { Transformer } from '../utils/Transformer';
|
|
5
4
|
import { ViewPortHandler } from '../utils/ViewPortHandler';
|
|
6
5
|
import { ViewPortJob } from './ViewPortJob';
|
|
7
6
|
export declare class ZoomJob extends ViewPortJob {
|
|
7
|
+
protected mScaleX: number;
|
|
8
|
+
protected mScaleY: number;
|
|
9
|
+
protected mAxisDependency: AxisDependency;
|
|
8
10
|
static getInstance(viewPortHandler: ViewPortHandler, scaleX: any, scaleY: any, xValue: any, yValue: any, trans: Transformer, axis: AxisDependency, v: BarLineChartBase<any, any, any>): ZoomJob;
|
|
9
11
|
static recycleInstance(instance: ZoomJob): void;
|
|
10
|
-
protected scaleX: any;
|
|
11
|
-
protected scaleY: any;
|
|
12
|
-
protected axisDependency: AxisDependency;
|
|
13
12
|
constructor(viewPortHandler: ViewPortHandler, scaleX: any, scaleY: any, xValue: any, yValue: any, trans: Transformer, axis: AxisDependency, v: BarLineChartBase<any, any, any>);
|
|
14
|
-
protected mRunMatrixBuffer: Matrix;
|
|
15
13
|
run(): void;
|
|
16
14
|
instantiate(): ZoomJob;
|
|
17
15
|
}
|
package/jobs/ZoomJob.js
CHANGED
|
@@ -1,42 +1,43 @@
|
|
|
1
|
-
import { Matrix } from '@nativescript-community/ui-canvas';
|
|
2
1
|
import { ObjectPool } from '../utils/ObjectPool';
|
|
2
|
+
import { Utils } from '../utils/Utils';
|
|
3
3
|
import { ViewPortJob } from './ViewPortJob';
|
|
4
4
|
export class ZoomJob extends ViewPortJob {
|
|
5
5
|
constructor(viewPortHandler, scaleX, scaleY, xValue, yValue, trans, axis, v) {
|
|
6
6
|
super(viewPortHandler, xValue, yValue, trans, v);
|
|
7
|
-
this.
|
|
8
|
-
this.
|
|
9
|
-
this.
|
|
10
|
-
this.axisDependency = axis;
|
|
7
|
+
this.mScaleX = scaleX;
|
|
8
|
+
this.mScaleY = scaleY;
|
|
9
|
+
this.mAxisDependency = axis;
|
|
11
10
|
}
|
|
12
11
|
static getInstance(viewPortHandler, scaleX, scaleY, xValue, yValue, trans, axis, v) {
|
|
13
12
|
const result = pool.get();
|
|
14
|
-
result.
|
|
15
|
-
result.
|
|
16
|
-
result.
|
|
17
|
-
result.
|
|
13
|
+
result.mXValue = xValue;
|
|
14
|
+
result.mYValue = yValue;
|
|
15
|
+
result.mScaleX = scaleX;
|
|
16
|
+
result.mScaleY = scaleY;
|
|
18
17
|
result.mViewPortHandler = viewPortHandler;
|
|
19
18
|
result.mTrans = trans;
|
|
20
|
-
result.
|
|
21
|
-
result.
|
|
19
|
+
result.mAxisDependency = axis;
|
|
20
|
+
result.mView = v;
|
|
22
21
|
return result;
|
|
23
22
|
}
|
|
24
23
|
static recycleInstance(instance) {
|
|
25
24
|
pool.recycle(instance);
|
|
26
25
|
}
|
|
27
26
|
run() {
|
|
28
|
-
const save =
|
|
29
|
-
this.mViewPortHandler
|
|
30
|
-
this.
|
|
31
|
-
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
this.
|
|
36
|
-
this.
|
|
37
|
-
this.
|
|
38
|
-
|
|
39
|
-
this.
|
|
27
|
+
const save = Utils.getTempMatrix();
|
|
28
|
+
const viewPortHanlder = this.mViewPortHandler;
|
|
29
|
+
viewPortHanlder.zoom(this.mScaleX, this.mScaleY, save);
|
|
30
|
+
viewPortHanlder.refresh(save, this.mView, false);
|
|
31
|
+
const yValsInView = this.mView.getAxis(this.mAxisDependency).mAxisRange / viewPortHanlder.getScaleY();
|
|
32
|
+
const xValsInView = this.mView.getXAxis().mAxisRange / viewPortHanlder.getScaleX();
|
|
33
|
+
const pts = Utils.getTempArray(2);
|
|
34
|
+
pts[0] = this.mXValue - xValsInView / 2;
|
|
35
|
+
pts[1] = this.mYValue + yValsInView / 2;
|
|
36
|
+
this.mTrans.pointValuesToPixel(pts);
|
|
37
|
+
viewPortHanlder.translate(pts, save);
|
|
38
|
+
viewPortHanlder.refresh(save, this.mView, false);
|
|
39
|
+
this.mView.calculateOffsets();
|
|
40
|
+
this.mView.invalidate();
|
|
40
41
|
ZoomJob.recycleInstance(this);
|
|
41
42
|
}
|
|
42
43
|
instantiate() {
|
package/jobs/ZoomJob.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZoomJob.js","sourceRoot":"../src/","sources":["jobs/ZoomJob.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ZoomJob.js","sourceRoot":"../src/","sources":["jobs/ZoomJob.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nativescript-community/ui-chart",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.3",
|
|
4
4
|
"sideEffects": false,
|
|
5
5
|
"description": "A powerful chart / graph plugin, supporting line, bar, pie, radar, bubble, and candlestick charts as well as scaling, panning and animations.",
|
|
6
6
|
"keywords": [
|
|
@@ -32,11 +32,11 @@
|
|
|
32
32
|
"main": "charts/index.js",
|
|
33
33
|
"typings": "charts/index.d.ts",
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@nativescript-community/gesturehandler": "^0.1.
|
|
36
|
-
"@nativescript-community/
|
|
37
|
-
"
|
|
35
|
+
"@nativescript-community/gesturehandler": "^0.1.48",
|
|
36
|
+
"@nativescript-community/ui-canvas": "^4.2.13",
|
|
37
|
+
"additween": "^3.0.0",
|
|
38
38
|
"downsample": "^1.4.0",
|
|
39
39
|
"number-format.js": "^2.0.9"
|
|
40
40
|
},
|
|
41
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "789699d2bb1346a0caca81cef27fe02381cb1678"
|
|
42
42
|
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Renderer } from './Renderer';
|
|
2
|
-
import { AxisBase } from '../components/AxisBase';
|
|
3
1
|
import { Canvas, Paint, RectF } from '@nativescript-community/ui-canvas';
|
|
4
|
-
import {
|
|
2
|
+
import { AxisBase } from '../components/AxisBase';
|
|
3
|
+
import { LimitLine } from '../components/LimitLine';
|
|
5
4
|
import { Transformer } from '../utils/Transformer';
|
|
5
|
+
import { ViewPortHandler } from '../utils/ViewPortHandler';
|
|
6
6
|
import { BaseCustomRenderer } from './DataRenderer';
|
|
7
|
-
import {
|
|
7
|
+
import { Renderer } from './Renderer';
|
|
8
8
|
export declare type CustomRendererGridLineFunction = (c: Canvas, renderer: AxisRenderer, rect: RectF, x: any, y: any, axisValue: any, paint: Paint) => void;
|
|
9
9
|
export declare type CustomRendererLimitLineFunction = (c: Canvas, renderer: AxisRenderer, limitLine: LimitLine, rect: RectF, x: number, paint: Paint) => void;
|
|
10
10
|
export interface CustomRenderer extends BaseCustomRenderer {
|
package/renderer/AxisRenderer.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Align, Paint, Style } from '@nativescript-community/ui-canvas';
|
|
3
|
-
import { Utils } from '../utils/Utils';
|
|
1
|
+
import { Align } from '@nativescript-community/ui-canvas';
|
|
4
2
|
import { profile } from '@nativescript/core';
|
|
3
|
+
import { Utils } from '../utils/Utils';
|
|
4
|
+
import { Renderer } from './Renderer';
|
|
5
5
|
export class AxisRenderer extends Renderer {
|
|
6
6
|
constructor(viewPortHandler, trans, axis) {
|
|
7
7
|
super(viewPortHandler);
|
|
@@ -10,19 +10,13 @@ export class AxisRenderer extends Renderer {
|
|
|
10
10
|
}
|
|
11
11
|
get axisLinePaint() {
|
|
12
12
|
if (!this.mAxisLinePaint) {
|
|
13
|
-
this.mAxisLinePaint =
|
|
14
|
-
this.mAxisLinePaint.setColor('black');
|
|
15
|
-
this.mAxisLinePaint.setAntiAlias(true);
|
|
16
|
-
this.mAxisLinePaint.setStrokeWidth(1);
|
|
17
|
-
this.mAxisLinePaint.setStyle(Style.STROKE);
|
|
13
|
+
this.mAxisLinePaint = Utils.getTemplatePaint('black-stroke');
|
|
18
14
|
}
|
|
19
15
|
return this.mAxisLinePaint;
|
|
20
16
|
}
|
|
21
17
|
get limitLinePaint() {
|
|
22
18
|
if (!this.mLimitLinePaint) {
|
|
23
|
-
this.mLimitLinePaint =
|
|
24
|
-
this.mLimitLinePaint.setAntiAlias(true);
|
|
25
|
-
this.mLimitLinePaint.setStyle(Style.STROKE);
|
|
19
|
+
this.mLimitLinePaint = Utils.getTemplatePaint('black-stroke');
|
|
26
20
|
}
|
|
27
21
|
return this.mLimitLinePaint;
|
|
28
22
|
}
|
|
@@ -33,20 +27,13 @@ export class AxisRenderer extends Renderer {
|
|
|
33
27
|
return this.mAxisLabelPaint;
|
|
34
28
|
}
|
|
35
29
|
createAxisLabelsPaint() {
|
|
36
|
-
const paint =
|
|
37
|
-
paint.setColor('black');
|
|
38
|
-
paint.setAntiAlias(true);
|
|
30
|
+
const paint = Utils.getTemplatePaint('black-fill');
|
|
39
31
|
paint.setTextAlign(Align.LEFT);
|
|
40
32
|
return paint;
|
|
41
33
|
}
|
|
42
34
|
get gridPaint() {
|
|
43
35
|
if (!this.mGridPaint) {
|
|
44
|
-
this.mGridPaint =
|
|
45
|
-
this.mGridPaint.setColor('gray');
|
|
46
|
-
this.mGridPaint.setStrokeWidth(1);
|
|
47
|
-
this.mGridPaint.setAntiAlias(true);
|
|
48
|
-
this.mGridPaint.setStyle(Style.STROKE);
|
|
49
|
-
this.mGridPaint.setAlpha(90);
|
|
36
|
+
this.mGridPaint = Utils.getTemplatePaint('grid');
|
|
50
37
|
}
|
|
51
38
|
return this.mGridPaint;
|
|
52
39
|
}
|
|
@@ -54,7 +41,7 @@ export class AxisRenderer extends Renderer {
|
|
|
54
41
|
return this.mTrans;
|
|
55
42
|
}
|
|
56
43
|
computeAxis(min, max, inverted) {
|
|
57
|
-
if (this.mViewPortHandler != null && this.mViewPortHandler.
|
|
44
|
+
if (this.mViewPortHandler != null && this.mViewPortHandler.getContentRect().width() > 10 && !this.mViewPortHandler.isFullyZoomedOutY()) {
|
|
58
45
|
const rect = this.mAxis.isIgnoringOffsets() ? this.mViewPortHandler.getChartRect() : this.mViewPortHandler.getContentRect();
|
|
59
46
|
const p1 = this.mTrans.getValuesByTouchPoint(rect.left, rect.top);
|
|
60
47
|
const p2 = this.mTrans.getValuesByTouchPoint(rect.left, rect.bottom);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxisRenderer.js","sourceRoot":"../src/","sources":["renderer/AxisRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AxisRenderer.js","sourceRoot":"../src/","sources":["renderer/AxisRenderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Canvas, Paint, RectF, TypedArray } from '@nativescript-community/ui-canvas';
|
|
2
2
|
import { ChartAnimator } from '../animation/ChartAnimator';
|
|
3
3
|
import { BarBuffer } from '../buffer/BarBuffer';
|
|
4
4
|
import { BarChart } from '../charts/BarChart';
|
|
@@ -6,16 +6,13 @@ import { Highlight } from '../highlight/Highlight';
|
|
|
6
6
|
import { IBarDataSet } from '../interfaces/datasets/IBarDataSet';
|
|
7
7
|
import { Transformer } from '../utils/Transformer';
|
|
8
8
|
import { ViewPortHandler } from '../utils/ViewPortHandler';
|
|
9
|
-
import {
|
|
9
|
+
import { BarLineScatterCandleBubbleRenderer } from './BarLineScatterCandleBubbleRenderer';
|
|
10
10
|
export declare class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
|
|
11
11
|
mChart: BarChart;
|
|
12
12
|
protected mBarBuffers: BarBuffer[];
|
|
13
|
+
protected mTransformedBuffer: TypedArray;
|
|
13
14
|
protected mShadowPaint: Paint;
|
|
14
15
|
protected mBarBorderPaint: Paint;
|
|
15
|
-
protected mBarRect: RectF;
|
|
16
|
-
protected get barRect(): RectF;
|
|
17
|
-
protected mBarShadowRectBuffer: RectF;
|
|
18
|
-
protected get barShadowRectBuffer(): RectF;
|
|
19
16
|
constructor(chart: BarChart, animator: ChartAnimator, viewPortHandler: ViewPortHandler);
|
|
20
17
|
get highlightPaint(): Paint;
|
|
21
18
|
get barBorderPaint(): Paint;
|
|
@@ -23,7 +20,7 @@ export declare class BarChartRenderer extends BarLineScatterCandleBubbleRenderer
|
|
|
23
20
|
initBuffers(): void;
|
|
24
21
|
drawData(c: Canvas): void;
|
|
25
22
|
protected drawDataSet(c: Canvas, dataSet: IBarDataSet, index: number): boolean;
|
|
26
|
-
protected prepareBarHighlight(x: number, y1: number, y2: number, barWidthHalf: number, trans: Transformer): void;
|
|
23
|
+
protected prepareBarHighlight(x: number, y1: number, y2: number, barWidthHalf: number, trans: Transformer, barRect: RectF): void;
|
|
27
24
|
drawValues(c: Canvas): void;
|
|
28
25
|
drawHighlighted(c: Canvas, indices: Highlight[]): void;
|
|
29
26
|
protected setHighlightDrawPos(high: Highlight, bar: RectF): void;
|
|
@@ -1,49 +1,28 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { profile } from '@nativescript/core';
|
|
2
2
|
import { BarBuffer } from '../buffer/BarBuffer';
|
|
3
3
|
import { Utils } from '../utils/Utils';
|
|
4
|
-
import {
|
|
5
|
-
import { profile } from '@nativescript/core';
|
|
4
|
+
import { BarLineScatterCandleBubbleRenderer } from './BarLineScatterCandleBubbleRenderer';
|
|
6
5
|
export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
|
|
7
6
|
constructor(chart, animator, viewPortHandler) {
|
|
8
7
|
super(animator, viewPortHandler);
|
|
9
|
-
this.mBarRect = new RectF(0, 0, 0, 0);
|
|
10
8
|
this.mChart = chart;
|
|
11
9
|
}
|
|
12
|
-
get barRect() {
|
|
13
|
-
if (!this.mBarRect) {
|
|
14
|
-
this.mBarRect = new RectF(0, 0, 0, 0);
|
|
15
|
-
}
|
|
16
|
-
return this.mBarRect;
|
|
17
|
-
}
|
|
18
|
-
get barShadowRectBuffer() {
|
|
19
|
-
if (!this.mBarShadowRectBuffer) {
|
|
20
|
-
this.mBarShadowRectBuffer = new RectF(0, 0, 0, 0);
|
|
21
|
-
}
|
|
22
|
-
return this.mBarShadowRectBuffer;
|
|
23
|
-
}
|
|
24
10
|
get highlightPaint() {
|
|
25
11
|
if (!this.mHighlightPaint) {
|
|
26
|
-
this.mHighlightPaint =
|
|
27
|
-
this.mHighlightPaint.setAntiAlias(true);
|
|
28
|
-
this.mHighlightPaint.setStyle(Style.FILL);
|
|
29
|
-
this.mHighlightPaint.setColor('black');
|
|
12
|
+
this.mHighlightPaint = Utils.getTemplatePaint('black-fill');
|
|
30
13
|
this.mHighlightPaint.setAlpha(120);
|
|
31
14
|
}
|
|
32
15
|
return this.mHighlightPaint;
|
|
33
16
|
}
|
|
34
17
|
get barBorderPaint() {
|
|
35
18
|
if (!this.mBarBorderPaint) {
|
|
36
|
-
this.mBarBorderPaint =
|
|
37
|
-
this.mBarBorderPaint.setAntiAlias(true);
|
|
38
|
-
this.mBarBorderPaint.setStyle(Style.STROKE);
|
|
19
|
+
this.mBarBorderPaint = Utils.getTemplatePaint('black-stroke');
|
|
39
20
|
}
|
|
40
21
|
return this.mBarBorderPaint;
|
|
41
22
|
}
|
|
42
23
|
get shadowPaint() {
|
|
43
24
|
if (!this.mShadowPaint) {
|
|
44
|
-
this.mShadowPaint =
|
|
45
|
-
this.mShadowPaint.setAntiAlias(true);
|
|
46
|
-
this.mShadowPaint.setStyle(Style.FILL);
|
|
25
|
+
this.mShadowPaint = Utils.getTemplatePaint('black-fill');
|
|
47
26
|
}
|
|
48
27
|
return this.mShadowPaint;
|
|
49
28
|
}
|
|
@@ -82,7 +61,7 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
|
|
|
82
61
|
const barWidth = barData.getBarWidth();
|
|
83
62
|
const barWidthHalf = barWidth / 2;
|
|
84
63
|
let x;
|
|
85
|
-
const barShadowRectBuffer =
|
|
64
|
+
const barShadowRectBuffer = Utils.getTempRectF();
|
|
86
65
|
for (let i = 0, count = Math.min(Math.ceil(dataSet.getEntryCount() * phaseX), dataSet.getEntryCount()); i < count; i++) {
|
|
87
66
|
const e = dataSet.getEntryForIndex(i);
|
|
88
67
|
x = dataSet.getEntryXValue(e, i);
|
|
@@ -144,12 +123,11 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
|
|
|
144
123
|
renderPaint.setShader(previousShader);
|
|
145
124
|
return true;
|
|
146
125
|
}
|
|
147
|
-
prepareBarHighlight(x, y1, y2, barWidthHalf, trans) {
|
|
126
|
+
prepareBarHighlight(x, y1, y2, barWidthHalf, trans, barRect) {
|
|
148
127
|
const left = x - barWidthHalf;
|
|
149
128
|
const right = x + barWidthHalf;
|
|
150
129
|
const top = y1;
|
|
151
130
|
const bottom = y2;
|
|
152
|
-
const barRect = this.barRect;
|
|
153
131
|
barRect.set(left, top, right, bottom);
|
|
154
132
|
trans.rectToPixelPhase(barRect, this.mAnimator.getPhaseY());
|
|
155
133
|
}
|
|
@@ -240,7 +218,10 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
|
|
|
240
218
|
}
|
|
241
219
|
}
|
|
242
220
|
else {
|
|
243
|
-
|
|
221
|
+
if (!this.mTransformedBuffer || this.mTransformedBuffer.length !== vals.length * 2) {
|
|
222
|
+
this.mTransformedBuffer = Utils.createArrayBuffer(vals.length * 2);
|
|
223
|
+
}
|
|
224
|
+
const transformed = this.mTransformedBuffer;
|
|
244
225
|
let posY = 0;
|
|
245
226
|
let negY = -entry.negativeSum;
|
|
246
227
|
for (let k = 0, idx = 0; k < transformed.length; k += 2, idx++) {
|
|
@@ -259,11 +240,12 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
|
|
|
259
240
|
}
|
|
260
241
|
transformed[k + 1] = y * phaseY;
|
|
261
242
|
}
|
|
262
|
-
|
|
263
|
-
|
|
243
|
+
const points = Utils.pointsFromBuffer(transformed);
|
|
244
|
+
trans.pointValuesToPixel(points);
|
|
245
|
+
for (let k = 0; k < points.length; k += 2) {
|
|
264
246
|
const val = vals[k / 2];
|
|
265
247
|
const drawBelow = (val === 0 && negY === 0 && posY > 0) || val < 0;
|
|
266
|
-
const y =
|
|
248
|
+
const y = points[k + 1] + (drawBelow ? negOffset : posOffset);
|
|
267
249
|
if (!this.mViewPortHandler.isInBoundsRight(x)) {
|
|
268
250
|
break;
|
|
269
251
|
}
|
|
@@ -288,7 +270,7 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
|
|
|
288
270
|
drawHighlighted(c, indices) {
|
|
289
271
|
const barData = this.mChart.getBarData();
|
|
290
272
|
let entry, index;
|
|
291
|
-
const barRect =
|
|
273
|
+
const barRect = Utils.getTempRectF();
|
|
292
274
|
for (let i = 0; i < indices.length; i++) {
|
|
293
275
|
const high = indices[i];
|
|
294
276
|
const set = barData.getDataSetByIndex(high.dataSetIndex);
|
|
@@ -332,7 +314,7 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
|
|
|
332
314
|
y2 = minAxisValue >= 0 ? minAxisValue : 0;
|
|
333
315
|
}
|
|
334
316
|
const x = set.getEntryXValue(entry, index);
|
|
335
|
-
this.prepareBarHighlight(x, y1, y2, barData.getBarWidth() / 2, trans);
|
|
317
|
+
this.prepareBarHighlight(x, y1, y2, barData.getBarWidth() / 2, trans, barRect);
|
|
336
318
|
this.setHighlightDrawPos(high, barRect);
|
|
337
319
|
const customRender = this.mChart.getCustomRenderer();
|
|
338
320
|
if (customRender && customRender.drawHighlight) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BarChartRenderer.js","sourceRoot":"../src/","sources":["renderer/BarChartRenderer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BarChartRenderer.js","sourceRoot":"../src/","sources":["renderer/BarChartRenderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ChartAnimator } from '../animation/ChartAnimator';
|
|
2
|
+
import { BarLineScatterCandleBubbleDataSet } from '../data/BarLineScatterCandleBubbleDataSet';
|
|
3
|
+
import { Entry } from '../data/Entry';
|
|
2
4
|
import { BarLineScatterCandleBubbleDataProvider } from '../interfaces/dataprovider/BarLineScatterCandleBubbleDataProvider';
|
|
3
5
|
import { IBarLineScatterCandleBubbleDataSet } from '../interfaces/datasets/IBarLineScatterCandleBubbleDataSet';
|
|
4
|
-
import { ChartAnimator } from '../animation/ChartAnimator';
|
|
5
|
-
import { ViewPortHandler } from '../utils/ViewPortHandler';
|
|
6
6
|
import { IDataSet } from '../interfaces/datasets/IDataSet';
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
7
|
+
import { ViewPortHandler } from '../utils/ViewPortHandler';
|
|
8
|
+
import { DataRenderer } from './DataRenderer';
|
|
9
9
|
export declare class XBounds {
|
|
10
10
|
min: number;
|
|
11
11
|
max: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BarLineScatterCandleBubbleRenderer.js","sourceRoot":"../src/","sources":["renderer/BarLineScatterCandleBubbleRenderer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BarLineScatterCandleBubbleRenderer.js","sourceRoot":"../src/","sources":["renderer/BarLineScatterCandleBubbleRenderer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAM3C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAK9C,MAAM,OAAO,OAAO;IAsBT,GAAG,CAAkB,KAA6C,EAAE,OAA6C,EAAE,QAAuB;QAC7I,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAC9D,MAAM,GAAG,GAAG,KAAK,CAAC,iBAAiB,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAExC,MAAM,SAAS,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,GAAG,GAAG,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACpE,IAAI,CAAC,GAAG,GAAG,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAEhE,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;IAChD,CAAC;CACJ;AAID,MAAM,OAAgB,kCAAmC,SAAQ,YAAY;IAMzE,YAAY,QAAuB,EAAE,eAAgC;QACjE,KAAK,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QAH3B,aAAQ,GAAG,IAAI,OAAO,EAAE,CAAC;IAInC,CAAC;IAQS,gBAAgB,CAAC,GAAkB;QACzC,OAAO,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;IACtF,CAAC;IASS,WAAW,CAAC,CAAQ,EAAE,GAA4C;QACxE,IAAI,CAAC,IAAI,IAAI;YAAE,OAAO,KAAK,CAAC;QAE5B,MAAM,UAAU,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAExC,IAAI,CAAC,IAAI,IAAI,IAAI,UAAU,IAAI,GAAG,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE;YAC7E,OAAO,KAAK,CAAC;SAChB;aAAM;YACH,OAAO,IAAI,CAAC;SACf;IACL,CAAC;CACJ"}
|