scichart 2.2.2417 → 3.0.0-beta.224

package/Charting/Drawing/WebGlRenderContext2D.d.ts

@@ -1,13 +1,22 @@
 import { ICacheable } from "../../Core/ICacheable";
 import { Rect } from "../../Core/Rect";
-import { ERenderLayer } from "../../types/RenderLayer";
+import { EDefaultRenderLayer } from "../../types/DefaultRenderLayer";
 import { Size } from "../../types/Size";
-import { SCRTBrush, SCRTPen, SCRTRenderContext, TSciChart, VectorColorVertex, VectorRectVertex } from "../../types/TSciChart";
+import { SCRTBrush, SCRTFont, SCRTPen, SCRTRenderContext, TSciChart, VectorColorVertex, VectorRectVertex } from "../../types/TSciChart";
+import { TTextStyle } from "../Visuals/Axis/AxisCore";
 import { ShaderEffect } from "../Visuals/RenderableSeries/ShaderEffect";
 import { IBrush2D } from "./IBrush2D";
 import { IPen2D } from "./IPen2D";
 import { IRenderContext2D } from "./IRenderContext2D";
 declare type TDrawFunction = () => void;
+/**
+ *
+ * @param step specifies the capacity of layers that could be potentially added between the default chart layers
+ * @param offset layer z-order offset of the surface
+ * @param relativeRenderLayer layer number relative to the specific surface layers
+ * @returns absolute order of the layer on the chart (considering parent chart and previous subChart surface layers)
+ */
+export declare const calculateAbsoluteRenderLayer: (offset: number, step: number, relativeRenderLayer: EDefaultRenderLayer) => number;
 /**
  * Defines enumeration constants for Line Drawing modes
  */
@@ -36,6 +45,8 @@ export declare class WebGlRenderContext2D implements IRenderContext2D {
      * Gets the current viewport {@link Size}
      */
     readonly viewportSize: Size;
+    /** The id of the canvas of the calling surface. Used to allow this to call a redraw */
+    readonly canvasId: string;
     private readonly layers;
     private readonly webAssemblyContext;
     private readonly effects;
@@ -45,7 +56,7 @@ export declare class WebGlRenderContext2D implements IRenderContext2D {
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing native methods and access to our WebGL2 Engine
      * @param viewportSize The Viewport {@link Size}
      */
-    constructor(webAssemblyContext: TSciChart, viewportSize: Size);
+    constructor(webAssemblyContext: TSciChart, viewportSize: Size, canvasId: string);
     /**
      * Get the native {@link SCRTRenderContext} for direct access to SciChart's WebAssembly Visual Xccelerator engine
      */
@@ -72,7 +83,7 @@ export declare class WebGlRenderContext2D implements IRenderContext2D {
      * @param drawFunction the {@link TDrawFunction | Draw Function} to enqueue
      * @param layer the {@link ERenderLayer | Layer} to draw to
      */
-    enqueueLayeredDraw(drawFunction: TDrawFunction, layer?: ERenderLayer): void;
+    enqueueLayeredDraw(drawFunction: TDrawFunction, layer?: number): void;
     /**
      * Flushes the {@link layers} which have been enqueued with drawing operations in order.
      * Use this in combination with {@link enqueueLayeredDraw} to draw in layers
@@ -113,5 +124,9 @@ export declare class WebGlRenderContext2D implements IRenderContext2D {
      */
     drawRect(rect: Rect, viewRect: Rect, strokePen?: IPen2D, fillBrush?: IBrush2D): void;
     printBlendMode(): void;
+    /** Get a native font.  Pass advanced: true if you are planning to rotate the text */
+    getFont(labelStyle: TTextStyle, advanced?: boolean, transformed?: boolean): SCRTFont;
+    /** End all fonts, causing text to be drawn */
+    endFonts(force?: boolean): void;
 }
 export {};

package/Charting/Drawing/WebGlRenderContext2D.js

@@ -1,14 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebGlRenderContext2D = exports.ELineDrawMode = void 0;
+exports.WebGlRenderContext2D = exports.ELineDrawMode = exports.calculateAbsoluteRenderLayer = void 0;
 var app_1 = require("../../constants/app");
 var Guard_1 = require("../../Core/Guard");
-var RenderLayer_1 = require("../../types/RenderLayer");
 var parseColor_1 = require("../../utils/parseColor");
 var createNativeRect_1 = require("../Visuals/Helpers/createNativeRect");
 var NativeObject_1 = require("../Visuals/Helpers/NativeObject");
 var WebGlBrush_1 = require("./WebGlBrush");
 var WebGlPen_1 = require("./WebGlPen");
+/**
+ *
+ * @param step specifies the capacity of layers that could be potentially added between the default chart layers
+ * @param offset layer z-order offset of the surface
+ * @param relativeRenderLayer layer number relative to the specific surface layers
+ * @returns absolute order of the layer on the chart (considering parent chart and previous subChart surface layers)
+ */
+var calculateAbsoluteRenderLayer = function (offset, step, relativeRenderLayer) {
+    return offset + relativeRenderLayer * step;
+};
+exports.calculateAbsoluteRenderLayer = calculateAbsoluteRenderLayer;
 /**
  * Defines enumeration constants for Line Drawing modes
  */
@@ -34,11 +44,12 @@ var WebGlRenderContext2D = /** @class */ (function () {
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing native methods and access to our WebGL2 Engine
      * @param viewportSize The Viewport {@link Size}
      */
-    function WebGlRenderContext2D(webAssemblyContext, viewportSize) {
-        this.layers = { first: [], second: [], third: [], fourth: [] };
+    function WebGlRenderContext2D(webAssemblyContext, viewportSize, canvasId) {
+        this.layers = {};
         this.effects = [];
         this.webAssemblyContext = webAssemblyContext;
         this.viewportSize = viewportSize;
+        this.canvasId = canvasId;
     }
     /**
      * Get the native {@link SCRTRenderContext} for direct access to SciChart's WebAssembly Visual Xccelerator engine
@@ -77,15 +88,12 @@ var WebGlRenderContext2D = /** @class */ (function () {
     WebGlRenderContext2D.prototype.drawRects = function (vertices, brush, left, top) {
         if (left === void 0) { left = 0; }
         if (top === void 0) { top = 0; }
-        var anchorParams = new this.webAssemblyContext.TSRVector4();
-        anchorParams.x = 0;
-        anchorParams.y = 0;
+        var anchorParams = (0, NativeObject_1.getVector4)(this.webAssemblyContext, 0, 0, 0, 0);
         var nativeContext = this.getNativeContext();
         nativeContext.PushMatrix();
         nativeContext.Translate(left, top);
         nativeContext.DrawRectsBatchVec(vertices, brush, anchorParams);
         nativeContext.PopMatrix();
-        anchorParams.delete();
     };
     /**
      * Enqueues a draw operation to the specified layer. Use in combination with {@link drawLayers} to flush layered draws
@@ -93,29 +101,19 @@ var WebGlRenderContext2D = /** @class */ (function () {
      * @param layer the {@link ERenderLayer | Layer} to draw to
      */
     WebGlRenderContext2D.prototype.enqueueLayeredDraw = function (drawFunction, layer) {
-        switch (layer) {
-            case RenderLayer_1.ERenderLayer.First:
-                this.layers.first.push(drawFunction);
-                break;
-            case RenderLayer_1.ERenderLayer.Second:
-                this.layers.second.push(drawFunction);
-                break;
-            case RenderLayer_1.ERenderLayer.Third:
-                this.layers.third.push(drawFunction);
-                break;
-            default:
-                this.layers.fourth.push(drawFunction);
+        if (!this.layers[layer]) {
+            this.layers[layer] = [];
         }
+        this.layers[layer].push(drawFunction);
     };
     /**
      * Flushes the {@link layers} which have been enqueued with drawing operations in order.
      * Use this in combination with {@link enqueueLayeredDraw} to draw in layers
      */
     WebGlRenderContext2D.prototype.drawLayers = function () {
-        this.layers.first.forEach(function (drawFunc) { return drawFunc(); });
-        this.layers.second.forEach(function (drawFunc) { return drawFunc(); });
-        this.layers.third.forEach(function (drawFunc) { return drawFunc(); });
-        this.layers.fourth.forEach(function (drawFunc) { return drawFunc(); });
+        Object.values(this.layers).forEach(function (layerDrawFunctions) {
+            layerDrawFunctions.forEach(function (drawFunc) { return drawFunc(); });
+        });
     };
     /**
      * Applies a {@link ShaderEffect} to the rendering pipeline. Calling {@link WebGL2RenderingContext.popShaderEffect} pops the effect from the stack
@@ -245,23 +243,16 @@ var WebGlRenderContext2D = /** @class */ (function () {
             var scrtBrush = fillBrush.scrtBrush;
             Guard_1.Guard.notNull(scrtBrush, "WebGlBrush.scrtBrush");
             var vertices = (0, NativeObject_1.getVectorRectVertex)(this.webAssemblyContext);
-            var anchorParams = new this.webAssemblyContext.TSRVector4();
-            try {
-                anchorParams.x = 0;
-                anchorParams.y = 0;
-                var nativeRect = (0, createNativeRect_1.createNativeRect)(this.webAssemblyContext, rect.x, rect.y, rect.right, rect.bottom);
-                vertices.push_back(nativeRect);
-                nativeContext.PushMatrix();
-                nativeContext.PushState();
-                nativeContext.Translate(viewRect.x, viewRect.y);
-                nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
-                nativeContext.DrawRectsBatchVec(vertices, scrtBrush, anchorParams);
-                nativeContext.PopMatrix();
-                nativeContext.PopState();
-            }
-            finally {
-                anchorParams.delete();
-            }
+            var anchorParams = (0, NativeObject_1.getVector4)(this.webAssemblyContext, 0, 0, 0, 0);
+            var nativeRect = (0, createNativeRect_1.createNativeRect)(this.webAssemblyContext, rect.x, rect.y, rect.right, rect.bottom);
+            vertices.push_back(nativeRect);
+            nativeContext.PushMatrix();
+            nativeContext.PushState();
+            nativeContext.Translate(viewRect.x, viewRect.y);
+            nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
+            nativeContext.DrawRectsBatchVec(vertices, scrtBrush, anchorParams);
+            nativeContext.PopMatrix();
+            nativeContext.PopState();
         }
         if (strokePen) {
             this.drawLines([
@@ -300,6 +291,44 @@ var WebGlRenderContext2D = /** @class */ (function () {
                 throw new Error("Unhandled blendmode ");
         }
     };
+    /** Get a native font.  Pass advanced: true if you are planning to rotate the text */
+    WebGlRenderContext2D.prototype.getFont = function (labelStyle, advanced, transformed) {
+        var _a;
+        if (advanced === void 0) { advanced = false; }
+        if (transformed === void 0) { transformed = false; }
+        var fontKey = (0, NativeObject_1.getFontKey)(this.webAssemblyContext, labelStyle, advanced, transformed);
+        var nativeContext = this.getNativeContext();
+        var nativeFont = nativeContext.AquireFont(fontKey);
+        if (!nativeFont) {
+            throw new Error("Could not create font " + fontKey.m_strName);
+        }
+        else {
+            if (!nativeFont.m_isDrawing) {
+                nativeFont.Begin();
+            }
+        }
+        var currentFontName = nativeFont.GetFaceName();
+        if (currentFontName === "SCRT_Loading") {
+            this.webAssemblyContext.TSRRequestCanvasDraw((_a = this.canvasId) !== null && _a !== void 0 ? _a : "undefinedCanvasId");
+        }
+        else if (currentFontName !== fontKey.m_strName) {
+            console.warn("Font ".concat(fontKey.m_strName, ".ttf could not be found on the server. Falling back to Arial"));
+        }
+        return nativeFont;
+    };
+    /** End all fonts, causing text to be drawn */
+    WebGlRenderContext2D.prototype.endFonts = function (force) {
+        if (force === void 0) { force = false; }
+        var nativeContext = this.getNativeContext();
+        var keys = (0, NativeObject_1.getAllFontKeys)(this.webAssemblyContext);
+        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+            var fontKey = keys_1[_i];
+            var nativeFont = nativeContext.AquireFont(fontKey);
+            if (nativeFont && nativeFont.m_isDrawing) {
+                nativeFont.End();
+            }
+        }
+    };
     /**
      * Should store Stores references to all cached WebGlResources {@link ICacheable}
      * Is used to invalidate the resources when the WebGL context is lost.

package/Charting/LayoutManager/BaseCenteredAxisLayoutStrategy.js

@@ -30,8 +30,9 @@ var BaseCenteredAxisLayoutStrategy = /** @class */ (function (_super) {
      * param options {@link IInnerAxisLayoutStrategyOptions}
      */
     function BaseCenteredAxisLayoutStrategy(options) {
+        var _this = this;
         var _a, _b, _c;
-        var _this = _super.call(this) || this;
+        _this = _super.call(this) || this;
         _this.orthogonalAxisIdProperty = AxisBase2D_1.AxisBase2D.DEFAULT_AXIS_ID;
         _this.coordinateModeProperty = EInnerAxisPlacementCoordinateMode_1.EInnerAxisPlacementCoordinateMode.DataValue;
         _this.orthogonalAxisIdProperty = (_a = options === null || options === void 0 ? void 0 : options.orthogonalAxisId) !== null && _a !== void 0 ? _a : _this.orthogonalAxisIdProperty;

package/Charting/LayoutManager/BottomAlignedInnerAxisLayoutStrategy.js

@@ -52,7 +52,7 @@ var BottomAlignedInnerAxisLayoutStrategy = /** @class */ (function (_super) {
             if (!verticalAxis || verticalAxis.isHorizontalAxis) {
                 throw new Error("orthogonalAxisId should be a valid id of vertical axis on the surface!");
             }
-            var coordinateCalculator = verticalAxis.getCurrentCoordinateCalculator(true);
+            var coordinateCalculator = verticalAxis.getCurrentCoordinateCalculator();
             var absoluteAxisPosition = (0, AxisLayoutHelpers_1.getCoordinateWithCoordinateMode)(this.axisPosition, coordinateCalculator, this.coordinateMode);
             var offset = verticalAxis.viewRect.top;
             bottomCoord = absoluteAxisPosition + offset;

package/Charting/LayoutManager/CentralAxesLayoutManager.js

@@ -31,8 +31,9 @@ var TopAlignedInnerAxisLayoutStrategy_1 = require("./TopAlignedInnerAxisLayoutSt
 var CentralAxesLayoutManager = /** @class */ (function (_super) {
     __extends(CentralAxesLayoutManager, _super);
     function CentralAxesLayoutManager(options) {
+        var _this = this;
         var _a, _b, _c, _d;
-        var _this = _super.call(this, options) || this;
+        _this = _super.call(this, options) || this;
         _this.type = LayoutMangerType_1.ELayoutManagerType.CentralAxes;
         _this.horizontalAxisPositionCoordinateModeProperty = EInnerAxisPlacementCoordinateMode_1.EInnerAxisPlacementCoordinateMode.Relative;
         _this.verticalAxisPositionCoordinateModeProperty = EInnerAxisPlacementCoordinateMode_1.EInnerAxisPlacementCoordinateMode.Relative;

package/Charting/LayoutManager/LayoutManager.d.ts

@@ -1,5 +1,6 @@
 import { TLayoutManagerDefinition } from "../../Builder/buildSurface";
 import { Rect } from "../../Core/Rect";
+import { Thickness } from "../../Core/Thickness";
 import { ELayoutManagerType } from "../../types/LayoutMangerType";
 import { ELayoutStrategyType } from "../../types/LayoutStrategyType";
 import { Size } from "../../types/Size";
@@ -73,7 +74,7 @@ export declare class LayoutManager {
     protected chartLayoutState: ChartLayoutState;
     protected axesGroupedByLayoutStrategy: LayoutStrategyAxes;
     constructor(options?: ILayoutManagerOptions);
-    layoutChart(viewportSize: Size): Rect;
+    layoutChart(viewportSize: Size, padding?: Thickness): Rect;
     toJSON(): TLayoutManagerDefinition;
     protected measureLeftOuterAxes(): void;
     protected measureRightOuterAxes(): void;

package/Charting/LayoutManager/LayoutManager.js

@@ -69,13 +69,14 @@ var LayoutManager = /** @class */ (function () {
         this.topInnerAxesLayoutStrategy = this.createStrategy(options === null || options === void 0 ? void 0 : options.TopInner, this.topInnerAxesLayoutStrategy);
         this.bottomInnerAxesLayoutStrategy = this.createStrategy(options === null || options === void 0 ? void 0 : options.BottomInner, this.bottomInnerAxesLayoutStrategy);
     }
-    LayoutManager.prototype.layoutChart = function (viewportSize) {
+    LayoutManager.prototype.layoutChart = function (viewportSize, padding) {
+        var _a, _b, _c, _d;
         this.groupAxesByLayoutStrategy();
         // Padding are hardcoded for now
-        var paddingRight = 0;
-        var paddingLeft = 0;
-        var paddingTop = 0;
-        var paddingBottom = 0;
+        var paddingRight = (_a = padding === null || padding === void 0 ? void 0 : padding.right) !== null && _a !== void 0 ? _a : 0;
+        var paddingLeft = (_b = padding === null || padding === void 0 ? void 0 : padding.left) !== null && _b !== void 0 ? _b : 0;
+        var paddingTop = (_c = padding === null || padding === void 0 ? void 0 : padding.top) !== null && _c !== void 0 ? _c : 0;
+        var paddingBottom = (_d = padding === null || padding === void 0 ? void 0 : padding.bottom) !== null && _d !== void 0 ? _d : 0;
         var availableWidth = viewportSize.width - paddingLeft - paddingRight;
         var availableHeight = viewportSize.height - paddingTop - paddingBottom;
         try {

package/Charting/LayoutManager/LeftAlignedInnerAxisLayoutStrategy.js

@@ -52,7 +52,7 @@ var LeftAlignedInnerAxisLayoutStrategy = /** @class */ (function (_super) {
             if (!horizontalAxis || !horizontalAxis.isHorizontalAxis) {
                 throw new Error("orthogonalAxisId should be a valid id of horizontal axis on the surface!");
             }
-            var coordinateCalculator = horizontalAxis.getCurrentCoordinateCalculator(true);
+            var coordinateCalculator = horizontalAxis.getCurrentCoordinateCalculator();
             var absoluteAxisPosition = (0, AxisLayoutHelpers_1.getCoordinateWithCoordinateMode)(this.axisPosition, coordinateCalculator, this.coordinateMode);
             var offset = horizontalAxis.parentSurface.seriesViewRect.left;
             leftCoord = absoluteAxisPosition + offset;

package/Charting/LayoutManager/RightAlignedInnerAxisLayoutStrategy.js

@@ -52,7 +52,7 @@ var RightAlignedInnerAxisLayoutStrategy = /** @class */ (function (_super) {
             if (!horizontalAxis || !horizontalAxis.isHorizontalAxis) {
                 throw new Error("orthogonalAxisId should be a valid id of horizontal axis on the surface!");
             }
-            var coordinateCalculator = horizontalAxis.getCurrentCoordinateCalculator(true);
+            var coordinateCalculator = horizontalAxis.getCurrentCoordinateCalculator();
             var absoluteAxisPosition = (0, AxisLayoutHelpers_1.getCoordinateWithCoordinateMode)(this.axisPosition, coordinateCalculator, this.coordinateMode);
             var offset = horizontalAxis.parentSurface.seriesViewRect.left;
             rightCoord = absoluteAxisPosition + offset;

package/Charting/LayoutManager/TopAlignedInnerAxisLayoutStrategy.js

@@ -52,7 +52,7 @@ var TopAlignedInnerAxisLayoutStrategy = /** @class */ (function (_super) {
             if (!verticalAxis || verticalAxis.isHorizontalAxis) {
                 throw new Error("orthogonalAxisId should be a valid id of vertical axis on the surface!");
             }
-            var coordinateCalculator = verticalAxis.getCurrentCoordinateCalculator(true);
+            var coordinateCalculator = verticalAxis.getCurrentCoordinateCalculator();
             var absoluteAxisPosition = (0, AxisLayoutHelpers_1.getCoordinateWithCoordinateMode)(this.axisPosition, coordinateCalculator, this.coordinateMode);
             var offset = verticalAxis.viewRect.top;
             topCoord = absoluteAxisPosition + offset;

package/Charting/Model/BaseDataSeries.d.ts

@@ -19,12 +19,19 @@ export interface IBaseDataSeriesOptions {
      */
     dataSeriesName?: string;
     /**
-     * When true, the Data is sorted in X.
+     * When true, the Data is sorted in X.  Same as isSorted.
      * @remarks The user must specify this parameter if the data is not sorted in X
      * in order to have correct rendering. This parameter is used to choose the correct
      * algorithms for zooming, panning and ranging and ensure best performance.
      */
     dataIsSortedInX?: boolean;
+    /**
+     * When true, the Data is sorted in X.  Same as dataIsSortedInX.
+     * @remarks The user must specify this parameter if the data is not sorted in X
+     * in order to have correct rendering. This parameter is used to choose the correct
+     * algorithms for zooming, panning and ranging and ensure best performance.
+     */
+    isSorted?: boolean;
     /**
      * When true, the Data is evenly spaced in X.
      * @remarks
@@ -209,4 +216,6 @@ export declare abstract class BaseDataSeries implements IDataSeries {
     private fillMetadataIfUndefined;
     private getYValues;
 }
+/** @ignore */
+export declare const getIndicesRange: (webAssemblyContext: TSciChart, xValues: SCRTDoubleVector, xRange: NumberRange, isSorted: boolean) => NumberRange;
 export declare const getWindowedYRange: (webAssemblyContext: TSciChart, xValues: SCRTDoubleVector, yValues: SCRTDoubleVector, xRange: NumberRange, getPositiveRange: boolean, isXCategoryAxis: boolean, isSorted: boolean) => NumberRange;

package/Charting/Model/BaseDataSeries.js

@@ -20,7 +20,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWindowedYRange = exports.BaseDataSeries = void 0;
+exports.getWindowedYRange = exports.getIndicesRange = exports.BaseDataSeries = void 0;
 var classFactory_1 = require("../../Builder/classFactory");
 var Deleter_1 = require("../../Core/Deleter");
 var EventHandler_1 = require("../../Core/EventHandler");
@@ -51,7 +51,7 @@ var BaseDataSeries = /** @class */ (function () {
      * @param options the {@link IBaseDataSeriesOptions} which can be passed to config the DataSeries at construct time
      */
     function BaseDataSeries(webAssemblyContext, options) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         /** @inheritDoc */
         this.dataChanged = new EventHandler_1.EventHandler();
         /** @inheritDoc */
@@ -72,13 +72,13 @@ var BaseDataSeries = /** @class */ (function () {
         this.xFinalAnimationValues = new webAssemblyContext.SCRTDoubleVector();
         this.yFinalAnimationValues = new webAssemblyContext.SCRTDoubleVector();
         this.dataSeriesNameProperty = (_b = options === null || options === void 0 ? void 0 : options.dataSeriesName) !== null && _b !== void 0 ? _b : this.dataSeriesNameProperty;
-        this.isSorted = (options === null || options === void 0 ? void 0 : options.dataIsSortedInX) !== undefined ? options === null || options === void 0 ? void 0 : options.dataIsSortedInX : this.isSortedProperty;
-        this.containsNaN = (_c = options === null || options === void 0 ? void 0 : options.containsNaN) !== null && _c !== void 0 ? _c : this.containsNaNProperty;
-        this.isEvenlySpaced = (_d = options === null || options === void 0 ? void 0 : options.dataEvenlySpacedInX) !== null && _d !== void 0 ? _d : this.isEvenlySpacedProperty;
+        this.isSorted = (_d = (_c = options === null || options === void 0 ? void 0 : options.dataIsSortedInX) !== null && _c !== void 0 ? _c : options === null || options === void 0 ? void 0 : options.isSorted) !== null && _d !== void 0 ? _d : this.isSortedProperty;
+        this.containsNaN = (_e = options === null || options === void 0 ? void 0 : options.containsNaN) !== null && _e !== void 0 ? _e : this.containsNaNProperty;
+        this.isEvenlySpaced = (_f = options === null || options === void 0 ? void 0 : options.dataEvenlySpacedInX) !== null && _f !== void 0 ? _f : this.isEvenlySpacedProperty;
         if (options === null || options === void 0 ? void 0 : options.metadata) {
             if ("type" in options.metadata) {
                 this.metadataGeneratorProperty = (0, classFactory_1.createType)(BaseType_1.EBaseType.MetadataGenerator, options.metadata.type, webAssemblyContext, options.metadata.data);
-                options.metadata = (_e = this.metadataGeneratorProperty) === null || _e === void 0 ? void 0 : _e.getMetadata();
+                options.metadata = (_g = this.metadataGeneratorProperty) === null || _g === void 0 ? void 0 : _g.getMetadata();
             }
             else if (!Array.isArray(options === null || options === void 0 ? void 0 : options.metadata)) {
                 this.metadataGeneratorProperty = new IPointMetadata_1.TemplateMetadataGenerator(options === null || options === void 0 ? void 0 : options.metadata);
@@ -260,7 +260,7 @@ var BaseDataSeries = /** @class */ (function () {
         if (upSearchMode === void 0) { upSearchMode = SearchMode_1.ESearchMode.RoundUp; }
         // TODO SearchMode downSearchMode = SearchMode.RoundDown, SearchMode upSearchMode = SearchMode.RoundUp
         var vector = isCategoryData ? this.getNativeIndexes() : this.xValues;
-        return getIndicesRange(this.webAssemblyContext, vector, xRange, this.dataDistributionCalculator.isSortedAscending);
+        return (0, exports.getIndicesRange)(this.webAssemblyContext, vector, xRange, this.dataDistributionCalculator.isSortedAscending);
     };
     Object.defineProperty(BaseDataSeries.prototype, "hasValues", {
         /** @inheritDoc */
@@ -519,6 +519,7 @@ var getIndicesRange = function (webAssemblyContext, xValues, xRange, isSorted) {
     }
     return result;
 };
+exports.getIndicesRange = getIndicesRange;
 var getWindowedYRange = function (webAssemblyContext, xValues, yValues, xRange, getPositiveRange, isXCategoryAxis, // false
 isSorted) {
     // TODO: getPositiveRange
@@ -529,7 +530,7 @@ isSorted) {
         var max = yValues.get(0) + 1;
         return new NumberRange_1.NumberRange(min, max);
     }
-    var indicesRange = isXCategoryAxis ? xRange : getIndicesRange(webAssemblyContext, xValues, xRange, isSorted);
+    var indicesRange = isXCategoryAxis ? xRange : (0, exports.getIndicesRange)(webAssemblyContext, xValues, xRange, isSorted);
     var iMin = Math.max(Math.floor(indicesRange.min), 0);
     var iMax = Math.min(Math.ceil(indicesRange.max), count - 1);
     if (iMax < iMin) {

package/Charting/Model/BaseHeatmapDataSeries.d.ts

@@ -1,8 +1,7 @@
-import { TSeriesDataDefinition } from "../../Builder/buildDataSeries";
 import { EventHandler } from "../../Core/EventHandler";
 import { NumberRange } from "../../Core/NumberRange";
 import { ESearchMode } from "../../types/SearchMode";
-import { FloatVector, SCRTDoubleVector, TSciChart } from "../../types/TSciChart";
+import { SCRTDoubleVector, SCRTFloatVector, TSciChart } from "../../types/TSciChart";
 import { IColorMapParams } from "../Visuals/RenderableSeries/HeatmapColorMap";
 import { IDataDistributionCalculator } from "./DataDistributionCalculator/IDataDistributionCalculator";
 import { EDataChangeType, EDataSeriesType, IDataChangeArgs, IDataSeries } from "./IDataSeries";
@@ -33,6 +32,10 @@ export interface IBaseHeatmapSeriesOptions {
         type: string;
         data?: any;
     };
+    /**
+     * The flag whether this Heatmap has NaN value, to display them as transparent tiles
+     */
+    containsNaN?: boolean;
 }
 /**
  * Defines the interface to a Heatmap DataSeries in SciChart's High Performance Real-time
@@ -83,7 +86,7 @@ export declare abstract class BaseHeatmapDataSeries implements IHeatmapSeries {
      * A normalized {@link FloatVector} is a native / WebAssembly vector (array) of Float32 values with normalized
      * values ready for drawing in SciChart's WebGL2 Rendering Engine
      */
-    protected normalizedVector: FloatVector;
+    protected normalizedVector: SCRTFloatVector;
     private dataSeriesNameProperty;
     private isDeleted;
     private zValuesProperty;
@@ -243,6 +246,16 @@ export declare abstract class BaseHeatmapDataSeries implements IHeatmapSeries {
      * @inheritDoc
      */
     getWindowedYRange(xRange: NumberRange, getPositiveRange: boolean, isCategoryAxis: boolean): NumberRange;
+    /**
+     * Gets the X-value at the specified index.
+     * @param xIndex
+     */
+    abstract getXValue(xIndex: number): number;
+    /**
+     * Gets the Y-value at the specified index.
+     * @param xIndex
+     */
+    abstract getYValue(yIndex: number): number;
     /**
      * Notify subscribers to dataChanged that data has changed. Also sets internal flags.
      * This will trigger a redraw on a parent SciChartSurface
@@ -253,7 +266,7 @@ export declare abstract class BaseHeatmapDataSeries implements IHeatmapSeries {
      * @param colorMap the {@link IColorMapParams} provides properties used to map heatmap Z-values into colors
      * for rendering in SciChart's {@link https://www.scichart.com/javascript-chart-features | Realtime JavaScript Charts}
      */
-    getNormalizedVector(colorMap: IColorMapParams, fillValuesOutOfRange?: boolean): FloatVector;
+    getNormalizedVector(colorMap: IColorMapParams, fillValuesOutOfRange?: boolean): SCRTFloatVector;
     /**
      * Recreates the normalized vector (internally used for drawing heatmap) according to zMin and zMax values
      * @param zMin
@@ -274,7 +287,7 @@ export declare abstract class BaseHeatmapDataSeries implements IHeatmapSeries {
      * Gets the metadata matrix width
      */
     getMetadataWidth(): number;
-    toJSON(excludeData?: boolean): TSeriesDataDefinition;
+    toJSON(excludeData?: boolean): any;
     /**
      * Gets the range in the X-direction for this DataSeries
      */

package/Charting/Model/BaseHeatmapDataSeries.js

@@ -7,6 +7,7 @@ var EventHandler_1 = require("../../Core/EventHandler");
 var Guard_1 = require("../../Core/Guard");
 var NumberRange_1 = require("../../Core/NumberRange");
 var BaseType_1 = require("../../types/BaseType");
+var appendDoubleVectorFromJsArray_1 = require("../../utils/ccall/appendDoubleVectorFromJsArray");
 var guid_1 = require("../../utils/guid");
 var isRealNumber_1 = require("../../utils/isRealNumber");
 var IDataSeries_1 = require("./IDataSeries");
@@ -29,7 +30,7 @@ var BaseHeatmapDataSeries = /** @class */ (function () {
      * @param options the {@link IBaseHeatmapSeriesOptions} which can be passed to configure the DataSeries at construct time
      */
     function BaseHeatmapDataSeries(webAssemblyContext, options) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         /** @inheritDoc */
         this.dataChanged = new EventHandler_1.EventHandler();
         /** @inheritDoc */
@@ -54,11 +55,13 @@ var BaseHeatmapDataSeries = /** @class */ (function () {
         this.changeCountProperty = 0;
         this.webAssemblyContext = webAssemblyContext;
         this.id = (_a = options === null || options === void 0 ? void 0 : options.id) !== null && _a !== void 0 ? _a : (0, guid_1.generateGuid)();
-        this.normalizedVector = new this.webAssemblyContext.FloatVector();
+        this.dataSeriesNameProperty = (_b = options === null || options === void 0 ? void 0 : options.dataSeriesName) !== null && _b !== void 0 ? _b : this.dataSeriesNameProperty;
+        this.hasNaNsProperty = (_c = options === null || options === void 0 ? void 0 : options.containsNaN) !== null && _c !== void 0 ? _c : this.hasNaNsProperty;
+        this.normalizedVector = new this.webAssemblyContext.SCRTFloatVector();
         if (options === null || options === void 0 ? void 0 : options.metadata) {
             if ("type" in options.metadata) {
                 this.metadataGeneratorProperty = (0, classFactory_1.createType)(BaseType_1.EBaseType.MetadataGenerator, options.metadata.type, webAssemblyContext, options.metadata.data);
-                options.metadata = (_b = this.metadataGeneratorProperty) === null || _b === void 0 ? void 0 : _b.getMetadata();
+                options.metadata = (_d = this.metadataGeneratorProperty) === null || _d === void 0 ? void 0 : _d.getMetadata();
             }
             else if (!Array.isArray(options === null || options === void 0 ? void 0 : options.metadata)) {
                 this.metadataGeneratorProperty = new IPointMetadata_1.TemplateMetadataGenerator(options === null || options === void 0 ? void 0 : options.metadata);
@@ -428,7 +431,7 @@ var BaseHeatmapDataSeries = /** @class */ (function () {
     BaseHeatmapDataSeries.prototype.recreateNormalizedVector = function (zMin, zMax, fillValuesOutOfRange) {
         var size = this.arrayWidth * this.arrayHeight;
         this.normalizedVector.clear();
-        this.normalizedVector.resize(size, 0);
+        this.normalizedVector.resizeFast(size);
         // We need to offset newMinValue which is being used for NaN values
         // for the double distance of the texture, which is 256
         var newZMin = this.hasNaNs ? zMin - (zMax - zMin) / 128 : zMin;
@@ -437,11 +440,15 @@ var BaseHeatmapDataSeries = /** @class */ (function () {
         }
         var index = 0;
         var normalizationFactor = 1.0 / (zMax - newZMin);
+        var rowArray = new Float32Array(this.arrayWidth);
         for (var y = 0; y < this.arrayHeight; y++) {
             for (var x = 0; x < this.arrayWidth; x++) {
                 // normalized value from 0..1 = (zValue - zMin) / ((zMax - zMin))
-                var zValue = this.zValuesProperty[y][x] - newZMin;
-                if (isNaN(this.zValuesProperty[y][x])) {
+                var zValueRaw = this.zValuesProperty[y][x];
+                var zValue = zValueRaw - newZMin;
+                // if value !== value is a simple but fast isNaN check
+                // equivalent to isNaN(zValueRaw)
+                if (zValueRaw !== zValueRaw) {
                     zValue = 0;
                 }
                 else if (zValue < zMin - newZMin) {
@@ -451,8 +458,10 @@ var BaseHeatmapDataSeries = /** @class */ (function () {
                     zValue = fillValuesOutOfRange ? zMax - newZMin : 0;
                 }
                 var normalizedZValue = zValue * normalizationFactor;
-                this.normalizedVector.set(index++, normalizedZValue);
+                rowArray[x] = normalizedZValue;
             }
+            (0, appendDoubleVectorFromJsArray_1.memCopyFloat32)(this.webAssemblyContext, rowArray, this.normalizedVector, index);
+            index += this.arrayWidth;
         }
     };
     /**
@@ -488,14 +497,13 @@ var BaseHeatmapDataSeries = /** @class */ (function () {
     BaseHeatmapDataSeries.prototype.toJSON = function (excludeData) {
         if (excludeData === void 0) { excludeData = false; }
         var options = {
+            id: this.id,
+            containsNaN: this.hasNaNs,
             dataSeriesName: this.dataSeriesName,
-            // @ts-ignore
-            metadata: this.metadataGeneratorProperty ? this.metadataGeneratorProperty.toJSON() : this.metadataProperty,
             zValues: excludeData ? undefined : this.zValuesProperty,
-            xStart: null,
-            xStep: null,
-            yStart: null,
-            yStep: null
+            metadata: this.metadataGeneratorProperty
+                ? this.metadataGeneratorProperty.toJSON()
+                : this.metadataProperty
         };
         return options;
     };

package/Charting/Model/ChartData/SeriesInfo.d.ts

@@ -1,3 +1,4 @@
+import { Point } from "../../../Core/Point";
 import { HitTestInfo } from "../../Visuals/RenderableSeries/HitTest/HitTestInfo";
 import { IRenderableSeries } from "../../Visuals/RenderableSeries/IRenderableSeries";
 import { EDataSeriesType } from "../IDataSeries";
@@ -7,10 +8,15 @@ export declare class SeriesInfo {
     dataSeriesType: EDataSeriesType;
     stroke: string;
     seriesName: string;
+    hitTestPointValues: Point;
     xValue: number;
+    point2xValue: number;
     yValue: number;
+    point2yValue: number;
     xCoordinate: number;
     yCoordinate: number;
+    point2xCoordinate: number;
+    point2yCoordinate: number;
     isHit: boolean;
     dataSeriesIndex: number;
     /**

package/Charting/Model/ChartData/SeriesInfo.js

@@ -12,10 +12,15 @@ var SeriesInfo = /** @class */ (function () {
         this.dataSeriesIndex = hitTestInfo.dataSeriesIndex;
         this.isHit = hitTestInfo.isHit;
         this.isWithinDataBounds = hitTestInfo.isWithinDataBounds;
+        this.hitTestPointValues = hitTestInfo.hitTestPointValues;
         this.xValue = hitTestInfo.isCategoryAxis ? hitTestInfo.xCategoryValue : hitTestInfo.xValue;
+        this.point2xValue = hitTestInfo.point2xValue;
         this.yValue = hitTestInfo.yValue;
+        this.point2yValue = hitTestInfo.point2yValue;
         this.xCoordinate = hitTestInfo.xCoord;
         this.yCoordinate = hitTestInfo.yCoord;
+        this.point2xCoordinate = hitTestInfo.point2xCoord;
+        this.point2yCoordinate = hitTestInfo.point2yCoord;
         this.pointMetadata = hitTestInfo.metadata;
         if (renderableSeries.type === SeriesType_1.ESeriesType.ColumnSeries) {
             this.fill = renderableSeries.fill;

package/Charting/Model/ChartData/XyySeriesInfo.d.ts

@@ -5,6 +5,8 @@ export declare class XyySeriesInfo extends SeriesInfo {
     y1Value: number;
     y1Coordinate: number;
     isFirstSeries: boolean;
+    point2y1Value: number;
+    point2y1Coordinate: number;
     constructor(renderableSeries: IRenderableSeries, hitTestInfo: HitTestInfo);
     get formattedY1Value(): string;
 }