scichart 2.0.2195 → 2.1.2261

package/Charting/Visuals/Axis/LabelProvider/LabelProviderBase2D.js

@@ -148,11 +148,16 @@ var LabelProviderBase2D = /** @class */ (function (_super) {
                 var cachedLabel = void 0;
                 if (cachedLabelText) {
                     cachedLabel = LabelCache_1.labelCache.getLabel(cachedLabelText, this.styleId);
-                    labels.push(cachedLabelText);
+                    if (cachedLabel) {
+                        labels.push(cachedLabelText);
+                    }
                 }
-                else {
-                    var text = this.formatLabel(tick);
-                    this.tickToText.set(tick, text);
+                if (!cachedLabel) {
+                    var text = cachedLabelText;
+                    if (!cachedLabelText) {
+                        text = this.formatLabel(tick);
+                        this.tickToText.set(tick, text);
+                    }
                     var texture = this.getCachedLabelTexture(text, axis.axisRenderer.textureManager, axis.dpiAdjustedLabelStyle);
                     if (texture.textureWidth !== null) {
                         cachedLabel = new LabelInfo(tick, text, texture.bitmapTexture, texture.textureHeight, texture.textureWidth);

package/Charting/Visuals/Axis/LabelProvider/SmartDateLabelProvider.js

@@ -117,7 +117,8 @@ var SmartDateLabelProvider = /** @class */ (function (_super) {
     };
     SmartDateLabelProvider.prototype.formatTradeChartLabel = function (tradeChartLabelFormat, value, prevValue, prevPrevValue) {
         if (tradeChartLabelFormat === ETradeChartLabelFormat.Minutes) {
-            var newDate = !prevValue || (0, date_1.formatUnixDateToHumanStringMMMDD)(value) !== (0, date_1.formatUnixDateToHumanStringMMMDD)(prevValue);
+            var newDate = prevValue === undefined ||
+                (0, date_1.formatUnixDateToHumanStringMMMDD)(value) !== (0, date_1.formatUnixDateToHumanStringMMMDD)(prevValue);
             if (newDate) {
                 return (0, date_1.formatUnixDateToHumanStringMMMDD)(value);
             }
@@ -126,7 +127,8 @@ var SmartDateLabelProvider = /** @class */ (function (_super) {
             }
         }
         else if (tradeChartLabelFormat === ETradeChartLabelFormat.Days) {
-            var newMonth = !prevValue || (0, date_1.formatUnixDateToHumanStringMMM)(value) !== (0, date_1.formatUnixDateToHumanStringMMM)(prevValue);
+            var newMonth = prevValue === undefined ||
+                (0, date_1.formatUnixDateToHumanStringMMM)(value) !== (0, date_1.formatUnixDateToHumanStringMMM)(prevValue);
             if (newMonth) {
                 return (0, date_1.formatUnixDateToHumanStringMMM)(value);
             }
@@ -135,12 +137,13 @@ var SmartDateLabelProvider = /** @class */ (function (_super) {
             }
         }
         else if (tradeChartLabelFormat === ETradeChartLabelFormat.Months) {
-            var newYear = !prevValue || (0, date_1.formatUnixDateToHumanStringYYYY)(value) !== (0, date_1.formatUnixDateToHumanStringYYYY)(prevValue);
+            var newYear = prevValue === undefined ||
+                (0, date_1.formatUnixDateToHumanStringYYYY)(value) !== (0, date_1.formatUnixDateToHumanStringYYYY)(prevValue);
             if (newYear) {
                 return (0, date_1.formatUnixDateToHumanStringYYYY)(value);
             }
             // If previous label was year, display month label
-            var prevPrevNewYear = !prevPrevValue ||
+            var prevPrevNewYear = prevPrevValue === undefined ||
                 (0, date_1.formatUnixDateToHumanStringYYYY)(prevValue) !== (0, date_1.formatUnixDateToHumanStringYYYY)(prevPrevValue);
             var newMonth = prevPrevNewYear || (0, date_1.formatUnixDateToHumanStringMMM)(value) !== (0, date_1.formatUnixDateToHumanStringMMM)(prevValue);
             if (newMonth) {

package/Charting/Visuals/Axis/NumericAxis.js

@@ -58,8 +58,8 @@ var NumericAxis = /** @class */ (function (_super) {
         var size = this.axisLength;
         var shouldFlip = this.isXAxis !== this.flippedCoordinatesProperty;
         return shouldFlip
-            ? new FlippedNumericCoordinateCalculator_1.FlippedNumericCoordinateCalculator(this.webAssemblyContext2D, size, min, max, offset)
-            : new NumericCoordinateCalculator_1.NumericCoordinateCalculator(this.webAssemblyContext2D, size, min, max, offset);
+            ? new FlippedNumericCoordinateCalculator_1.FlippedNumericCoordinateCalculator(this.webAssemblyContext2D, size, min, max, offset, this.allowFastMath)
+            : new NumericCoordinateCalculator_1.NumericCoordinateCalculator(this.webAssemblyContext2D, size, min, max, offset, this.allowFastMath);
     };
     return NumericAxis;
 }(AxisBase2D_1.AxisBase2D));

package/Charting/Visuals/Axis/constants.d.ts

@@ -1,4 +1,5 @@
 export declare enum PROPERTY {
+    ALLOW_FAST_MATH = "ALLOW_FAST_MATH",
     AUTO_RANGE = "AUTO_RANGE",
     AUTO_TICKS = "AUTO_TICKS",
     AXIS_ALIGNMENT = "AXIS_ALIGNMENT",

package/Charting/Visuals/Axis/constants.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROPERTY = void 0;
 var PROPERTY;
 (function (PROPERTY) {
+    PROPERTY["ALLOW_FAST_MATH"] = "ALLOW_FAST_MATH";
     PROPERTY["AUTO_RANGE"] = "AUTO_RANGE";
     PROPERTY["AUTO_TICKS"] = "AUTO_TICKS";
     PROPERTY["AXIS_ALIGNMENT"] = "AXIS_ALIGNMENT";

package/Charting/Visuals/RenderableSeries/Animations/FadeAnimation.d.ts

@@ -1,5 +1,5 @@
 import { EAnimationType } from "../../../../types/AnimationType";
-import { DoubleVector, TSciChart } from "../../../../types/TSciChart";
+import { SCRTDoubleVector, TSciChart } from "../../../../types/TSciChart";
 import { SeriesAnimation, IBaseAnimationOptions } from "./SeriesAnimation";
 export interface IFadeAnimationOptions extends IBaseAnimationOptions {
 }
@@ -8,5 +8,5 @@ export declare class FadeAnimation extends SeriesAnimation {
     readonly type = EAnimationType.Fade;
     constructor(options?: IFadeAnimationOptions);
     /** @inheritDoc */
-    calculateAnimationValues(wasmContext: TSciChart, originalValues: DoubleVector, animationValues: DoubleVector, progress: number, noZeroLine?: boolean): void;
+    calculateAnimationValues(wasmContext: TSciChart, originalValues: SCRTDoubleVector, animationValues: SCRTDoubleVector, progress: number, noZeroLine?: boolean): void;
 }

package/Charting/Visuals/RenderableSeries/Animations/ScaleAnimation.d.ts

@@ -1,5 +1,5 @@
 import { EAnimationType } from "../../../../types/AnimationType";
-import { DoubleVector, TSciChart } from "../../../../types/TSciChart";
+import { SCRTDoubleVector, TSciChart } from "../../../../types/TSciChart";
 import { SeriesAnimation, IBaseAnimationOptions } from "./SeriesAnimation";
 export interface IScaleAnimationOptions extends IBaseAnimationOptions {
     zeroLine?: number;
@@ -13,7 +13,7 @@ export declare class ScaleAnimation extends SeriesAnimation {
     zeroLine: number;
     constructor(options?: IScaleAnimationOptions);
     /** @inheritDoc */
-    calculateAnimationValues(wasmContext: TSciChart, originalValues: DoubleVector, animationValues: DoubleVector, progress: number, noZeroLine?: boolean): void;
+    calculateAnimationValues(wasmContext: TSciChart, originalValues: SCRTDoubleVector, animationValues: SCRTDoubleVector, progress: number, noZeroLine?: boolean): void;
     toJSON(): {
         type: EAnimationType;
         options: Required<Omit<IBaseAnimationOptions, never>>;

package/Charting/Visuals/RenderableSeries/Animations/SeriesAnimation.d.ts

@@ -1,7 +1,7 @@
 import { IAnimation } from "../../../../Core/Animations/AnimationFiniteStateMachine";
 import { TEasingFn } from "../../../../Core/Animations/EasingFunctions";
 import { EAnimationType } from "../../../../types/AnimationType";
-import { DoubleVector, TSciChart } from "../../../../types/TSciChart";
+import { SCRTDoubleVector, TSciChart } from "../../../../types/TSciChart";
 import { IDataSeries } from "../../../Model/IDataSeries";
 import { IRenderableSeries } from "../IRenderableSeries";
 import { BaseAnimationStyle } from "./BaseAnimationStyle";
@@ -65,7 +65,7 @@ export declare abstract class SeriesAnimation implements IAnimation {
      * @param progress Current animation progress
      * @param noZeroLine Sets zeroLine = 0, is used for XyzDataSeries
      */
-    calculateAnimationValues(wasmContext: TSciChart, originalValues: DoubleVector, animationValues: DoubleVector, progress: number, noZeroLine?: boolean): void;
+    calculateAnimationValues(wasmContext: TSciChart, originalValues: SCRTDoubleVector, animationValues: SCRTDoubleVector, progress: number, noZeroLine?: boolean): void;
     /**
      * Runs for data animation to update animation vectors
      * @param wasmContext
@@ -74,7 +74,7 @@ export declare abstract class SeriesAnimation implements IAnimation {
      * @param interpolatedValues The vector which will be updated with interpolated values
      * @param progress Current animation progress
      */
-    calculateDataSeriesAnimationValues(wasmContext: TSciChart, initialValues: DoubleVector, finalValues: DoubleVector, interpolatedValues: DoubleVector, progress: number): void;
+    calculateDataSeriesAnimationValues(wasmContext: TSciChart, initialValues: SCRTDoubleVector, finalValues: SCRTDoubleVector, interpolatedValues: SCRTDoubleVector, progress: number): void;
     /**
      * Returns {@link BaseAnimationStyle} object which is being used to create initial styles
      * @param renderableSeries The renderable series

package/Charting/Visuals/RenderableSeries/Animations/SweepAnimation.d.ts

@@ -1,5 +1,5 @@
 import { EAnimationType } from "../../../../types/AnimationType";
-import { DoubleVector, TSciChart } from "../../../../types/TSciChart";
+import { SCRTDoubleVector, TSciChart } from "../../../../types/TSciChart";
 import { SeriesAnimation, IBaseAnimationOptions } from "./SeriesAnimation";
 export interface ISweepAnimationOptions extends IBaseAnimationOptions {
 }
@@ -8,5 +8,5 @@ export declare class SweepAnimation extends SeriesAnimation {
     readonly type = EAnimationType.Sweep;
     constructor(options?: ISweepAnimationOptions);
     /** @inheritDoc */
-    calculateAnimationValues(wasmContext: TSciChart, originalValues: DoubleVector, animationValues: DoubleVector, progress: number, noZeroLine?: boolean): void;
+    calculateAnimationValues(wasmContext: TSciChart, originalValues: SCRTDoubleVector, animationValues: SCRTDoubleVector, progress: number, noZeroLine?: boolean): void;
 }

package/Charting/Visuals/RenderableSeries/Animations/WaveAnimation.d.ts

@@ -1,5 +1,5 @@
 import { EAnimationType } from "../../../../types/AnimationType";
-import { DoubleVector, TSciChart } from "../../../../types/TSciChart";
+import { SCRTDoubleVector, TSciChart } from "../../../../types/TSciChart";
 import { SeriesAnimation, IBaseAnimationOptions } from "./SeriesAnimation";
 export interface IWaveAnimationOptions extends IBaseAnimationOptions {
     pointDurationFraction?: number;
@@ -18,7 +18,7 @@ export declare class WaveAnimation extends SeriesAnimation {
     zeroLine: number;
     constructor(options?: IWaveAnimationOptions);
     /** @inheritDoc */
-    calculateAnimationValues(wasmContext: TSciChart, originalValues: DoubleVector, animationValues: DoubleVector, progress: number, noZeroLine?: boolean): void;
+    calculateAnimationValues(wasmContext: TSciChart, originalValues: SCRTDoubleVector, animationValues: SCRTDoubleVector, progress: number, noZeroLine?: boolean): void;
     toJSON(): {
         type: EAnimationType;
         options: Required<Omit<IBaseAnimationOptions, never>>;

package/Charting/Visuals/RenderableSeries/Animations/animationHelpers.d.ts

@@ -1,5 +1,5 @@
 import { AnimationFiniteStateMachine, IAnimation, SeriesAnimationFiniteStateMachine } from "../../../../Core/Animations/AnimationFiniteStateMachine";
-import { DoubleVector, TSciChart } from "../../../../types/TSciChart";
+import { SCRTDoubleVector, TSciChart } from "../../../../types/TSciChart";
 import { BaseDataSeries } from "../../../Model/BaseDataSeries";
 import { XyyDataSeries } from "../../../Model/XyyDataSeries";
 import { CrossPointMarker } from "../../PointMarkers/CrossPointMarker";
@@ -17,9 +17,9 @@ export declare const animationHelpers: {
     createPointMarker: (wasmContext: TSciChart, pointMarkerStyle: BasePointMarkerStyle) => SpritePointMarker | CrossPointMarker | EllipsePointMarker | XPointMarker | SquarePointMarker | TrianglePointMarker;
     interpolateNumber: (from: number, to: number, progress: number) => number;
     interpolateColor: (from: number, to: number, progress: number) => number;
-    copyVector: (sourceVector: DoubleVector, targetVector: DoubleVector) => void;
-    setSplineAnimationVectors: (wasmContext: TSciChart, animation: SeriesAnimation, ds: BaseDataSeries, animationDS: BaseDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector, isCategoryAxis: boolean, interpolationPoints: number) => void;
-    setSplineBandAnimationVectors: (wasmContext: TSciChart, animation: SeriesAnimation, ds: XyyDataSeries, animationDS: XyyDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector, y1SplineValues: DoubleVector, isCategoryAxis: boolean, interpolationPoints: number) => void;
-    updateSplineAnimationProperties: (wasmContext: TSciChart, animation: SeriesAnimation, progress: number, dataSeries: BaseDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector) => void;
-    updateSplineBandAnimationProperties: (wasmContext: TSciChart, animation: SeriesAnimation, progress: number, dataSeries: XyyDataSeries, xSplineValues: DoubleVector, ySplineValues: DoubleVector, y1SplineValues: DoubleVector) => void;
+    copyVector: (sourceVector: SCRTDoubleVector, targetVector: SCRTDoubleVector) => void;
+    setSplineAnimationVectors: (wasmContext: TSciChart, animation: SeriesAnimation, ds: BaseDataSeries, animationDS: BaseDataSeries, xSplineValues: SCRTDoubleVector, ySplineValues: SCRTDoubleVector, isCategoryAxis: boolean, interpolationPoints: number) => void;
+    setSplineBandAnimationVectors: (wasmContext: TSciChart, animation: SeriesAnimation, ds: XyyDataSeries, animationDS: XyyDataSeries, xSplineValues: SCRTDoubleVector, ySplineValues: SCRTDoubleVector, y1SplineValues: SCRTDoubleVector, isCategoryAxis: boolean, interpolationPoints: number) => void;
+    updateSplineAnimationProperties: (wasmContext: TSciChart, animation: SeriesAnimation, progress: number, dataSeries: BaseDataSeries, xSplineValues: SCRTDoubleVector, ySplineValues: SCRTDoubleVector) => void;
+    updateSplineBandAnimationProperties: (wasmContext: TSciChart, animation: SeriesAnimation, progress: number, dataSeries: XyyDataSeries, xSplineValues: SCRTDoubleVector, ySplineValues: SCRTDoubleVector, y1SplineValues: SCRTDoubleVector) => void;
 };

package/Charting/Visuals/RenderableSeries/Animations/animationHelpers.js

@@ -147,7 +147,7 @@ var setSplineAnimationVectors = function (wasmContext, animation, ds, animationD
         // set final animation values for the spline
         var dataSeries = animation.dataSeries;
         var xValues = isCategoryAxis ? dataSeries.getNativeIndexes() : dataSeries.getNativeXValues();
-        wasmContext.SCRTSplineHelperCubicSpline(xValues, dataSeries.getNativeYValues(), ds.xFinalAnimationValues, ds.yFinalAnimationValues, xValues.size(), interpolationPoints, dataSeries.containsNaN);
+        wasmContext.SCRTSplineHelperCubicSpline(xValues, dataSeries.getNativeYValues(), ds.xFinalAnimationValues, ds.yFinalAnimationValues, xValues.size(), interpolationPoints, dataSeries.dataDistributionCalculator.containsNaN);
     }
 };
 var setSplineBandAnimationVectors = function (wasmContext, animation, ds, animationDS, xSplineValues, ySplineValues, y1SplineValues, isCategoryAxis, interpolationPoints) {
@@ -162,7 +162,7 @@ var setSplineBandAnimationVectors = function (wasmContext, animation, ds, animat
         exports.animationHelpers.copyVector(y1SplineValues, ds.y1InitialAnimationValues);
         // set final animation values for the spline
         var xValues = isCategoryAxis ? animationDS.getNativeIndexes() : animationDS.getNativeXValues();
-        wasmContext.SCRTSplineHelperCubicSpline(xValues, animationDS.getNativeY1Values(), ds.xFinalAnimationValues, ds.y1FinalAnimationValues, xValues.size(), interpolationPoints, animationDS.containsNaN);
+        wasmContext.SCRTSplineHelperCubicSpline(xValues, animationDS.getNativeY1Values(), ds.xFinalAnimationValues, ds.y1FinalAnimationValues, xValues.size(), interpolationPoints, animationDS.dataDistributionCalculator.containsNaN);
         ds.validateAnimationVectors();
     }
 };

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

@@ -1,4 +1,7 @@
-import { DoubleVector, TSciChart } from "../../../types/TSciChart";
+import { SCRTDoubleVector, TSciChart } from "../../../types/TSciChart";
+import { IXyyPointSeries } from "../../Model/PointSeries/IPointSeries";
+import { XyyPointSeriesResampled } from "../../Model/PointSeries/XyyPointSeriesResampled";
+import { ResamplingParams } from "../../Numerics/Resamplers/ResamplingParams";
 import { IThemeProvider } from "../../Themes/IThemeProvider";
 import { BaseRenderableSeries } from "./BaseRenderableSeries";
 import { IHitTestProvider } from "./HitTest/IHitTestProvider";
@@ -32,11 +35,13 @@ export interface IBaseBandRenderableSeriesOptions extends IBaseRenderableSeriesO
     strokeY1DashArray?: number[];
 }
 export declare abstract class BaseBandRenderableSeries extends BaseRenderableSeries {
+    protected pointSeries: XyyPointSeriesResampled;
     private fillY1Property;
     private strokeY1Property;
     private fillProperty;
     private strokeDashArrayProperty;
     private strokeY1DashArrayProperty;
+    private xyyTempPointSeries;
     constructor(webAssemblyContext: TSciChart, options?: IBaseBandRenderableSeriesOptions);
     /**
      * @inheritDoc
@@ -91,10 +96,12 @@ export declare abstract class BaseBandRenderableSeries extends BaseRenderableSer
     /**
      * Returns the {@link XyyDataSeries.getNativeY1Values} for the associated {@link dataSeries}
      */
-    getNativeY1Values(): DoubleVector;
+    getNativeY1Values(): SCRTDoubleVector;
     /** @inheritDoc */
     delete(): void;
     /** @inheritDoc */
+    toPointSeries(rp?: ResamplingParams): IXyyPointSeries;
+    /** @inheritDoc */
     toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;
     /** @inheritDoc */
     protected newHitTestProvider(): IHitTestProvider;

package/Charting/Visuals/RenderableSeries/BaseBandRenderableSeries.js

@@ -16,6 +16,8 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseBandRenderableSeries = void 0;
+var XyyPointSeriesResampled_1 = require("../../Model/PointSeries/XyyPointSeriesResampled");
+var XyyPointSeriesWrapped_1 = require("../../Model/PointSeries/XyyPointSeriesWrapped");
 var SciChartSurfaceBase_1 = require("../SciChartSurfaceBase");
 var BaseRenderableSeries_1 = require("./BaseRenderableSeries");
 var constants_1 = require("./constants");
@@ -35,7 +37,7 @@ var BaseBandRenderableSeries = /** @class */ (function (_super) {
         _this.strokeDashArrayProperty = options === null || options === void 0 ? void 0 : options.strokeDashArray;
         _this.drawingProviders.push(new BandSeriesDrawingProvider_1.BandSeriesDrawingProvider(webAssemblyContext, _this));
         _this.drawingProviders.push(new PointMarkerDrawingProvider_1.PointMarkerDrawingProvider(webAssemblyContext, _this));
-        _this.drawingProviders.push(new PointMarkerDrawingProvider_1.PointMarkerDrawingProvider(webAssemblyContext, _this, function (ds) { return ds.getNativeY1Values(); }, function (rs) { return rs.y1SplineValues; }));
+        _this.drawingProviders.push(new PointMarkerDrawingProvider_1.PointMarkerDrawingProvider(webAssemblyContext, _this, function (ps) { return ps.y1Values; }, function (rs) { return rs.y1SplineValues; }));
         if (options === null || options === void 0 ? void 0 : options.animation) {
             _this.animationQueue.push(options.animation);
         }
@@ -162,6 +164,48 @@ var BaseBandRenderableSeries = /** @class */ (function (_super) {
         _super.prototype.delete.call(this);
     };
     /** @inheritDoc */
+    BaseBandRenderableSeries.prototype.toPointSeries = function (rp) {
+        if (rp) {
+            if (!this.xyyTempPointSeries) {
+                this.xyyTempPointSeries = new XyyPointSeriesResampled_1.XyyPointSeriesResampled(this.webAssemblyContext, rp.xVisibleRange);
+            }
+            else {
+                this.xyyTempPointSeries.xRange = rp.xVisibleRange;
+            }
+            if (!this.pointSeries) {
+                this.pointSeries = new XyyPointSeriesResampled_1.XyyPointSeriesResampled(this.webAssemblyContext, rp.xVisibleRange);
+            }
+            else {
+                this.pointSeries.xRange = rp.xVisibleRange;
+            }
+            var ps = this.pointSeries;
+            var ds = this.dataSeries;
+            var xValues = ds.getNativeXValues();
+            var yValues = ds.getNativeYValues();
+            var y1Values = ds.getNativeY1Values();
+            this.resamplerHelper.resampleIntoPointSeries(this.webAssemblyContext, rp, xValues, yValues, this.xyyTempPointSeries.intIndexes, this.xyyTempPointSeries.xValues, this.xyyTempPointSeries.yValues, false);
+            var xySize = this.xyyTempPointSeries.intIndexes.size();
+            this.resamplerHelper.resampleIntoPointSeries(this.webAssemblyContext, rp, xValues, y1Values, this.xyyTempPointSeries.intIndexes, this.xyyTempPointSeries.xValues, this.xyyTempPointSeries.y1Values);
+            // Because intIndexes vector is not cleared indexes for rpLow are appended at the end of rpHigh indexes
+            var xy1Size = this.xyyTempPointSeries.intIndexes.size() - xySize;
+            // We merge indexes excluding duplicates for Y and Y1 into one vector
+            var mergedSize = this.resamplerHelper.mergeIndexes(this.xyyTempPointSeries.intIndexes, xySize, xy1Size, ps.intIndexes);
+            // Clear the intIndexes as long as we do not need them any more
+            this.xyyTempPointSeries.intIndexes.clear();
+            // Get values by indexes for Y and Y1 values
+            this.resamplerHelper.copyValuesByIndexes(ps.intIndexes, xValues, yValues, y1Values, mergedSize, rp.isCategoryAxis, ps.xValues, ps.yValues, ps.y1Values);
+            if (rp.isCategoryAxis) {
+                ps.updateIndexes();
+            }
+            ps.clearIntIndexes();
+            // ps.debugOutputForUnitTests();
+            return ps;
+        }
+        else {
+            return new XyyPointSeriesWrapped_1.XyyPointSeriesWrapped(this.dataSeries);
+        }
+    };
+    /** @inheritDoc */
     BaseBandRenderableSeries.prototype.toJSON = function (excludeData) {
         if (excludeData === void 0) { excludeData = false; }
         var json = _super.prototype.toJSON.call(this, excludeData);

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

@@ -25,6 +25,7 @@ export declare abstract class BaseLineRenderableSeries extends BaseRenderableSer
      * Accepts an array of values, e.g. [2,2] will have a line of length 2 and a gap of length 2.
      */
     set strokeDashArray(strokeDashArray: number[]);
+    /** @inheritDoc */
     toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;
     /**
      * @inheritDoc

package/Charting/Visuals/RenderableSeries/BaseLineRenderableSeries.js

@@ -62,6 +62,7 @@ var BaseLineRenderableSeries = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    /** @inheritDoc */
     BaseLineRenderableSeries.prototype.toJSON = function (excludeData) {
         if (excludeData === void 0) { excludeData = false; }
         var json = _super.prototype.toJSON.call(this, excludeData);

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

@@ -70,6 +70,7 @@ export declare abstract class BaseMountainRenderableSeries extends BaseRenderabl
      * Accepts an array of values, e.g. [2,2] will have a line of length 2 and a gap of length 2.
      */
     set strokeDashArray(strokeDashArray: number[]);
+    /** @inheritDoc */
     toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;
     /**
      * @inheritDoc

package/Charting/Visuals/RenderableSeries/BaseMountainRenderableSeries.js

@@ -128,6 +128,7 @@ var BaseMountainRenderableSeries = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    /** @inheritDoc */
     BaseMountainRenderableSeries.prototype.toJSON = function (excludeData) {
         if (excludeData === void 0) { excludeData = false; }
         var json = _super.prototype.toJSON.call(this, excludeData);

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

@@ -1,5 +1,8 @@
 import { NumberRange } from "../../../Core/NumberRange";
-import { DoubleVector, TSciChart } from "../../../types/TSciChart";
+import { SCRTDoubleVector, TSciChart } from "../../../types/TSciChart";
+import { IOhlcPointSeries } from "../../Model/PointSeries/IPointSeries";
+import { OhlcPointSeriesResampled } from "../../Model/PointSeries/OhlcPointSeriesResampled";
+import { ResamplingParams } from "../../Numerics/Resamplers/ResamplingParams";
 import { IThemeProvider } from "../../Themes/IThemeProvider";
 import { BaseRenderableSeries } from "./BaseRenderableSeries";
 import { IHitTestProvider } from "./HitTest/IHitTestProvider";
@@ -10,9 +13,11 @@ export interface IBaseOhlcRenderableSeriesOptions extends IBaseRenderableSeriesO
     dataPointWidth?: number;
 }
 export declare abstract class BaseOhlcRenderableSeries extends BaseRenderableSeries {
+    protected pointSeries: OhlcPointSeriesResampled;
     private strokeUpProperty;
     private strokeDownProperty;
     private dataPointWidthProperty;
+    private xyyTempPointSeries;
     constructor(webAssemblyContext: TSciChart, options?: IBaseOhlcRenderableSeriesOptions);
     /** @inheritDoc */
     applyTheme(themeProvider: IThemeProvider): void;
@@ -49,19 +54,21 @@ export declare abstract class BaseOhlcRenderableSeries extends BaseRenderableSer
     /**
      * Returns the {@link IDataSeries.getNativeOpenValues} for the associated {@link dataSeries}
      */
-    getNativeOpenValues(): DoubleVector;
+    getNativeOpenValues(): SCRTDoubleVector;
     /**
      * Returns the {@link IDataSeries.getNativeHighValues} for the associated {@link dataSeries}
      */
-    getNativeHighValues(): DoubleVector;
+    getNativeHighValues(): SCRTDoubleVector;
     /**
      * Returns the {@link IDataSeries.getNativeLowValues} for the associated {@link dataSeries}
      */
-    getNativeLowValues(): DoubleVector;
+    getNativeLowValues(): SCRTDoubleVector;
     /**
      * Returns the {@link IDataSeries.getNativeCloseValues} for the associated {@link dataSeries}
      */
-    getNativeCloseValues(): DoubleVector;
+    getNativeCloseValues(): SCRTDoubleVector;
+    /** @inheritDoc */
+    toPointSeries(rp?: ResamplingParams): IOhlcPointSeries;
     /** @inheritDoc */
     protected newHitTestProvider(): IHitTestProvider;
 }

package/Charting/Visuals/RenderableSeries/BaseOhlcRenderableSeries.js

@@ -16,8 +16,13 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseOhlcRenderableSeries = void 0;
+var Deleter_1 = require("../../../Core/Deleter");
 var NumberRange_1 = require("../../../Core/NumberRange");
 var IDataSeries_1 = require("../../Model/IDataSeries");
+var OhlcPointSeriesResampled_1 = require("../../Model/PointSeries/OhlcPointSeriesResampled");
+var OhlcPointSeriesWrapped_1 = require("../../Model/PointSeries/OhlcPointSeriesWrapped");
+var XyyPointSeriesResampled_1 = require("../../Model/PointSeries/XyyPointSeriesResampled");
+var ResamplingMode_1 = require("../../Numerics/Resamplers/ResamplingMode");
 var SciChartSurfaceBase_1 = require("../SciChartSurfaceBase");
 var BaseRenderableSeries_1 = require("./BaseRenderableSeries");
 var constants_1 = require("./constants");
@@ -123,6 +128,9 @@ var BaseOhlcRenderableSeries = /** @class */ (function (_super) {
     /** @inheritDoc */
     BaseOhlcRenderableSeries.prototype.delete = function () {
         _super.prototype.delete.call(this);
+        this.resamplerHelper = (0, Deleter_1.deleteSafe)(this.resamplerHelper);
+        this.xyyTempPointSeries = (0, Deleter_1.deleteSafe)(this.xyyTempPointSeries);
+        this.pointSeries = (0, Deleter_1.deleteSafe)(this.pointSeries);
     };
     /**
      * Returns the {@link IDataSeries.getNativeOpenValues} for the associated {@link dataSeries}
@@ -149,6 +157,111 @@ var BaseOhlcRenderableSeries = /** @class */ (function (_super) {
         return this.dataSeries.getNativeYValues();
     };
     /** @inheritDoc */
+    BaseOhlcRenderableSeries.prototype.toPointSeries = function (rp) {
+        if (rp) {
+            if (!this.xyyTempPointSeries) {
+                this.xyyTempPointSeries = new XyyPointSeriesResampled_1.XyyPointSeriesResampled(this.webAssemblyContext, rp.xVisibleRange);
+            }
+            else {
+                this.xyyTempPointSeries.xRange = rp.xVisibleRange;
+            }
+            if (!this.pointSeries) {
+                this.pointSeries = new OhlcPointSeriesResampled_1.OhlcPointSeriesResampled(this.webAssemblyContext, rp.xVisibleRange);
+            }
+            else {
+                this.pointSeries.xRange = rp.xVisibleRange;
+            }
+            var ps = this.pointSeries;
+            var ds = this.dataSeries;
+            var xValues = ds.getNativeXValues();
+            var openValues = ds.getNativeOpenValues();
+            var highValues = ds.getNativeHighValues();
+            var lowValues = ds.getNativeLowValues();
+            var closeValues = ds.getNativeCloseValues();
+            var originalIndexes = ds.getNativeIndexes();
+            // 1) calc ps.highValues
+            var rpHigh = rp.clone({
+                resamplingMode: rp.resamplingMode === ResamplingMode_1.EResamplingMode.None ? ResamplingMode_1.EResamplingMode.None : ResamplingMode_1.EResamplingMode.Max
+            });
+            this.resamplerHelper.resampleIntoPointSeries(this.webAssemblyContext, rpHigh, xValues, highValues, this.xyyTempPointSeries.intIndexes, // don't care
+            this.xyyTempPointSeries.xValues, // don't care
+            ps.highValues);
+            // console.log("high count ", ps.highValues.size());
+            this.xyyTempPointSeries.clearIntIndexes();
+            // 2) calc ps.lowValues
+            var rpLow = rp.clone({
+                resamplingMode: rp.resamplingMode === ResamplingMode_1.EResamplingMode.None ? ResamplingMode_1.EResamplingMode.None : ResamplingMode_1.EResamplingMode.Min
+            });
+            this.resamplerHelper.resampleIntoPointSeries(this.webAssemblyContext, rpLow, xValues, lowValues, this.xyyTempPointSeries.intIndexes, // don't care
+            this.xyyTempPointSeries.xValues, ps.lowValues);
+            // console.log("low count ", ps.lowValues.size());
+            // We don't want the indexes for high/low
+            this.xyyTempPointSeries.clearIntIndexes();
+            this.xyyTempPointSeries.y1Values.clear();
+            // 3) Get batch indexes
+            // Resample indexes to get start and end of batch
+            var rpOpenClose = rp.clone({
+                resamplingMode: rp.resamplingMode === ResamplingMode_1.EResamplingMode.None ? ResamplingMode_1.EResamplingMode.None : ResamplingMode_1.EResamplingMode.Min
+            });
+            this.resamplerHelper.resampleIntoPointSeries(this.webAssemblyContext, rpOpenClose, xValues, originalIndexes, ps.intIndexes, this.xyyTempPointSeries.xValues, // don't care
+            this.xyyTempPointSeries.y1Values // don't care
+            );
+            var openCloseSize = ps.intIndexes.size();
+            this.xyyTempPointSeries.y1Values.clear();
+            // 4) calc ps.openValues, ps.closeValues
+            // console.log("open/close count ", openCloseSize);
+            // indexes 0, 1, 2, 3, 4, 5, 6, 7
+            // opens   3, 4, 7, 8, 3, 5, 9, 6
+            // closes  8, 3, 5, 9, 6, 3
+            // batch 0, 3, 6
+            // batch 0 - open 3 (index 0), close 8 (index 2)
+            var lastIndexOfFirstBatch = ps.intIndexes.get(3) - ps.intIndexes.get(2) - 1;
+            // console.log(
+            //     "indexes ",
+            //     ps.intIndexes.get(0),
+            //     ps.intIndexes.get(1),
+            //     ps.intIndexes.get(2),
+            //     ps.intIndexes.get(3),
+            //     ps.intIndexes.get(4),
+            //     ps.intIndexes.get(5),
+            //     ps.intIndexes.get(6)
+            // );
+            // console.log(
+            //     "x values ",
+            //     xValues.get(0),
+            //     xValues.get(1),
+            //     xValues.get(2),
+            //     xValues.get(3),
+            //     xValues.get(4),
+            //     xValues.get(5),
+            //     xValues.get(6)
+            // );
+            // console.log("Max index", rp.indexesRange.max);
+            // const batchWidth = rp.xVisibleRange.diff / rp.viewportRect.width;
+            // console.log(
+            //     "Batch width ",
+            //     batchWidth,
+            //     Math.floor(Math.log2(batchWidth)),
+            //     Math.pow(2, Math.floor(Math.log2(batchWidth)))
+            // );
+            // console.log("X Spacing ", rp.xVisibleRange.diff / rp.indexesRange.max);
+            // console.log("original points / resampled points ", xValues.size() / openCloseSize);
+            // console.log("lastIndexOfFirstBatch ", lastIndexOfFirstBatch);
+            // Get values by indexes for Open values
+            this.resamplerHelper.copyValuesByIndexes(ps.intIndexes, xValues, openValues, closeValues, openCloseSize, rp.isCategoryAxis, ps.xValues, ps.openValues, ps.closeValues, lastIndexOfFirstBatch);
+            // Last close value is handled in c++;
+            // 5) update indexes for category axis
+            if (rp.isCategoryAxis)
+                ps.updateIndexes();
+            ps.clearIntIndexes();
+            // ps.debugOutputForUnitTests();
+            return ps;
+        }
+        else {
+            return new OhlcPointSeriesWrapped_1.OhlcPointSeriesWrapped(this.dataSeries);
+        }
+    };
+    /** @inheritDoc */
     BaseOhlcRenderableSeries.prototype.newHitTestProvider = function () {
         return new OhlcSeriesHitTestProvider_1.OhlcSeriesHitTestProvider(this, this.webAssemblyContext);
     };