scichart 2.0.2228 → 2.1.2273

package/Charting/Visuals/RenderableSeries/DrawingProviders/LineSeriesDrawingProvider.d.ts

@@ -1,9 +1,9 @@
 import { TSciChart } from "../../../../types/TSciChart";
 import { WebGlRenderContext2D } from "../../../Drawing/WebGlRenderContext2D";
 import { RenderPassData } from "../../../Services/RenderPassData";
+import { TDpiChangedEventArgs } from "../../TextureManager/DpiHelper";
 import { BaseLineRenderableSeries } from "../BaseLineRenderableSeries";
 import { BaseSeriesDrawingProvider } from "./BaseSeriesDrawingProvider";
-import { TDpiChangedEventArgs } from "../../TextureManager/DpiHelper";
 /**
  * Used internally - a drawing provider performs drawing for a {@link FastLineRenderableSeries} using
  * our WebAssembly WebGL rendering engine
@@ -11,6 +11,7 @@ import { TDpiChangedEventArgs } from "../../TextureManager/DpiHelper";
 export declare class LineSeriesDrawingProvider extends BaseSeriesDrawingProvider<BaseLineRenderableSeries> {
     private linesPenCache;
     private nativeDrawingProvider;
+    private args;
     /**
      * Creates an instance of the {@link LineSeriesDrawingProvider}
      * @param webAssemblyContext The {@link TSciChart | SciChart 2D WebAssembly Context} containing native methods and

package/Charting/Visuals/RenderableSeries/DrawingProviders/LineSeriesDrawingProvider.js

@@ -37,6 +37,7 @@ var LineSeriesDrawingProvider = /** @class */ (function (_super) {
     function LineSeriesDrawingProvider(webAssemblyContext, parentSeries) {
         var _this = _super.call(this, webAssemblyContext, parentSeries) || this;
         _this.linesPenCache = new Pen2DCache_1.Pen2DCache(webAssemblyContext);
+        _this.args = new webAssemblyContext.SCRTLineDrawingParams();
         return _this;
     }
     /**
@@ -87,22 +88,23 @@ var LineSeriesDrawingProvider = /** @class */ (function (_super) {
         if (!linesPen) {
             return;
         }
-        // TODO: We need to get truncated pointseries out (viewport culling) for efficient drawing of large datasets
-        var dataSeries = this.parentSeries.dataSeries;
-        var args = new this.webAssemblyContext.SCRTLineDrawingParams();
-        args.SetLinesPen(linesPen);
-        args.isDigitalLine = this.parentSeries.isDigitalLine;
-        args.forceShaderMethod = true;
-        args.lineGaps = dataSeries.containsNaN
+        var pointSeries = renderPassData.pointSeries;
+        var containsNaN = this.parentSeries.dataSeries.dataDistributionCalculator.containsNaN;
+        this.args.Reset();
+        this.args.SetLinesPen(linesPen);
+        this.args.isDigitalLine = this.parentSeries.isDigitalLine;
+        this.args.forceShaderMethod = true;
+        this.args.containsNaN = containsNaN;
+        this.args.lineGaps = containsNaN
             ? this.parentSeries.drawNaNAs === WebGlRenderContext2D_1.ELineDrawMode.DiscontinuousLine
                 ? this.webAssemblyContext.SCRTLineGapMode.DrawGaps
                 : this.webAssemblyContext.SCRTLineGapMode.CloseGaps
             : this.webAssemblyContext.SCRTLineGapMode.Default;
-        args.verticalChart = renderPassData.isVerticalChart;
+        this.args.verticalChart = renderPassData.isVerticalChart;
         var isCategoryAxis = renderPassData.xCoordinateCalculator.isCategoryCoordinateCalculator;
-        var xValues = dataSeries.getNativeXValues();
-        var xDrawValues = isCategoryAxis ? dataSeries.getNativeIndexes() : xValues;
-        var yDrawValues = dataSeries.getNativeYValues();
+        var xValues = pointSeries.xValues;
+        var xDrawValues = isCategoryAxis ? pointSeries.indexes : xValues;
+        var yDrawValues = pointSeries.yValues;
         var isSplineLineSeries = this.parentSeries.type === SeriesType_1.ESeriesType.SplineLineSeries && xValues.size() > 1;
         if (isSplineLineSeries) {
             var spline = this.parentSeries;
@@ -113,15 +115,14 @@ var LineSeriesDrawingProvider = /** @class */ (function (_super) {
             xDrawValues = spline.xSplineValues;
             yDrawValues = spline.ySplineValues;
         }
-        args.count = yDrawValues.size();
+        this.args.count = yDrawValues.size();
         // Stroke paletting per point
         this.applyStrokePaletting(linesPen);
         if (this.palettingState.palettedColors) {
-            args.SetPalettedColors(this.palettingState.palettedColors);
+            this.args.SetPalettedColors(this.palettingState.palettedColors);
         }
         var nativeContext = renderContext.getNativeContext();
-        this.drawLines(renderContext, nativeContext, xDrawValues, yDrawValues, renderPassData.xCoordinateCalculator.nativeCalculator, renderPassData.yCoordinateCalculator.nativeCalculator, args, this.parentSeries.parentSurface.seriesViewRect);
-        args.delete();
+        this.drawLines(renderContext, nativeContext, xDrawValues, yDrawValues, renderPassData.xCoordinateCalculator.nativeCalculator, renderPassData.yCoordinateCalculator.nativeCalculator, this.args, this.parentSeries.parentSurface.seriesViewRect);
     };
     /**
      * @inheritDoc
@@ -129,16 +130,11 @@ var LineSeriesDrawingProvider = /** @class */ (function (_super) {
     LineSeriesDrawingProvider.prototype.delete = function () {
         this.linesPenCache = (0, Deleter_1.deleteSafe)(this.linesPenCache);
         this.nativeDrawingProvider = (0, Deleter_1.deleteSafe)(this.nativeDrawingProvider);
+        this.args = (0, Deleter_1.deleteSafe)(this.args);
         _super.prototype.delete.call(this);
     };
     LineSeriesDrawingProvider.prototype.drawLines = function (renderContext, nativeContext, xValues, yValues, xCoordCalc, yCoordCalc, args, viewRect) {
-        nativeContext.PushMatrix();
-        nativeContext.PushState();
-        nativeContext.Translate(viewRect.x, viewRect.y);
-        nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
         this.nativeDrawingProvider.DrawLinesVec(nativeContext, xValues, yValues, xCoordCalc, yCoordCalc, args);
-        nativeContext.PopMatrix();
-        nativeContext.PopState();
     };
     return LineSeriesDrawingProvider;
 }(BaseSeriesDrawingProvider_1.BaseSeriesDrawingProvider));

package/Charting/Visuals/RenderableSeries/DrawingProviders/MountainSeriesDrawingProvider.js

@@ -56,11 +56,11 @@ var MountainSeriesDrawingProvider = /** @class */ (function (_super) {
      */
     MountainSeriesDrawingProvider.prototype.draw = function (renderContext, renderPassData) {
         var _a;
-        // TODO: We need to get truncated pointseries out (viewport culling) for efficient drawing of large datasets
-        var dataSeries = this.parentSeries.dataSeries;
+        var pointSeries = renderPassData.pointSeries;
+        var containsNaN = this.parentSeries.dataSeries.dataDistributionCalculator.containsNaN;
         var args = new this.webAssemblyContext.SCRTMountainDrawingParams();
         args.forceShaderMethod = true;
-        args.lineGaps = dataSeries.containsNaN
+        args.lineGaps = containsNaN
             ? this.parentSeries.drawNaNAs === WebGlRenderContext2D_1.ELineDrawMode.DiscontinuousLine
                 ? this.webAssemblyContext.SCRTLineGapMode.DrawGaps
                 : this.webAssemblyContext.SCRTLineGapMode.CloseGaps
@@ -84,9 +84,9 @@ var MountainSeriesDrawingProvider = /** @class */ (function (_super) {
         }
         args.isSmoothColors = this.palettingState.gradientPaletting;
         var isCategoryAxis = renderPassData.xCoordinateCalculator.isCategoryCoordinateCalculator;
-        var xValues = dataSeries.getNativeXValues();
-        var xDrawValues = isCategoryAxis ? dataSeries.getNativeIndexes() : xValues;
-        var yDrawValues = dataSeries.getNativeYValues();
+        var xValues = pointSeries.xValues;
+        var xDrawValues = isCategoryAxis ? pointSeries.indexes : xValues;
+        var yDrawValues = pointSeries.yValues;
         var isSplineMountainSeries = this.parentSeries.type === SeriesType_1.ESeriesType.SplineMountainSeries && xValues.size() > 1;
         if (isSplineMountainSeries) {
             var rs = this.parentSeries;
@@ -99,13 +99,7 @@ var MountainSeriesDrawingProvider = /** @class */ (function (_super) {
         args.count = yDrawValues.size();
         var nativeContext = renderContext.getNativeContext();
         var viewRect = this.parentSeries.parentSurface.seriesViewRect;
-        nativeContext.PushMatrix();
-        nativeContext.PushState();
-        nativeContext.Translate(viewRect.x, viewRect.y);
-        nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
         this.nativeDrawingProvider.DrawPointsVec(nativeContext, xDrawValues, yDrawValues, renderPassData.xCoordinateCalculator.nativeCalculator, renderPassData.yCoordinateCalculator.nativeCalculator, args);
-        nativeContext.PopMatrix();
-        nativeContext.PopState();
         args.delete();
     };
     /**

package/Charting/Visuals/RenderableSeries/DrawingProviders/OhlcSeriesDrawingProvider.js

@@ -95,6 +95,7 @@ var OhlcSeriesDrawingProvider = /** @class */ (function (_super) {
      * @inheritDoc
      */
     OhlcSeriesDrawingProvider.prototype.draw = function (renderContext, renderPassData) {
+        var pointSeries = renderPassData.pointSeries;
         var args = new this.webAssemblyContext.SCRTOhlcDrawingParams();
         try {
             // Candles only requires brush up, down
@@ -108,7 +109,7 @@ var OhlcSeriesDrawingProvider = /** @class */ (function (_super) {
             }
             var strokeUpPen = (0, Pen2DCache_1.getScrtPenFromCache)(this.strokeUpPenCache);
             var strokeDownPen = (0, Pen2DCache_1.getScrtPenFromCache)(this.strokeDownPenCache);
-            // Ohlc and candle both require stroke up, down
+            // OHLC and Candle both require stroke up, down
             if (!strokeUpPen || !strokeDownPen) {
                 return;
             }
@@ -123,22 +124,15 @@ var OhlcSeriesDrawingProvider = /** @class */ (function (_super) {
             args.drawAsOhlc = this.drawingMode === EOhlcDrawingMode.Ohlc;
             var nativeContext = renderContext.getNativeContext();
             var viewRect = this.parentSeries.parentSurface.seriesViewRect;
-            // TODO: We need to get truncated pointseries out (viewport culling) for efficient drawing of large datasets
-            var dataSeries = this.parentSeries.dataSeries;
+            // const dataSeries = this.parentSeries.dataSeries as OhlcDataSeries;
             var isCategoryAxis = renderPassData.xCoordinateCalculator.isCategoryCoordinateCalculator;
-            var xValues = dataSeries.getNativeXValues();
-            var openValues = dataSeries.getNativeOpenValues();
-            var highValues = dataSeries.getNativeHighValues();
-            var lowValues = dataSeries.getNativeLowValues();
-            var closeValues = dataSeries.getNativeCloseValues();
+            var xValues = pointSeries.xValues;
+            var openValues = pointSeries.openValues;
+            var highValues = pointSeries.highValues;
+            var lowValues = pointSeries.lowValues;
+            var closeValues = pointSeries.closeValues;
             args.count = closeValues.size();
-            nativeContext.PushMatrix();
-            nativeContext.PushState();
-            nativeContext.Translate(viewRect.x, viewRect.y);
-            nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
-            this.nativeDrawingProvider.DrawPointsVec(nativeContext, isCategoryAxis ? dataSeries.getNativeIndexes() : xValues, openValues, highValues, lowValues, closeValues, renderPassData.xCoordinateCalculator.nativeCalculator, renderPassData.yCoordinateCalculator.nativeCalculator, args);
-            nativeContext.PopMatrix();
-            nativeContext.PopState();
+            this.nativeDrawingProvider.DrawPointsVec(nativeContext, isCategoryAxis ? pointSeries.indexes : xValues, openValues, highValues, lowValues, closeValues, renderPassData.xCoordinateCalculator.nativeCalculator, renderPassData.yCoordinateCalculator.nativeCalculator, args);
         }
         finally {
             args.delete();

package/Charting/Visuals/RenderableSeries/DrawingProviders/PointMarkerDrawingProvider.d.ts

@@ -1,7 +1,7 @@
-import { DoubleVector, TSciChart } from "../../../../types/TSciChart";
+import { SCRTDoubleVector, TSciChart } from "../../../../types/TSciChart";
 import { WebGlRenderContext2D } from "../../../Drawing/WebGlRenderContext2D";
-import { IDataSeries } from "../../../Model/IDataSeries";
 import { IPointMetadata } from "../../../Model/IPointMetadata";
+import { IPointSeries } from "../../../Model/PointSeries/IPointSeries";
 import { RenderPassData } from "../../../Services/RenderPassData";
 import { IRenderableSeries } from "../IRenderableSeries";
 import { ISpline } from "../ISpline";
@@ -16,6 +16,7 @@ export declare class PointMarkerDrawingProvider extends BaseSeriesDrawingProvide
     private ySplineValuesSelector;
     private xAnimationPointMarkerValues;
     private yAnimationPointMarkerValues;
+    private args;
     /**
      * Creates an instance of the {@link PointMarkerDrawingProvider}
      * @param webAssemblyContext The {@link TSciChart | SciChart 2D WebAssembly Context} containing native methods and
@@ -24,7 +25,7 @@ export declare class PointMarkerDrawingProvider extends BaseSeriesDrawingProvide
      * @param ySelector an optional Y-selector for choosing which y-values to use for drawing points
      * @param ySplineSelector an optional selector for choosing which y-animation values to use for drawing points
      */
-    constructor(webAssemblyContext: TSciChart, parentSeries: IRenderableSeries, ySelector?: (ds: IDataSeries) => DoubleVector, ySplineSelector?: (rs: ISpline) => DoubleVector);
+    constructor(webAssemblyContext: TSciChart, parentSeries: IRenderableSeries, ySelector?: (ps: IPointSeries) => SCRTDoubleVector, ySplineSelector?: (rs: ISpline) => SCRTDoubleVector);
     /**
      * @inheritDoc
      */

package/Charting/Visuals/RenderableSeries/DrawingProviders/PointMarkerDrawingProvider.js

@@ -34,11 +34,12 @@ var PointMarkerDrawingProvider = /** @class */ (function (_super) {
      */
     function PointMarkerDrawingProvider(webAssemblyContext, parentSeries, ySelector, ySplineSelector) {
         var _this = _super.call(this, webAssemblyContext, parentSeries) || this;
-        _this.ySelector = ySelector === undefined ? function (ds) { return ds.getNativeYValues(); } : ySelector;
+        _this.ySelector = ySelector === undefined ? function (ps) { return ps.yValues; } : ySelector;
         _this.ySplineValuesSelector = ySplineSelector === undefined ? function (rs) { return rs.ySplineValues; } : ySplineSelector;
         _this.nativeDrawingProvider = new _this.webAssemblyContext.SCRTScatterSeriesDrawingProvider();
-        _this.xAnimationPointMarkerValues = new _this.webAssemblyContext.DoubleVector();
-        _this.yAnimationPointMarkerValues = new _this.webAssemblyContext.DoubleVector();
+        _this.xAnimationPointMarkerValues = new _this.webAssemblyContext.SCRTDoubleVector();
+        _this.yAnimationPointMarkerValues = new _this.webAssemblyContext.SCRTDoubleVector();
+        _this.args = new _this.webAssemblyContext.SCRTPointDrawingParams();
         return _this;
     }
     /**
@@ -67,11 +68,10 @@ var PointMarkerDrawingProvider = /** @class */ (function (_super) {
             // renderContext.getNativeContext().DrawTexture(spriteTexture.getTexture(), 10, 10, 256, 256);
             // END DEBUG CODE
         }
-        var dataSeries = this.parentSeries.dataSeries;
-        var args = new this.webAssemblyContext.SCRTPointDrawingParams();
+        var pointSeries = renderPassData.pointSeries;
         var isCategoryAxis = renderPassData.xCoordinateCalculator.isCategoryCoordinateCalculator;
-        var xValues = dataSeries.getNativeXValues();
-        var yValues = this.ySelector(dataSeries);
+        var xValues = pointSeries.xValues;
+        var yValues = this.ySelector(pointSeries);
         if (this.parentSeries.isSpline) {
             var spline = this.parentSeries;
             if (spline.xSplineValues.size() > 0 && spline.ySplineValues.size() > 0) {
@@ -80,19 +80,19 @@ var PointMarkerDrawingProvider = /** @class */ (function (_super) {
                 yValues = this.yAnimationPointMarkerValues;
             }
         }
-        args.count = yValues.size();
-        args.verticalChart = renderPassData.isVerticalChart;
-        args.forceShaderMethod = true;
-        args.SetSpriteTexture(spriteTexture.getTexture());
+        this.args.Reset();
+        this.args.count = yValues.size();
+        this.args.verticalChart = renderPassData.isVerticalChart;
+        this.args.forceShaderMethod = true;
+        this.args.SetSpriteTexture(spriteTexture.getTexture());
         if (strokeMaskTexture) {
-            args.SetStrokeMask(strokeMaskTexture.getTexture());
+            this.args.SetStrokeMask(strokeMaskTexture.getTexture());
         }
         // Paletting per point
         _super.prototype.applyStrokeFillPaletting.call(this, pointMarker.stroke, undefined, pointMarker.fill, undefined, this.parentSeries.opacity);
-        args.SetPalettedColors(this.palettingState.palettedColors);
+        this.args.SetPalettedColors(this.palettingState.palettedColors);
         var nativeContext = renderContext.getNativeContext();
-        this.drawPoints(nativeContext, isCategoryAxis ? dataSeries.getNativeIndexes() : xValues, yValues, renderPassData.xCoordinateCalculator.nativeCalculator, renderPassData.yCoordinateCalculator.nativeCalculator, args, this.parentSeries.parentSurface.seriesViewRect);
-        args.delete();
+        this.drawPoints(nativeContext, isCategoryAxis ? pointSeries.indexes : xValues, yValues, renderPassData.xCoordinateCalculator.nativeCalculator, renderPassData.yCoordinateCalculator.nativeCalculator, this.args, this.parentSeries.parentSurface.seriesViewRect);
     };
     /**
      * @inheritDoc
@@ -101,6 +101,7 @@ var PointMarkerDrawingProvider = /** @class */ (function (_super) {
         this.nativeDrawingProvider = (0, Deleter_1.deleteSafe)(this.nativeDrawingProvider);
         this.xAnimationPointMarkerValues = (0, Deleter_1.deleteSafe)(this.xAnimationPointMarkerValues);
         this.yAnimationPointMarkerValues = (0, Deleter_1.deleteSafe)(this.yAnimationPointMarkerValues);
+        this.args = (0, Deleter_1.deleteSafe)(this.args);
         _super.prototype.delete.call(this);
     };
     PointMarkerDrawingProvider.prototype.overridePaletteProviderColors = function (rs, xValue, yValue, index, opacity, metadata) {
@@ -116,13 +117,7 @@ var PointMarkerDrawingProvider = /** @class */ (function (_super) {
         return false;
     };
     PointMarkerDrawingProvider.prototype.drawPoints = function (nativeContext, xValues, yValues, xCoordCalc, yCoordCalc, args, viewRect) {
-        nativeContext.PushMatrix();
-        nativeContext.PushState();
-        nativeContext.Translate(viewRect.x, viewRect.y);
-        nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
         this.nativeDrawingProvider.DrawPointsVec(nativeContext, xValues, yValues, xCoordCalc, yCoordCalc, args);
-        nativeContext.PopMatrix();
-        nativeContext.PopState();
     };
     PointMarkerDrawingProvider.prototype.pointMarkerXYValuesFromSpline = function (size, xAnimationValues, yAnimationValues, interpolationPoints) {
         this.xAnimationPointMarkerValues.resize(size, 0);

package/Charting/Visuals/RenderableSeries/DrawingProviders/UniformContoursDrawingProvider.js

@@ -117,19 +117,12 @@ var UniformContoursDrawingProvider = /** @class */ (function (_super) {
         contourParams.SetParamsBVector(zMin, zMax, 0, 0);
         // Draw major contour lines
         var nativeContext = renderContext.getNativeContext();
-        var viewRect = this.parentSeries.parentSurface.seriesViewRect;
-        nativeContext.PushMatrix();
-        nativeContext.PushState();
-        nativeContext.Translate(viewRect.x, viewRect.y);
-        nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
         // console.log(`viewRect: ${viewRect.x}, ${viewRect.y}, ${viewRect.width}, ${viewRect.height}`);
         // console.log(`contours bounds: ${startX}, ${startY}, ${endX}, ${endY}`);
         var heightsTexture = this.heightsTextureCache.value;
         nativeContext.DrawHeatmapRectWithContours(null, heightsTexture, x, y, width, height, floatParams, contourParams);
         floatParams === null || floatParams === void 0 ? void 0 : floatParams.delete();
         contourParams === null || contourParams === void 0 ? void 0 : contourParams.delete();
-        nativeContext.PopMatrix();
-        nativeContext.PopState();
     };
     UniformContoursDrawingProvider.prototype.computeHeightMap = function (textureHeight, textureWidth, zValues, isVerticalChart, xFlipped, yFlipped) {
         var _a;
@@ -143,8 +136,8 @@ var UniformContoursDrawingProvider = /** @class */ (function (_super) {
         for (var y = 0; y < textureHeight; y++) {
             for (var x = 0; x < textureWidth; x++) {
                 var zValue = !isVerticalChart
-                    ? zValues[!yFlipped ? (textureHeight - 1) - y : y][xFlipped ? (textureWidth - x) - 1 : x]
-                    : zValues[!yFlipped ? (textureWidth - 1) - x : x][xFlipped ? (textureHeight - y) - 1 : y];
+                    ? zValues[!yFlipped ? textureHeight - 1 - y : y][xFlipped ? textureWidth - x - 1 : x]
+                    : zValues[!yFlipped ? textureWidth - 1 - x : x][xFlipped ? textureHeight - y - 1 : y];
                 // Todo: Set into a javascript array then bulk set the array on heightData
                 this.heightData.set(y * textureWidth + x, isNaN(zValue) ? -1.0 : zValue);
             }

package/Charting/Visuals/RenderableSeries/DrawingProviders/UniformHeatmapDrawingProvider.js

@@ -110,14 +110,11 @@ var UniformHeatmapDrawingProvider = /** @class */ (function (_super) {
             var yMax = renderPassData.yCoordinateCalculator.getCoordinate(yRange.max);
             var nativeContext = renderContext.getNativeContext();
             var viewRect = this.parentSeries.parentSurface.seriesViewRect;
-            nativeContext.PushMatrix();
-            nativeContext.PushState();
             var textureWidth = Math.abs(xMin - xMax);
             if (isVerticalChart) {
                 nativeContext.Rotate(-90);
                 var xTrans = hasFlippedXCoordinates ? -viewRect.y - xMin : -textureWidth - viewRect.y - xMin;
                 nativeContext.Translate(xTrans, viewRect.x);
-                nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
                 var x = hasFlippedXCoordinates ? 0 : textureWidth;
                 var width = hasFlippedXCoordinates ? textureWidth : 0;
                 var y = yMin;
@@ -126,12 +123,8 @@ var UniformHeatmapDrawingProvider = /** @class */ (function (_super) {
                 // Maybe to use nativeContext.Scale(-1, 1);???
             }
             else {
-                nativeContext.Translate(viewRect.x, viewRect.y);
-                nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
                 this.drawHeatmap(nativeContext, xMin, yMin, xMax, yMax);
             }
-            nativeContext.PopMatrix();
-            nativeContext.PopState();
         }
     };
     UniformHeatmapDrawingProvider.prototype.createPaletteTexture = function (width, height, gradientStops, globalOpacity, hasNaNs) {

package/Charting/Visuals/RenderableSeries/FastBubbleRenderableSeries.d.ts

@@ -1,5 +1,8 @@
 import { ESeriesType } from "../../../types/SeriesType";
-import { DoubleVector, TSciChart } from "../../../types/TSciChart";
+import { IPointMarkerPaletteProvider } from "../../Model/IPaletteProvider";
+import { SCRTDoubleVector, TSciChart } from "../../../types/TSciChart";
+import { IPointSeries } from "../../Model/PointSeries/IPointSeries";
+import { ResamplingParams } from "../../Numerics/Resamplers/ResamplingParams";
 import { IThemeProvider } from "../../Themes/IThemeProvider";
 import { BaseRenderableSeries } from "./BaseRenderableSeries";
 import { IHitTestProvider } from "./HitTest/IHitTestProvider";
@@ -41,6 +44,10 @@ export declare class FastBubbleRenderableSeries extends BaseRenderableSeries {
      */
     constructor(webAssemblyContext: TSciChart, options?: IBubbleRenderableSeriesOptions);
     /** @inheritDoc */
+    get paletteProvider(): IPointMarkerPaletteProvider;
+    /** @inheritDoc */
+    set paletteProvider(paletteProvider: IPointMarkerPaletteProvider);
+    /** @inheritDoc */
     applyTheme(themeProvider: IThemeProvider): void;
     /**
      * Gets the bubble diameter in pixels for the point index, by looking up the Z-value in the
@@ -53,7 +60,9 @@ export declare class FastBubbleRenderableSeries extends BaseRenderableSeries {
     /**
      * Returns the {@link XyyDataSeries.getNativeZValues} for the associated {@link dataSeries}
      */
-    getNativeZValues(): DoubleVector;
+    getNativeZValues(): SCRTDoubleVector;
+    /** @inheritDoc */
+    toPointSeries(resamplingParams?: ResamplingParams): IPointSeries;
     /** @inheritDoc */
     protected newHitTestProvider(): IHitTestProvider;
 }

package/Charting/Visuals/RenderableSeries/FastBubbleRenderableSeries.js

@@ -17,6 +17,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FastBubbleRenderableSeries = void 0;
 var SeriesType_1 = require("../../../types/SeriesType");
+var XyzPointSeriesWrapped_1 = require("../../Model/PointSeries/XyzPointSeriesWrapped");
 var EllipsePointMarker_1 = require("../PointMarkers/EllipsePointMarker");
 var BaseRenderableSeries_1 = require("./BaseRenderableSeries");
 var BubbleSeriesDrawingProvider_1 = require("./DrawingProviders/BubbleSeriesDrawingProvider");
@@ -69,6 +70,18 @@ var FastBubbleRenderableSeries = /** @class */ (function (_super) {
         }
         return _this;
     }
+    Object.defineProperty(FastBubbleRenderableSeries.prototype, "paletteProvider", {
+        /** @inheritDoc */
+        get: function () {
+            return this.paletteProviderProperty;
+        },
+        /** @inheritDoc */
+        set: function (paletteProvider) {
+            this.setPaletteProvider(paletteProvider);
+        },
+        enumerable: false,
+        configurable: true
+    });
     /** @inheritDoc */
     FastBubbleRenderableSeries.prototype.applyTheme = function (themeProvider) {
         _super.prototype.applyTheme.call(this, themeProvider);
@@ -96,6 +109,10 @@ var FastBubbleRenderableSeries = /** @class */ (function (_super) {
         return this.dataSeries.getNativeZValues();
     };
     /** @inheritDoc */
+    FastBubbleRenderableSeries.prototype.toPointSeries = function (resamplingParams) {
+        return new XyzPointSeriesWrapped_1.XyzPointSeriesWrapped(this.dataSeries);
+    };
+    /** @inheritDoc */
     FastBubbleRenderableSeries.prototype.newHitTestProvider = function () {
         return new BubbleSeriesHitTestProvider_1.BubbleSeriesHitTestProvider(this, this.webAssemblyContext);
     };

package/Charting/Visuals/RenderableSeries/FastColumnRenderableSeries.d.ts

@@ -83,6 +83,7 @@ export declare class FastColumnRenderableSeries extends BaseRenderableSeries {
      * @inheritDoc
      */
     getYRange(xVisibleRange: NumberRange, isXCategoryAxis?: boolean): NumberRange;
+    /** @inheritDoc */
     toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;
     /** @inheritDoc */
     protected newHitTestProvider(): IHitTestProvider;

package/Charting/Visuals/RenderableSeries/FastColumnRenderableSeries.js

@@ -149,6 +149,7 @@ var FastColumnRenderableSeries = /** @class */ (function (_super) {
         }
         return new NumberRange_1.NumberRange(Math.min(yRange.min, this.zeroLineY), Math.max(yRange.max, this.zeroLineY));
     };
+    /** @inheritDoc */
     FastColumnRenderableSeries.prototype.toJSON = function (excludeData) {
         if (excludeData === void 0) { excludeData = false; }
         var json = _super.prototype.toJSON.call(this, excludeData);

package/Charting/Visuals/RenderableSeries/FastLineRenderableSeries.d.ts

@@ -33,4 +33,5 @@ export declare class FastLineRenderableSeries extends BaseLineRenderableSeries {
      * @param options optional parameters of type {@link IFastLineRenderableSeriesOptions} applied when constructing the series type
      */
     constructor(webAssemblyContext: TSciChart, options?: IFastLineRenderableSeriesOptions);
+    delete(): void;
 }

package/Charting/Visuals/RenderableSeries/FastLineRenderableSeries.js

@@ -16,6 +16,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FastLineRenderableSeries = void 0;
+var Deleter_1 = require("../../../Core/Deleter");
 var SeriesType_1 = require("../../../types/SeriesType");
 var BaseLineRenderableSeries_1 = require("./BaseLineRenderableSeries");
 /**
@@ -57,6 +58,11 @@ var FastLineRenderableSeries = /** @class */ (function (_super) {
         }
         return _this;
     }
+    FastLineRenderableSeries.prototype.delete = function () {
+        _super.prototype.delete.call(this);
+        this.resamplerHelper = (0, Deleter_1.deleteSafe)(this.resamplerHelper);
+        this.pointSeries = (0, Deleter_1.deleteSafe)(this.pointSeries);
+    };
     return FastLineRenderableSeries;
 }(BaseLineRenderableSeries_1.BaseLineRenderableSeries));
 exports.FastLineRenderableSeries = FastLineRenderableSeries;

package/Charting/Visuals/RenderableSeries/HitTest/BandSeriesHitTestProvider.js

@@ -39,7 +39,7 @@ var BandSeriesHitTestProvider = /** @class */ (function (_super) {
         var xHitCoord = isVerticalChart ? hitTestPoint.y : hitTestPoint.x;
         var yHitCoord = isVerticalChart ? hitTestPoint.x : hitTestPoint.y;
         var dataSeries = this.parentSeries.dataSeries;
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var xNativeValues = dataSeries.getNativeXValues();
         var yNativeValues = dataSeries.getNativeYValues();
         var hitTestInfo = hitTestHelpers_1.hitTestHelpers.createHitTestInfo(this.parentSeries, xCoordinateCalculator, yCoordinateCalculator, isVerticalChart, dataSeries, xNativeValues, yNativeValues, xHitCoord, yHitCoord, nearestPointIndex, 0);
@@ -94,7 +94,7 @@ var BandSeriesHitTestProvider = /** @class */ (function (_super) {
         var xHitCoord = isVerticalChart ? hitTestPoint.y : hitTestPoint.x;
         var yHitCoord = isVerticalChart ? hitTestPoint.x : hitTestPoint.y;
         var dataSeries = this.parentSeries.dataSeries;
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var hitTestInfo = hitTestHelpers_1.hitTestHelpers.createHitTestInfo(this.parentSeries, xCoordinateCalculator, yCoordinateCalculator, isVerticalChart, dataSeries, dataSeries.getNativeXValues(), dataSeries.getNativeYValues(), xHitCoord, yHitCoord, nearestPointIndex, 0);
         if (nearestPointIndex >= 0) {
             hitTestInfo.isHit = hitTestInfo.isWithinDataBounds;

package/Charting/Visuals/RenderableSeries/HitTest/BaseHitTestProvider.js

@@ -71,7 +71,7 @@ var BaseHitTestProvider = /** @class */ (function () {
         var xHitCoord = isVerticalChart ? hitTestPoint.y : hitTestPoint.x;
         var yHitCoord = isVerticalChart ? hitTestPoint.x : hitTestPoint.y;
         var dataSeries = this.parentSeries.dataSeries;
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var hitTestInfo = hitTestHelpers_1.hitTestHelpers.createHitTestInfo(this.parentSeries, xCoordinateCalculator, yCoordinateCalculator, isVerticalChart, dataSeries, dataSeries.getNativeXValues(), dataSeries.getNativeYValues(), xHitCoord, yHitCoord, nearestPointIndex, 0);
         hitTestInfo.isHit = hitTestInfo.isWithinDataBounds;
         return hitTestInfo;

package/Charting/Visuals/RenderableSeries/HitTest/BubbleSeriesHitTestProvider.js

@@ -89,7 +89,7 @@ var BubbleSeriesHitTestProvider = /** @class */ (function (_super) {
         var xNativeValues = dataSeries.getNativeXValues();
         var yNativeValues = dataSeries.getNativeYValues();
         var zNativeValues = dataSeries.getNativeZValues();
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var hitTestInfo = hitTestHelpers_1.hitTestHelpers.createHitTestInfo(this.parentSeries, xCoordinateCalculator, yCoordinateCalculator, isVerticalChart, dataSeries, xNativeValues, yNativeValues, xHitCoord, yHitCoord, nearestPointIndex, 0);
         if (nearestPointIndex >= 0) {
             hitTestInfo.zValue = zNativeValues.get(nearestPointIndex);

package/Charting/Visuals/RenderableSeries/HitTest/ColumnSeriesHitTestProvider.js

@@ -40,7 +40,7 @@ var ColumnSeriesHitTestProvider = /** @class */ (function (_super) {
         var xHitCoord = isVerticalChart ? hitTestPoint.y : hitTestPoint.x;
         var yHitCoord = isVerticalChart ? hitTestPoint.x : hitTestPoint.y;
         var dataSeries = this.parentSeries.dataSeries;
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var xNativeValues = dataSeries.getNativeXValues();
         var yNativeValues = dataSeries.getNativeYValues();
         var hitTestInfo = hitTestHelpers_1.hitTestHelpers.createHitTestInfo(this.parentSeries, xCoordinateCalculator, yCoordinateCalculator, isVerticalChart, dataSeries, xNativeValues, yNativeValues, xHitCoord, yHitCoord, nearestPointIndex, 0);
@@ -73,7 +73,7 @@ var ColumnSeriesHitTestProvider = /** @class */ (function (_super) {
         var dataSeries = this.parentSeries.dataSeries;
         var xNativeValues = dataSeries.getNativeXValues();
         var yNativeValues = dataSeries.getNativeYValues();
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var hitTestInfo = hitTestHelpers_1.hitTestHelpers.createHitTestInfo(this.parentSeries, xCoordinateCalculator, yCoordinateCalculator, isVerticalChart, dataSeries, xNativeValues, yNativeValues, xHitCoord, yHitCoord, nearestPointIndex, 0);
         var isCategoryAxis = xCoordinateCalculator.isCategoryCoordinateCalculator;
         if (nearestPointIndex >= 0) {

package/Charting/Visuals/RenderableSeries/HitTest/LineSeriesHitTestProvider.js

@@ -40,7 +40,7 @@ var LineSeriesHitTestProvider = /** @class */ (function (_super) {
         var isVerticalChart = this.currentRenderPassData.isVerticalChart;
         var xHitCoord = isVerticalChart ? hitTestPoint.y : hitTestPoint.x;
         var yHitCoord = isVerticalChart ? hitTestPoint.x : hitTestPoint.y;
-        var isSortedData = this.parentSeries.dataSeries.isSorted;
+        var isSortedData = this.parentSeries.dataSeries.dataDistributionCalculator.isSortedAscending;
         if (isSortedData) {
             return this.hitTestSorted(xHitCoord, yHitCoord, hitTestRadius);
         }
@@ -51,7 +51,7 @@ var LineSeriesHitTestProvider = /** @class */ (function (_super) {
     LineSeriesHitTestProvider.prototype.hitTestSorted = function (xHitCoord, yHitCoord, hitTestRadius) {
         var _a = this.currentRenderPassData, xCoordinateCalculator = _a.xCoordinateCalculator, yCoordinateCalculator = _a.yCoordinateCalculator, isVerticalChart = _a.isVerticalChart;
         var dataSeries = this.parentSeries.dataSeries;
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var xNativeValues = dataSeries.getNativeXValues();
         var yNativeValues = dataSeries.getNativeYValues();
         var hitTestInfo = hitTestHelpers_1.hitTestHelpers.createHitTestInfo(this.parentSeries, xCoordinateCalculator, yCoordinateCalculator, isVerticalChart, dataSeries, xNativeValues, yNativeValues, xHitCoord, yHitCoord, nearestPointIndex, hitTestRadius);

package/Charting/Visuals/RenderableSeries/HitTest/MountainSeriesHitTestProvider.js

@@ -40,7 +40,7 @@ var MountainSeriesHitTestProvider = /** @class */ (function (_super) {
         var yHitCoord = isVerticalChart ? hitTestPoint.x : hitTestPoint.y;
         var renderableSeries = this.parentSeries;
         var dataSeries = renderableSeries.dataSeries;
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var xNativeValues = dataSeries.getNativeXValues();
         var yNativeValues = dataSeries.getNativeYValues();
         var hitTestInfo = hitTestHelpers_1.hitTestHelpers.createHitTestInfo(renderableSeries, xCoordinateCalculator, yCoordinateCalculator, isVerticalChart, dataSeries, xNativeValues, yNativeValues, xHitCoord, yHitCoord, nearestPointIndex, 0);

package/Charting/Visuals/RenderableSeries/HitTest/OhlcSeriesHitTestProvider.js

@@ -42,7 +42,7 @@ var OhlcSeriesHitTestProvider = /** @class */ (function (_super) {
         var yHitCoord = isVerticalChart ? hitTestPoint.x : hitTestPoint.y;
         var renderableSeries = this.parentSeries;
         var dataSeries = this.parentSeries.dataSeries;
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var xNativeValues = dataSeries.getNativeXValues();
         var yNativeValues = dataSeries.getNativeYValues();
         var hitTestInfo = hitTestHelpers_1.hitTestHelpers.createHitTestInfo(this.parentSeries, xCoordinateCalculator, yCoordinateCalculator, isVerticalChart, dataSeries, xNativeValues, yNativeValues, xHitCoord, yHitCoord, nearestPointIndex, hitTestRadius);
@@ -80,7 +80,7 @@ var OhlcSeriesHitTestProvider = /** @class */ (function (_super) {
         var dataSeries = this.parentSeries.dataSeries;
         var xNativeValues = dataSeries.getNativeXValues();
         var yNativeValues = dataSeries.getNativeYValues();
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var hitTestInfo = hitTestHelpers_1.hitTestHelpers.createHitTestInfo(this.parentSeries, xCoordinateCalculator, yCoordinateCalculator, isVerticalChart, dataSeries, xNativeValues, yNativeValues, xHitCoord, yHitCoord, nearestPointIndex, 0);
         if (nearestPointIndex >= 0) {
             hitTestInfo.openValue = dataSeries.getNativeOpenValues().get(nearestPointIndex);

package/Charting/Visuals/RenderableSeries/HitTest/ScatterSeriesHitTestProvider.js

@@ -74,7 +74,7 @@ var ScatterSeriesHitTestProvider = /** @class */ (function (_super) {
         var dataSeries = this.parentSeries.dataSeries;
         var xNativeValues = dataSeries.getNativeXValues();
         var yNativeValues = dataSeries.getNativeYValues();
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var hitTestInfo = hitTestHelpers_1.hitTestHelpers.createHitTestInfo(this.parentSeries, xCoordinateCalculator, yCoordinateCalculator, isVerticalChart, dataSeries, xNativeValues, yNativeValues, xHitCoord, yHitCoord, nearestPointIndex, 0);
         if (nearestPointIndex >= 0) {
             var isCategoryAxis = xCoordinateCalculator.isCategoryCoordinateCalculator;

package/Charting/Visuals/RenderableSeries/HitTest/StackedColumnSeriesHitTestProvider.js

@@ -40,7 +40,7 @@ var StackedColumnSeriesHitTestProvider = /** @class */ (function (_super) {
         var xHitCoord = isVerticalChart ? hitTestPoint.y : hitTestPoint.x;
         var yHitCoord = isVerticalChart ? hitTestPoint.x : hitTestPoint.y;
         var dataSeries = this.parentSeries.dataSeries;
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var xNativeValues = dataSeries.getNativeXValues();
         var yNativeValues = dataSeries.getNativeYValues();
         var _b = this.parentSeries, accumulatedValues = _b.accumulatedValues, getGroupIndex = _b.getGroupIndex, getGroupsCount = _b.getGroupsCount, getColumnWidth = _b.getColumnWidth;
@@ -98,7 +98,7 @@ var StackedColumnSeriesHitTestProvider = /** @class */ (function (_super) {
         var xHitCoord = isVerticalChart ? hitTestPoint.y : hitTestPoint.x;
         var yHitCoord = isVerticalChart ? hitTestPoint.x : hitTestPoint.y;
         var dataSeries = this.parentSeries.dataSeries;
-        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.isSorted);
+        var nearestPointIndex = hitTestHelpers_1.hitTestHelpers.getNearestXPoint(this.webAssemblyContext, xCoordinateCalculator, dataSeries, xHitCoord, dataSeries.dataDistributionCalculator.isSortedAscending);
         var xNativeValues = dataSeries.getNativeXValues();
         var yNativeValues = dataSeries.getNativeYValues();
         var _b = this.parentSeries, accumulatedValues = _b.accumulatedValues, getGroupIndex = _b.getGroupIndex, getGroupsCount = _b.getGroupsCount, getColumnWidth = _b.getColumnWidth;