@nativescript-community/ui-chart 1.2.35 → 2.0.0

package/renderer/ScatterChartRenderer.js

@@ -1,44 +1,48 @@
-import { LineScatterCandleRadarRenderer } from './LineScatterCandleRadarRenderer';
-import { CLog, CLogTypes, Utils } from '../utils/Utils';
 import { Trace } from '@nativescript/core';
+import { CLog, CLogTypes, Utils } from '../utils/Utils';
+import { LineScatterCandleRadarRenderer } from './LineScatterCandleRadarRenderer';
 export class ScatterChartRenderer extends LineScatterCandleRadarRenderer {
     constructor(chart, animator, viewPortHandler) {
         super(animator, viewPortHandler);
         this.mChart = chart;
     }
     drawData(c) {
-        const scatterData = this.mChart.getScatterData();
-        for (const set of scatterData.getDataSets()) {
-            if (set.isVisible()) {
+        const scatterData = this.mChart.scatterData;
+        for (const set of scatterData.dataSets) {
+            if (set.visible) {
                 this.drawDataSet(c, set);
             }
         }
     }
     drawDataSet(c, dataSet) {
-        if (dataSet.getEntryCount() < 1)
+        if (dataSet.entryCount < 1)
             return;
         const viewPortHandler = this.mViewPortHandler;
-        const trans = this.mChart.getTransformer(dataSet.getAxisDependency());
-        const phaseY = this.mAnimator.getPhaseY();
-        const renderer = dataSet.getShapeRenderer();
-        if (renderer == null) {
+        const trans = this.mChart.getTransformer(dataSet.axisDependency);
+        const phaseY = this.animator.phaseY;
+        const renderer = dataSet.shapeRenderer;
+        if (!renderer) {
             if (Trace.isEnabled()) {
                 CLog(CLogTypes.warning, "There's no IShapeRenderer specified for ScatterDataSet");
             }
             return;
         }
-        const max = Math.min(Math.ceil(dataSet.getEntryCount() * this.mAnimator.getPhaseX()), dataSet.getEntryCount());
+        const max = Math.min(Math.ceil(dataSet.entryCount * this.animator.phaseX), dataSet.entryCount);
         const yKey = dataSet.yProperty;
-        const customRender = this.mChart.getCustomRenderer();
+        const customRender = this.mChart.customRenderer;
         const renderPaint = this.renderPaint;
         const pixelBuffer = Utils.getTempArray(2);
         const previousShader = renderPaint.getShader();
-        const shader = dataSet.getFillShader();
+        const shader = dataSet.fillShader;
         if (shader) {
             renderPaint.setShader(shader);
         }
         for (let i = 0; i < max; i++) {
             const e = dataSet.getEntryForIndex(i);
+            const yVal = e[yKey];
+            if (yVal === undefined || yVal === null) {
+                continue;
+            }
             pixelBuffer[0] = dataSet.getEntryXValue(e, i);
             pixelBuffer[1] = e[yKey] * phaseY;
             trans.pointValuesToPixel(pixelBuffer);
@@ -57,54 +61,63 @@ export class ScatterChartRenderer extends LineScatterCandleRadarRenderer {
         renderPaint.setShader(previousShader);
     }
     drawValues(c) {
-        const data = this.mChart.getScatterData();
-        const dataSets = data.getDataSets();
-        if (!this.isDrawingValuesAllowed(this.mChart) || dataSets.some((d) => d.isDrawValuesEnabled() || d.isDrawIconsEnabled()) === false) {
+        const chart = this.mChart;
+        const data = chart.scatterData;
+        const dataSets = data.dataSets;
+        if (!this.isDrawingValuesAllowed(chart) || dataSets.some((d) => d.drawValuesEnabled || d.drawIconsEnabled) === false) {
             return;
         }
-        const customRender = this.mChart.getCustomRenderer();
-        for (let i = 0; i < this.mChart.getScatterData().getDataSetCount(); i++) {
+        // if values are drawn
+        const customRender = chart.customRenderer;
+        for (let i = 0; i < chart.scatterData.dataSetCount; i++) {
             const dataSet = dataSets[i];
             const yKey = dataSet.yProperty;
-            if (!this.shouldDrawValues(dataSet) || dataSet.getEntryCount() < 1)
+            if (!this.shouldDrawValues(dataSet) || dataSet.entryCount < 1)
                 continue;
+            // apply the text-styling defined by the DataSet
             this.applyValueTextStyle(dataSet);
-            this.mXBounds.set(this.mChart, dataSet, this.mAnimator);
-            const { points, count } = this.mChart
-                .getTransformer(dataSet.getAxisDependency())
-                .generateTransformedValuesScatter(dataSet, this.mAnimator.getPhaseX(), this.mAnimator.getPhaseY(), this.mXBounds.min, this.mXBounds.max);
-            const shapeSize = dataSet.getScatterShapeSize();
-            const formatter = dataSet.getValueFormatter();
-            const iconsOffset = dataSet.getIconsOffset();
-            const valuesOffset = dataSet.getValuesOffset();
-            const drawValues = dataSet.isDrawValuesEnabled();
-            const drawIcons = dataSet.isDrawIconsEnabled();
+            this.mXBounds.set(chart, dataSet, this.animator);
+            const { points, count } = chart
+                .getTransformer(dataSet.axisDependency)
+                .generateTransformedValuesScatter(dataSet, this.animator.phaseX, this.animator.phaseY, this.mXBounds.min, this.mXBounds.max);
+            const shapeSize = dataSet.scatterShapeSize;
+            const formatter = dataSet.valueFormatter;
+            const iconsOffset = dataSet.iconsOffset;
+            const valuesOffset = dataSet.valuesOffset;
+            const drawValues = dataSet.drawValuesEnabled;
+            const drawIcons = dataSet.drawIconsEnabled;
             const paint = this.valuePaint;
             for (let j = 0; j < count; j += 2) {
                 if (!this.mViewPortHandler.isInBoundsRight(points[j]))
                     break;
+                // make sure the lines don't do shitty things outside bounds
                 if (!this.mViewPortHandler.isInBoundsLeft(points[j]) || !this.mViewPortHandler.isInBoundsY(points[j + 1]))
                     continue;
-                const entry = dataSet.getEntryForIndex(j / 2 + this.mXBounds.min);
+                const index = j / 2 + this.mXBounds.min;
+                const entry = dataSet.getEntryForIndex(index);
+                const yVal = entry[yKey];
+                if (yVal === undefined || yVal === null) {
+                    continue;
+                }
                 if (drawValues) {
-                    this.drawValue(c, formatter.getPointLabel(entry[yKey], entry), points[j] + valuesOffset.x, points[j + 1] + valuesOffset.y - shapeSize, dataSet.getValueTextColor(j / 2 + this.mXBounds.min), paint, customRender);
+                    this.drawValue(c, chart, dataSet, i, entry, index, (formatter.getPointLabel || formatter.getFormattedValue).call(formatter, yVal, entry), points[j] + valuesOffset.x, points[j + 1] + valuesOffset.y - shapeSize, dataSet.getValueTextColor(j / 2 + this.mXBounds.min), paint, customRender);
                 }
-                if (drawIcons && entry.icon) {
-                    Utils.drawIcon(c, this.mChart, entry.icon, points[j] + iconsOffset.x, points[j + 1] + iconsOffset.y);
+                if (drawIcons) {
+                    this.drawIcon(c, chart, dataSet, i, entry, index, dataSet.getEntryIcon(entry), points[j] + iconsOffset.x, points[j + 1] + iconsOffset.y, customRender);
                 }
             }
         }
     }
     drawExtras(c) { }
     drawHighlighted(c, indices) {
-        const scatterData = this.mChart.getScatterData();
+        const scatterData = this.mChart.scatterData;
         let entry, index;
-        const customRender = this.mChart.getCustomRenderer();
+        const customRender = this.mChart.customRenderer;
         const paint = this.highlightPaint;
         for (const high of indices) {
             const set = scatterData.getDataSetByIndex(high.dataSetIndex);
             const yKey = set.yProperty;
-            if (set == null || !set.isHighlightEnabled())
+            if (!set || !set.highlightEnabled)
                 continue;
             if (high.entry) {
                 entry = high.entry;
@@ -117,7 +130,7 @@ export class ScatterChartRenderer extends LineScatterCandleRadarRenderer {
             }
             if (!this.isInBoundsX(entry, set))
                 continue;
-            const pix = this.mChart.getTransformer(set.getAxisDependency()).getPixelForValues(set.getEntryXValue(entry, index), entry[yKey] * this.mAnimator.getPhaseY());
+            const pix = this.mChart.getTransformer(set.axisDependency).getPixelForValues(set.getEntryXValue(entry, index), entry[yKey] * this.animator.phaseY);
             high.x = pix.x;
             high.y = pix.y;
             if (customRender && customRender.drawHighlight) {
@@ -126,6 +139,7 @@ export class ScatterChartRenderer extends LineScatterCandleRadarRenderer {
             else {
                 this.drawHighlightLines(c, pix.x, pix.y, set);
             }
+            // draw the lines
             this.drawHighlightLines(c, pix.x, pix.y, set);
         }
     }

package/renderer/ScatterChartRenderer.js.map

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

package/renderer/XAxisRenderer.d.ts

@@ -1,5 +1,5 @@
-import { Canvas, Paint, RectF } from '@nativescript-community/ui-canvas';
 import { TypedArray } from '@nativescript-community/arraybuffers';
+import { Canvas, Paint, RectF } from '@nativescript-community/ui-canvas';
 import { LimitLine } from '../components/LimitLine';
 import { XAxis } from '../components/XAxis';
 import { MPPointF } from '../utils/MPPointF';
@@ -7,7 +7,7 @@ import { Transformer } from '../utils/Transformer';
 import { ViewPortHandler } from '../utils/ViewPortHandler';
 import { AxisRenderer, CustomRendererGridLineFunction, CustomRendererLabelFunction, CustomRendererLimitLineFunction } from './AxisRenderer';
 export declare class XAxisRenderer extends AxisRenderer {
-    protected mXAxis: XAxis;
+    protected xAxis: XAxis;
     protected mForceLongestLabelComputation: boolean;
     protected mLabelsPositionsBuffer: TypedArray;
     protected mRenderGridLinesBuffer: TypedArray;
@@ -21,12 +21,37 @@ export declare class XAxisRenderer extends AxisRenderer {
     protected computeSize(): void;
     renderAxisLabels(c: Canvas): void;
     renderAxisLine(c: Canvas): void;
+    /**
+     * draws the x-labels on the specified y-position
+     *
+     * @param pos
+     */
     protected drawLabels(c: Canvas, pos: any, anchor: MPPointF): void;
-    protected drawLabel(c: Canvas, formattedLabel: any, x: any, y: any, anchor: MPPointF, angleDegrees: any, paint: any, customRenderFunction?: CustomRendererLabelFunction): void;
-    protected drawMarkTicket(c: Canvas, pos: any, ticklength: any): void;
+    protected drawLabel(c: Canvas, formattedLabel: string, x: number, y: number, anchor: MPPointF, angleDegrees: number, paint: Paint, customRenderFunction?: CustomRendererLabelFunction): void;
+    /**
+     * Draw the mark tickets on the specified y-position
+     * @param c
+     * @param pos
+     * @param length
+     */
+    protected drawMarkTick(c: Canvas, pos: any, ticklength: any): void;
     renderGridLines(c: Canvas): void;
     getGridClippingRect(): RectF;
+    /**
+     * Draws the grid line at the specified position using the provided path.
+     *
+     * @param c
+     * @param rect
+     * @param x
+     * @param y
+     * @param axisValue
+     */
     protected drawGridLine(c: Canvas, rect: RectF, x: any, y: any, axisValue: any, paint: Paint, customRendererFunc: CustomRendererGridLineFunction): void;
+    /**
+     * Draws the LimitLines associated with this axis to the screen.
+     *
+     * @param c
+     */
     renderLimitLines(c: Canvas): void;
     renderLimitLineLine(c: Canvas, limitLine: LimitLine, rect: RectF, x: number, customRendererFunc?: CustomRendererLimitLineFunction): void;
     renderLimitLineLabel(c: Canvas, limitLine: LimitLine, position: any, yOffset: any): void;