scichart 2.2.2416 → 2.2.2417

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

@@ -20,4 +20,6 @@ export interface ISpline {
      * Updates spline values
      */
     updateSplineValues(): void;
+    /** Called if the spline cannot be calculated.  By default it falls back to the original data */
+    onSplineFailure(): void;
 }

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

@@ -43,6 +43,8 @@ export declare class SplineBandRenderableSeries extends BaseBandRenderableSeries
     xSplineValues: SCRTDoubleVector;
     ySplineValues: SCRTDoubleVector;
     y1SplineValues: SCRTDoubleVector;
+    warnOnSplineFailure: boolean;
+    protected isSplineProperty: boolean;
     private recalculateSpline;
     private interpolationPointsProperty;
     /**
@@ -52,6 +54,7 @@ export declare class SplineBandRenderableSeries extends BaseBandRenderableSeries
      * @param options optional parameters of type {@link ISplineBandRenderableSeriesOptions} applied when constructing the series type
      */
     constructor(webAssemblyContext: TSciChart, options?: ISplineBandRenderableSeriesOptions);
+    get isSpline(): boolean;
     /**
      * Gets or sets the interpolationPoints being used for the Spline
      */
@@ -67,6 +70,8 @@ export declare class SplineBandRenderableSeries extends BaseBandRenderableSeries
      */
     updateSplineValues(): void;
     /** @inheritDoc */
+    onSplineFailure(): void;
+    /** @inheritDoc */
     getYRange(xVisibleRange: NumberRange, isXCategoryAxis?: boolean): NumberRange;
     /** @inheritDoc */
     toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;

package/Charting/Visuals/RenderableSeries/SplineBandRenderableSeries.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SplineBandRenderableSeries = void 0;
 var Deleter_1 = require("../../../Core/Deleter");
 var SeriesType_1 = require("../../../types/SeriesType");
-var appendDoubleVectorFromJsArray_1 = require("../../../utils/ccall/appendDoubleVectorFromJsArray");
+var copyVector_1 = require("../../../utils/copyVector");
 var animationHelpers_1 = require("./Animations/animationHelpers");
 var BaseBandRenderableSeries_1 = require("./BaseBandRenderableSeries");
 var constants_1 = require("./constants");
@@ -57,6 +57,8 @@ var SplineBandRenderableSeries = /** @class */ (function (_super) {
         var _a, _b, _c;
         var _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = SeriesType_1.ESeriesType.SplineBandSeries;
+        _this.warnOnSplineFailure = true;
+        _this.isSplineProperty = true;
         _this.recalculateSpline = true;
         _this.interpolationPointsProperty = 10;
         _this.xSplineValues = new webAssemblyContext.SCRTDoubleVector();
@@ -69,6 +71,13 @@ var SplineBandRenderableSeries = /** @class */ (function (_super) {
         }
         return _this;
     }
+    Object.defineProperty(SplineBandRenderableSeries.prototype, "isSpline", {
+        get: function () {
+            return this.isSplineProperty;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(SplineBandRenderableSeries.prototype, "interpolationPoints", {
         /**
          * Gets or sets the interpolationPoints being used for the Spline
@@ -100,20 +109,15 @@ var SplineBandRenderableSeries = /** @class */ (function (_super) {
         if (!(this.dataSeries && this.recalculateSpline && this.parentSurface)) {
             return;
         }
+        this.isSplineProperty = true;
         var dataSeries = this.dataSeries;
         var xValues = this.xAxis.isCategoryAxis ? dataSeries.getNativeIndexes() : dataSeries.getNativeXValues();
         var yValues = dataSeries.getNativeYValues();
         var y1Values = dataSeries.getNativeY1Values();
         var initialSize = xValues.size();
         this.webAssemblyContext.SCRTSplineHelperCubicSpline(xValues, yValues, this.xSplineValues, this.ySplineValues, initialSize, this.interpolationPoints, dataSeries.dataDistributionCalculator.containsNaN);
-        if (yValues.get(0) !== this.ySplineValues.get(0)) {
-            console.warn("Spline interpolation could not be calculated.  Data may contain duplicate x values");
-            this.xSplineValues.resizeFast(initialSize);
-            this.webAssemblyContext.SCRTMemCopy(this.xSplineValues.dataPtr(0), dataSeries.getNativeXValues().dataPtr(0), initialSize * appendDoubleVectorFromJsArray_1.SIZEOF_NUMBER);
-            this.ySplineValues.resizeFast(initialSize);
-            this.webAssemblyContext.SCRTMemCopy(this.ySplineValues.dataPtr(0), dataSeries.getNativeYValues().dataPtr(0), initialSize * appendDoubleVectorFromJsArray_1.SIZEOF_NUMBER);
-            this.y1SplineValues.resizeFast(initialSize);
-            this.webAssemblyContext.SCRTMemCopy(this.y1SplineValues.dataPtr(0), dataSeries.getNativeY1Values().dataPtr(0), initialSize * appendDoubleVectorFromJsArray_1.SIZEOF_NUMBER);
+        if (isNaN(this.ySplineValues.get(0))) {
+            this.onSplineFailure();
         }
         else {
             this.webAssemblyContext.SCRTSplineHelperCubicSpline(xValues, y1Values, this.xSplineValues, this.y1SplineValues, initialSize, this.interpolationPoints, dataSeries.dataDistributionCalculator.containsNaN);
@@ -121,6 +125,20 @@ var SplineBandRenderableSeries = /** @class */ (function (_super) {
         this.recalculateSpline = false;
     };
     /** @inheritDoc */
+    SplineBandRenderableSeries.prototype.onSplineFailure = function () {
+        if (this.warnOnSplineFailure) {
+            console.warn("Could not calculate spline values.  X data may contain duplicates.  Falling back to original values.\nTo disable this warning set warnOnSplineFailure = false.  To change this behaviour, override onSplineFailure");
+        }
+        var xValues = this.xAxis.isCategoryAxis
+            ? this.dataSeries.getNativeIndexes()
+            : this.dataSeries.getNativeXValues();
+        (0, copyVector_1.copyDoubleVector)(xValues, this.xSplineValues, this.webAssemblyContext);
+        (0, copyVector_1.copyDoubleVector)(this.dataSeries.getNativeYValues(), this.ySplineValues, this.webAssemblyContext);
+        (0, copyVector_1.copyDoubleVector)(this.dataSeries.getNativeY1Values(), this.y1SplineValues, this.webAssemblyContext);
+        // This tells the drawing providers not to treat the data as interpolated
+        this.isSplineProperty = false;
+    };
+    /** @inheritDoc */
     SplineBandRenderableSeries.prototype.getYRange = function (xVisibleRange, isXCategoryAxis) {
         if (isXCategoryAxis === void 0) { isXCategoryAxis = false; }
         return this.dataSeries.getWindowedYRange(xVisibleRange, true, isXCategoryAxis);

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

@@ -39,6 +39,8 @@ export declare class SplineLineRenderableSeries extends BaseLineRenderableSeries
     readonly type = ESeriesType.SplineLineSeries;
     xSplineValues: SCRTDoubleVector;
     ySplineValues: SCRTDoubleVector;
+    warnOnSplineFailure: boolean;
+    protected isSplineProperty: boolean;
     private interpolationPointsProperty;
     private recalculateSpline;
     /**
@@ -48,6 +50,7 @@ export declare class SplineLineRenderableSeries extends BaseLineRenderableSeries
      * @param options optional parameters of type {@link ISplineLineRenderableSeriesOptions} applied when constructing the series type
      */
     constructor(webAssemblyContext: TSciChart, options?: ISplineLineRenderableSeriesOptions);
+    get isSpline(): boolean;
     /**
      * Gets or sets the interpolationPoints being used for the Spline
      */
@@ -63,6 +66,8 @@ export declare class SplineLineRenderableSeries extends BaseLineRenderableSeries
      */
     updateSplineValues(): void;
     /** @inheritDoc */
+    onSplineFailure(): void;
+    /** @inheritDoc */
     getYRange(xVisibleRange: NumberRange, isXCategoryAxis?: boolean): NumberRange;
     /** @inheritDoc */
     toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;

package/Charting/Visuals/RenderableSeries/SplineLineRenderableSeries.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SplineLineRenderableSeries = void 0;
 var Deleter_1 = require("../../../Core/Deleter");
 var SeriesType_1 = require("../../../types/SeriesType");
-var appendDoubleVectorFromJsArray_1 = require("../../../utils/ccall/appendDoubleVectorFromJsArray");
+var copyVector_1 = require("../../../utils/copyVector");
 var animationHelpers_1 = require("./Animations/animationHelpers");
 var BaseLineRenderableSeries_1 = require("./BaseLineRenderableSeries");
 var constants_1 = require("./constants");
@@ -55,6 +55,8 @@ var SplineLineRenderableSeries = /** @class */ (function (_super) {
         var _a, _b, _c;
         var _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = SeriesType_1.ESeriesType.SplineLineSeries;
+        _this.warnOnSplineFailure = true;
+        _this.isSplineProperty = true;
         _this.interpolationPointsProperty = 10;
         _this.recalculateSpline = true;
         _this.xSplineValues = new webAssemblyContext.SCRTDoubleVector();
@@ -66,6 +68,13 @@ var SplineLineRenderableSeries = /** @class */ (function (_super) {
         }
         return _this;
     }
+    Object.defineProperty(SplineLineRenderableSeries.prototype, "isSpline", {
+        get: function () {
+            return this.isSplineProperty;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(SplineLineRenderableSeries.prototype, "interpolationPoints", {
         /**
          * Gets or sets the interpolationPoints being used for the Spline
@@ -96,21 +105,31 @@ var SplineLineRenderableSeries = /** @class */ (function (_super) {
         if (!this.dataSeries || !this.recalculateSpline || !this.parentSurface) {
             return;
         }
+        this.isSplineProperty = true;
         var dataSeries = this.dataSeries;
         var xValues = this.xAxis.isCategoryAxis ? dataSeries.getNativeIndexes() : dataSeries.getNativeXValues();
         var yValues = dataSeries.getNativeYValues();
         var initialSize = xValues.size();
         this.webAssemblyContext.SCRTSplineHelperCubicSpline(xValues, yValues, this.xSplineValues, this.ySplineValues, initialSize, this.interpolationPoints, dataSeries.dataDistributionCalculator.containsNaN);
-        if (yValues.get(0) !== this.ySplineValues.get(0)) {
-            console.warn("Spline interpolation could not be calculated.  Data may contain duplicate x values");
-            this.xSplineValues.resizeFast(initialSize);
-            this.webAssemblyContext.SCRTMemCopy(this.xSplineValues.dataPtr(0), dataSeries.getNativeXValues().dataPtr(0), initialSize * appendDoubleVectorFromJsArray_1.SIZEOF_NUMBER);
-            this.ySplineValues.resizeFast(initialSize);
-            this.webAssemblyContext.SCRTMemCopy(this.ySplineValues.dataPtr(0), dataSeries.getNativeYValues().dataPtr(0), initialSize * appendDoubleVectorFromJsArray_1.SIZEOF_NUMBER);
+        if (isNaN(this.ySplineValues.get(0))) {
+            this.onSplineFailure();
         }
         this.recalculateSpline = false;
     };
     /** @inheritDoc */
+    SplineLineRenderableSeries.prototype.onSplineFailure = function () {
+        if (this.warnOnSplineFailure) {
+            console.warn("Could not calculate spline values.  X data may contain duplicates.  Falling back to original values.\nTo disable this warning set warnOnSplineFailure = false.  To change this behaviour, override onSplineFailure");
+        }
+        var xValues = this.xAxis.isCategoryAxis
+            ? this.dataSeries.getNativeIndexes()
+            : this.dataSeries.getNativeXValues();
+        (0, copyVector_1.copyDoubleVector)(xValues, this.xSplineValues, this.webAssemblyContext);
+        (0, copyVector_1.copyDoubleVector)(this.dataSeries.getNativeYValues(), this.ySplineValues, this.webAssemblyContext);
+        // This tells the drawing providers not to treat the data as interpolated
+        this.isSplineProperty = false;
+    };
+    /** @inheritDoc */
     SplineLineRenderableSeries.prototype.getYRange = function (xVisibleRange, isXCategoryAxis) {
         if (isXCategoryAxis === void 0) { isXCategoryAxis = false; }
         return this.dataSeries.getWindowedYRange(xVisibleRange, true, isXCategoryAxis);

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

@@ -40,6 +40,8 @@ export declare class SplineMountainRenderableSeries extends BaseMountainRenderab
     readonly type = ESeriesType.SplineMountainSeries;
     xSplineValues: SCRTDoubleVector;
     ySplineValues: SCRTDoubleVector;
+    warnOnSplineFailure: boolean;
+    protected isSplineProperty: boolean;
     private recalculateSpline;
     private interpolationPointsProperty;
     /**
@@ -49,6 +51,7 @@ export declare class SplineMountainRenderableSeries extends BaseMountainRenderab
      * @param options optional parameters of type {@link ISplineMountainRenderableSeriesOptions} applied when constructing the series type
      */
     constructor(webAssemblyContext: TSciChart, options?: ISplineMountainRenderableSeriesOptions);
+    get isSpline(): boolean;
     /**
      * Gets or sets the interpolationPoints being used for the Spline
      */
@@ -64,6 +67,8 @@ export declare class SplineMountainRenderableSeries extends BaseMountainRenderab
      */
     updateSplineValues(): void;
     /** @inheritDoc */
+    onSplineFailure(): void;
+    /** @inheritDoc */
     getYRange(xVisibleRange: NumberRange, isXCategoryAxis?: boolean): NumberRange;
     /** @inheritDoc */
     toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;

package/Charting/Visuals/RenderableSeries/SplineMountainRenderableSeries.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SplineMountainRenderableSeries = void 0;
 var Deleter_1 = require("../../../Core/Deleter");
 var SeriesType_1 = require("../../../types/SeriesType");
-var appendDoubleVectorFromJsArray_1 = require("../../../utils/ccall/appendDoubleVectorFromJsArray");
+var copyVector_1 = require("../../../utils/copyVector");
 var animationHelpers_1 = require("./Animations/animationHelpers");
 var BaseMountainRenderableSeries_1 = require("./BaseMountainRenderableSeries");
 var constants_1 = require("./constants");
@@ -55,6 +55,8 @@ var SplineMountainRenderableSeries = /** @class */ (function (_super) {
         var _a, _b, _c;
         var _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = SeriesType_1.ESeriesType.SplineMountainSeries;
+        _this.warnOnSplineFailure = true;
+        _this.isSplineProperty = true;
         _this.recalculateSpline = true;
         _this.interpolationPointsProperty = 10;
         _this.xSplineValues = new webAssemblyContext.SCRTDoubleVector();
@@ -66,6 +68,13 @@ var SplineMountainRenderableSeries = /** @class */ (function (_super) {
         }
         return _this;
     }
+    Object.defineProperty(SplineMountainRenderableSeries.prototype, "isSpline", {
+        get: function () {
+            return this.isSplineProperty;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(SplineMountainRenderableSeries.prototype, "interpolationPoints", {
         /**
          * Gets or sets the interpolationPoints being used for the Spline
@@ -96,21 +105,31 @@ var SplineMountainRenderableSeries = /** @class */ (function (_super) {
         if (!(this.dataSeries && this.recalculateSpline && this.parentSurface)) {
             return;
         }
+        this.isSplineProperty = true;
         var dataSeries = this.dataSeries;
         var xValues = this.xAxis.isCategoryAxis ? dataSeries.getNativeIndexes() : dataSeries.getNativeXValues();
         var yValues = dataSeries.getNativeYValues();
         var initialSize = xValues.size();
         this.webAssemblyContext.SCRTSplineHelperCubicSpline(xValues, yValues, this.xSplineValues, this.ySplineValues, initialSize, this.interpolationPoints, dataSeries.dataDistributionCalculator.containsNaN);
-        if (yValues.get(0) !== this.ySplineValues.get(0)) {
-            console.warn("Spline interpolation could not be calculated.  Data may contain duplicate x values");
-            this.xSplineValues.resizeFast(initialSize);
-            this.webAssemblyContext.SCRTMemCopy(this.xSplineValues.dataPtr(0), dataSeries.getNativeXValues().dataPtr(0), initialSize * appendDoubleVectorFromJsArray_1.SIZEOF_NUMBER);
-            this.ySplineValues.resizeFast(initialSize);
-            this.webAssemblyContext.SCRTMemCopy(this.ySplineValues.dataPtr(0), dataSeries.getNativeYValues().dataPtr(0), initialSize * appendDoubleVectorFromJsArray_1.SIZEOF_NUMBER);
+        if (isNaN(this.ySplineValues.get(0))) {
+            this.onSplineFailure();
         }
         this.recalculateSpline = false;
     };
     /** @inheritDoc */
+    SplineMountainRenderableSeries.prototype.onSplineFailure = function () {
+        if (this.warnOnSplineFailure) {
+            console.warn("Could not calculate spline values.  X data may contain duplicates.  Falling back to original values.\nTo disable this warning set warnOnSplineFailure = false.  To change this behaviour, override onSplineFailure");
+        }
+        var xValues = this.xAxis.isCategoryAxis
+            ? this.dataSeries.getNativeIndexes()
+            : this.dataSeries.getNativeXValues();
+        (0, copyVector_1.copyDoubleVector)(xValues, this.xSplineValues, this.webAssemblyContext);
+        (0, copyVector_1.copyDoubleVector)(this.dataSeries.getNativeYValues(), this.ySplineValues, this.webAssemblyContext);
+        // This tells the drawing providers not to treat the data as interpolated
+        this.isSplineProperty = false;
+    };
+    /** @inheritDoc */
     SplineMountainRenderableSeries.prototype.getYRange = function (xVisibleRange, isXCategoryAxis) {
         if (isXCategoryAxis === void 0) { isXCategoryAxis = false; }
         return this.dataSeries.getWindowedYRange(xVisibleRange, true, isXCategoryAxis);

package/Core/BuildStamp.d.ts

@@ -1,4 +1,4 @@
 import { TSciChart } from "../types/TSciChart";
 import { TSciChart3D } from "../types/TSciChart3D";
-export declare const libraryVersion = "2.2.2416";
+export declare const libraryVersion = "2.2.2417";
 export declare const checkBuildStamp: (wasmContext: TSciChart | TSciChart3D) => boolean;

package/Core/BuildStamp.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkBuildStamp = exports.libraryVersion = void 0;
-var buildStamp = "2022-11-30T00:00:00";
+var buildStamp = "2022-12-02T00:00:00";
 var result;
 // tslint:disable-next-line:no-var-requires
-exports.libraryVersion = "2.2.2416";
+exports.libraryVersion = "2.2.2417";
 var checkBuildStamp = function (wasmContext) {
     if (result !== undefined)
         return result;