@nativescript-community/ui-chart 1.2.36 → 2.0.1

package/renderer/CombinedChartRenderer.js

@@ -5,78 +5,99 @@ import { BarChartRenderer } from './BarChartRenderer';
 import { BubbleChartRenderer } from './BubbleChartRenderer';
 import { CandleStickChartRenderer } from './CandleStickChartRenderer';
 import { ScatterChartRenderer } from './ScatterChartRenderer';
+/**
+ * Renderer class that is responsible for rendering multiple different data-types.
+ */
 export class CombinedChartRenderer extends DataRenderer {
     constructor(chart, animator, viewPortHandler) {
         super(animator, viewPortHandler);
-        this.mRenderers = new Array(5);
+        /**
+         * all rederers for the different kinds of data this combined-renderer can draw
+         */
+        this.renderers = new Array(5);
         this.mHighlightBuffer = [];
         this.mChart = new WeakRef(chart);
         this.createRenderers();
     }
+    /**
+     * Creates the renderers needed for this combined-renderer in the required order. Also takes the DrawOrder into
+     * consideration.
+     */
     createRenderers() {
-        this.mRenderers = [];
+        this.renderers = [];
         const chart = this.mChart.get();
-        if (chart == null)
+        if (!chart?.data)
             return;
-        const orders = chart.getDrawOrder();
-        for (const order of orders) {
-            switch (order) {
-                case DrawOrder.BAR:
-                    if (chart.getBarData() != null)
-                        this.mRenderers.push(new BarChartRenderer(chart, this.mAnimator, this.mViewPortHandler));
-                    break;
-                case DrawOrder.BUBBLE:
-                    if (chart.getBubbleData() != null)
-                        this.mRenderers.push(new BubbleChartRenderer(chart, this.mAnimator, this.mViewPortHandler));
-                    break;
-                case DrawOrder.LINE:
-                    if (chart.getLineData() != null)
-                        this.mRenderers.push(new LineChartRenderer(chart, this.mAnimator, this.mViewPortHandler));
-                    break;
-                case DrawOrder.CANDLE:
-                    if (chart.getCandleData() != null)
-                        this.mRenderers.push(new CandleStickChartRenderer(chart, this.mAnimator, this.mViewPortHandler));
-                    break;
-                case DrawOrder.SCATTER:
-                    if (chart.getScatterData() != null)
-                        this.mRenderers.push(new ScatterChartRenderer(chart, this.mAnimator, this.mViewPortHandler));
-                    break;
+        const orders = chart.drawOrder;
+        if (orders) {
+            for (const order of orders) {
+                switch (order) {
+                    case DrawOrder.BAR:
+                        if (chart.barData) {
+                            this.renderers.push(new BarChartRenderer(chart, this.animator, this.mViewPortHandler));
+                        }
+                        break;
+                    case DrawOrder.BUBBLE:
+                        if (chart.bubbleData) {
+                            this.renderers.push(new BubbleChartRenderer(chart, this.animator, this.mViewPortHandler));
+                        }
+                        break;
+                    case DrawOrder.LINE:
+                        if (chart.lineData) {
+                            this.renderers.push(new LineChartRenderer(chart, this.animator, this.mViewPortHandler));
+                        }
+                        break;
+                    case DrawOrder.CANDLE:
+                        if (chart.candleData) {
+                            this.renderers.push(new CandleStickChartRenderer(chart, this.animator, this.mViewPortHandler));
+                        }
+                        break;
+                    case DrawOrder.SCATTER:
+                        if (chart.scatterData) {
+                            this.renderers.push(new ScatterChartRenderer(chart, this.animator, this.mViewPortHandler));
+                        }
+                        break;
+                }
             }
         }
     }
     initBuffers() {
-        for (const renderer of this.mRenderers)
+        for (const renderer of this.renderers)
             renderer.initBuffers();
     }
     drawData(c) {
-        for (const renderer of this.mRenderers)
+        for (const renderer of this.renderers)
             renderer.drawData(c);
     }
     drawValues(c) {
-        for (const renderer of this.mRenderers)
+        for (const renderer of this.renderers)
             renderer.drawValues(c);
     }
     drawExtras(c) {
-        for (const renderer of this.mRenderers)
+        for (const renderer of this.renderers)
             renderer.drawExtras(c);
     }
     drawHighlighted(c, indices) {
         const chart = this.mChart.get();
-        if (chart == null)
+        if (!chart)
             return;
-        for (const renderer of this.mRenderers) {
+        const datas = chart.data.datasArray;
+        for (const renderer of this.renderers) {
             let data = null;
             if (renderer instanceof BarChartRenderer)
-                data = renderer.mChart.getBarData();
+                data = renderer.mChart.barData;
             else if (renderer instanceof LineChartRenderer)
-                data = renderer.mChart.getLineData();
+                data = renderer.mChart.lineData;
             else if (renderer instanceof CandleStickChartRenderer)
-                data = renderer.mChart.getCandleData();
+                data = renderer.mChart.candleData;
             else if (renderer instanceof ScatterChartRenderer)
-                data = renderer.mChart.getScatterData();
+                data = renderer.mChart.scatterData;
             else if (renderer instanceof BubbleChartRenderer)
-                data = renderer.mChart.getBubbleData();
-            const dataIndex = data == null ? -1 : chart.getData().getAllData().indexOf(data);
+                data = renderer.mChart.bubbleData;
+            if (!data) {
+                continue;
+            }
+            const dataIndex = datas.indexOf(data);
             this.mHighlightBuffer = [];
             for (const h of indices) {
                 if (h.dataIndex === dataIndex || h.dataIndex === -1)
@@ -85,19 +106,28 @@ export class CombinedChartRenderer extends DataRenderer {
             renderer.drawHighlighted(c, this.mHighlightBuffer);
         }
     }
+    /**
+     * Returns the sub-renderer object at the specified index.
+     *
+     * @param index
+     * @return
+     */
     getSubRenderer(index) {
-        if (index >= this.mRenderers.length || index < 0) {
+        if (index >= this.renderers.length || index < 0) {
             return null;
         }
         else {
-            return this.mRenderers[index];
+            return this.renderers[index];
         }
     }
+    /**
+     * Returns all sub-renderers.
+     */
     getSubRenderers() {
-        return this.mRenderers;
+        return this.renderers;
     }
     setSubRenderers(renderers) {
-        this.mRenderers = renderers;
+        this.renderers = renderers;
     }
 }
 //# sourceMappingURL=CombinedChartRenderer.js.map

package/renderer/CombinedChartRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"CombinedChartRenderer.js","sourceRoot":"../src/","sources":["renderer/CombinedChartRenderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CombinedChartRenderer.js","sourceRoot":"","sources":["../../../src/ui-chart/renderer/CombinedChartRenderer.ts"],"names":[],"mappings":"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"}

package/renderer/DataRenderer.d.ts

@@ -1,18 +1,40 @@
 import { Canvas, Paint } from '@nativescript-community/ui-canvas';
-import { Color } from '@nativescript/core';
+import Shape from '@nativescript-community/ui-canvas/shapes/shape';
+import { Color, ImageSource } from '@nativescript/core';
 import { ChartAnimator } from '../animation/ChartAnimator';
+import { Chart } from '../charts/Chart';
+import { DataSet } from '../data/DataSet';
 import { Highlight } from '../highlight/Highlight';
 import { ChartInterface } from '../interfaces/dataprovider/ChartInterface';
 import { IDataSet } from '../interfaces/datasets/IDataSet';
 import { ViewPortHandler } from '../utils/ViewPortHandler';
 import { Renderer } from './Renderer';
 export interface BaseCustomRenderer {
-    drawValue?: (c: Canvas, valueText: string, x: number, y: number, color: Color, paint: Paint) => void;
+    drawIcon?<T>(c: Canvas, chart: Chart<any, any, any>, dataSet: DataSet<any>, dataSetIndex: number, entry: T, entryIndex: number, icon: ImageSource | Shape, x: number, y: number): unknown;
+    drawValue?: <T>(c: Canvas, chart: Chart<any, any, any>, dataSet: DataSet<any>, dataSetIndex: number, entry: T, entryIndex: number, valueText: string, x: number, y: number, color: string | Color, paint: Paint) => void;
 }
+/**
+ * Superclass of all render classes for the different data types (line, bar, ...).
+ *
+
+ */
 export declare abstract class DataRenderer extends Renderer {
-    protected mAnimator: ChartAnimator;
+    /**
+     * the animator object used to perform animations on the chart data
+     */
+    animator: ChartAnimator;
+    /**
+     * main palet object used for rendering
+     */
     protected mRenderPaint: Paint;
+    /**
+     * palet used for highlighting values
+     */
     protected mHighlightPaint: Paint;
+    /**
+     * palet object for drawing values (text representing values of chart
+     * entries)
+     */
     protected mValuePaint: Paint;
     constructor(animator: ChartAnimator, viewPortHandler: ViewPortHandler);
     initBuffers(): void;
@@ -20,10 +42,62 @@ export declare abstract class DataRenderer extends Renderer {
     get highlightPaint(): Paint;
     get valuePaint(): Paint;
     protected isDrawingValuesAllowed(chart: ChartInterface): boolean;
+    /**
+     * Applies the required styling (provided by the DataSet) to the value-paint
+     * object.
+     *
+     * @param set
+     */
     protected applyValueTextStyle(set: IDataSet<any>): void;
+    /**
+     * Draws the actual data in form of lines, bars, ... depending on Renderer subclass.
+     *
+     * @param c
+     */
     abstract drawData(c: Canvas): any;
+    /**
+     * Loops over all Entrys and draws their values.
+     *
+     * @param c
+     */
     abstract drawValues(c: Canvas): any;
-    drawValue(c: Canvas, valueText: any, x: any, y: any, color: any, paint: Paint, customRender?: BaseCustomRenderer): void;
+    /**
+     * Draws the value of the given entry by using the provided IValueFormatter.
+     *
+     * @param c         canvas
+     * @param entryIndex label to draw
+     * @param entry label to draw
+     * @param valueText label to draw
+     * @param x         position
+     * @param y         position
+     * @param color
+     * @param paint
+     */
+    drawValue<T>(c: Canvas, chart: Chart<any, any, any>, dataSet: DataSet<any>, dataSetIndex: number, entry: T, entryIndex: any, valueText: string, x: number, y: number, color: string | Color, paint: Paint, customRender?: BaseCustomRenderer): void;
+    /**
+     * Draws the icons of the given entry
+     *
+     * @param canvas         canvas
+     * @param icon icon to draw
+     * @param chart icon to draw
+     * @param x         position
+     * @param y         position
+     * @param color
+     * @param paint
+     */
+    drawIcon<T>(canvas: Canvas, chart: Chart<any, any, any>, dataSet: DataSet<any>, dataSetIndex: number, entry: T, entryIndex: number, icon: ImageSource | Shape, x: number, y: number, customRender?: BaseCustomRenderer): void;
+    /**
+     * Draws any kind of additional information (e.g. line-circles).
+     *
+     * @param c
+     */
     abstract drawExtras(c: Canvas): any;
+    /**
+     * Draws all highlight indicators for the values that are currently highlighted.
+     *
+     * @param c
+     * @param indices the highlighted values
+     * @param actualDraw whether to draw or not
+     */
     abstract drawHighlighted(c: Canvas, indices: Highlight[], actualDraw?: boolean): any;
 }

package/renderer/DataRenderer.js

@@ -1,9 +1,15 @@
+import Shape from '@nativescript-community/ui-canvas/shapes/shape';
 import { Utils } from '../utils/Utils';
 import { Renderer } from './Renderer';
+/**
+ * Superclass of all render classes for the different data types (line, bar, ...).
+ *
+
+ */
 export class DataRenderer extends Renderer {
     constructor(animator, viewPortHandler) {
         super(viewPortHandler);
-        this.mAnimator = animator;
+        this.animator = animator;
     }
     initBuffers() { }
     get renderPaint() {
@@ -27,19 +33,37 @@ export class DataRenderer extends Renderer {
         return this.mValuePaint;
     }
     isDrawingValuesAllowed(chart) {
-        return chart.getData().getEntryCount() < chart.getMaxVisibleCount() * this.mViewPortHandler.getScaleX();
+        return chart.data.entryCount < chart.maxVisibleValueCount * this.mViewPortHandler.getScaleX();
     }
+    /**
+     * Applies the required styling (provided by the DataSet) to the value-paint
+     * object.
+     *
+     * @param set
+     */
     applyValueTextStyle(set) {
-        const typeface = set.getValueTypeface();
+        const typeface = set.valueTypeface;
         if (typeface) {
             this.valuePaint.setTypeface(typeface);
         }
-        this.valuePaint.setTextSize(set.getValueTextSize());
+        this.valuePaint.setTextSize(set.valueTextSize);
     }
-    drawValue(c, valueText, x, y, color, paint, customRender) {
+    /**
+     * Draws the value of the given entry by using the provided IValueFormatter.
+     *
+     * @param c         canvas
+     * @param entryIndex label to draw
+     * @param entry label to draw
+     * @param valueText label to draw
+     * @param x         position
+     * @param y         position
+     * @param color
+     * @param paint
+     */
+    drawValue(c, chart, dataSet, dataSetIndex, entry, entryIndex, valueText, x, y, color, paint, customRender) {
         if (valueText) {
             if (customRender && customRender.drawValue) {
-                customRender.drawValue(c, valueText, x, y, color, paint);
+                customRender.drawValue(c, chart, dataSet, dataSetIndex, entry, entryIndex, valueText, x, y, color, paint);
             }
             else {
                 paint.setColor(color);
@@ -47,5 +71,40 @@ export class DataRenderer extends Renderer {
             }
         }
     }
+    /**
+     * Draws the icons of the given entry
+     *
+     * @param canvas         canvas
+     * @param icon icon to draw
+     * @param chart icon to draw
+     * @param x         position
+     * @param y         position
+     * @param color
+     * @param paint
+     */
+    drawIcon(canvas, chart, dataSet, dataSetIndex, entry, entryIndex, icon, x, y, customRender) {
+        if (icon) {
+            if (customRender && customRender.drawIcon) {
+                customRender.drawIcon(canvas, chart, dataSet, dataSetIndex, entry, entryIndex, icon, x, y);
+            }
+            else {
+                if (icon instanceof Shape) {
+                    const availableWidth = canvas.getWidth();
+                    const availableHeight = canvas.getHeight();
+                    const width = icon.getWidth(availableWidth, availableHeight);
+                    const height = icon.getHeight(availableWidth, availableHeight);
+                    canvas.save();
+                    canvas.translate(x - width / 2, y - height / 2);
+                    icon.drawMyShapeOnCanvas(canvas, chart, availableWidth, availableHeight);
+                    canvas.restore();
+                }
+                else {
+                    const drawOffsetX = x - icon.width / 2;
+                    const drawOffsetY = y - icon.height / 2;
+                    canvas.drawBitmap(__ANDROID__ ? icon.android : icon, drawOffsetX, drawOffsetY, null);
+                }
+            }
+        }
+    }
 }
 //# sourceMappingURL=DataRenderer.js.map

package/renderer/DataRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataRenderer.js","sourceRoot":"../src/","sources":["renderer/DataRenderer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAWtC,MAAM,OAAgB,YAAa,SAAQ,QAAQ;IAsB/C,YAAY,QAAuB,EAAE,eAAgC;QACjE,KAAK,CAAC,eAAe,CAAC,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;IAEM,WAAW,KAAI,CAAC;IAEvB,IAAW,WAAW;QAClB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACpB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;SAC5D;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,IAAW,cAAc;QACrB,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YACvB,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAC9D,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YACvC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;SAC5C;QACD,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAED,IAAW,UAAU;QACjB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;SACtD;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAES,sBAAsB,CAAC,KAAqB;QAClD,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,aAAa,EAAE,GAAG,KAAK,CAAC,kBAAkB,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;IAC5G,CAAC;IAQS,mBAAmB,CAAC,GAAkB;QAC5C,MAAM,QAAQ,GAAG,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACxC,IAAI,QAAQ,EAAE;YACV,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACxD,CAAC;IA0BM,SAAS,CAAC,CAAS,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAY,EAAE,YAAiC;QAC/F,IAAI,SAAS,EAAE;YACX,IAAI,YAAY,IAAI,YAAY,CAAC,SAAS,EAAE;gBACxC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;aAC5D;iBAAM;gBACH,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACtB,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;aACtC;SACJ;IACL,CAAC;CAiBJ"}
+{"version":3,"file":"DataRenderer.js","sourceRoot":"","sources":["../../../src/ui-chart/renderer/DataRenderer.ts"],"names":[],"mappings":"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"}

package/renderer/HorizontalBarChartRenderer.d.ts

@@ -1,5 +1,4 @@
 import { Canvas, Paint, RectF } from '@nativescript-community/ui-canvas';
-import { Highlight } from '../highlight/Highlight';
 import { ChartInterface } from '../interfaces/dataprovider/ChartInterface';
 import { IBarDataSet } from '../interfaces/datasets/IBarDataSet';
 import { Transformer } from '../utils/Transformer';
@@ -10,6 +9,10 @@ export declare class HorizontalBarChartRenderer extends BarChartRenderer {
     protected drawDataSet(c: Canvas, dataSet: IBarDataSet, index: number): boolean;
     drawValues(c: Canvas): void;
     protected prepareBarHighlight(x: number, y1: number, y2: number, barWidthHalf: number, trans: Transformer, barRect: RectF): void;
-    protected setHighlightDrawPos(high: Highlight, bar: RectF): void;
+    /**
+     * Sets the drawing position of the highlight object based on the riven bar-rect.
+     * @param high
+     * @param bar
+     */
     protected isDrawingValuesAllowed(chart: ChartInterface): boolean;
 }