scichart 2.2.2417 → 3.0.0-beta.230

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;
 }

package/Charting/Model/ChartData/XyySeriesInfo.js

@@ -23,7 +23,9 @@ var XyySeriesInfo = /** @class */ (function (_super) {
         var _this = _super.call(this, renderableSeries, hitTestInfo) || this;
         _this.isFirstSeries = true;
         _this.y1Value = hitTestInfo.y1Value;
+        _this.point2y1Value = hitTestInfo.point2y1Value;
         _this.y1Coordinate = hitTestInfo.y1Coord;
+        _this.point2y1Coordinate = hitTestInfo.point2y1Coord;
         return _this;
     }
     Object.defineProperty(XyySeriesInfo.prototype, "formattedY1Value", {

package/Charting/Model/DataDistributionCalculator/DataDistributionCalculator.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataDistributionCalculator = void 0;
 var performanceWarnings_1 = require("../../../constants/performanceWarnings");
 var array_1 = require("../../../utils/array");
+var number_1 = require("../../../utils/number");
 var DataDistributionCalculator = /** @class */ (function () {
     function DataDistributionCalculator() {
         this.containsNanProperty = false;
@@ -31,7 +32,7 @@ var DataDistributionCalculator = /** @class */ (function () {
         }
         else {
             if (this.containsNanProperty === false) {
-                this.containsNanProperty = newYValues.some(function (y) { return isNaN(y); });
+                this.containsNanProperty = newYValues.some(number_1.checkIsNaN);
                 if (this.containsNanProperty === false)
                     performanceWarnings_1.performanceWarnings.dataDistributionFlagNaN.warn();
             }
@@ -57,7 +58,7 @@ var DataDistributionCalculator = /** @class */ (function () {
         }
         else {
             if (this.containsNanProperty === false) {
-                this.containsNanProperty = newYValues.some(function (y) { return isNaN(y); });
+                this.containsNanProperty = newYValues.some(number_1.checkIsNaN);
                 if (this.containsNanProperty === false)
                     performanceWarnings_1.performanceWarnings.dataDistributionFlagNaN.warn();
             }
@@ -85,7 +86,7 @@ var DataDistributionCalculator = /** @class */ (function () {
         }
         else {
             if (this.containsNanProperty === false) {
-                this.containsNanProperty = newYValues.some(function (y) { return isNaN(y); });
+                this.containsNanProperty = newYValues.some(number_1.checkIsNaN);
             }
         }
         if (isSorted !== undefined) {

package/Charting/Model/Filters/HlcCustomFilter.js

@@ -21,8 +21,9 @@ var HlcFilterBase_1 = require("./HlcFilterBase");
 var HlcCustomFilter = /** @class */ (function (_super) {
     __extends(HlcCustomFilter, _super);
     function HlcCustomFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b, _c;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         if (originalSeries.type !== IDataSeries_1.EDataSeriesType.Hlc) {
             throw new Error("HlcCustomFilter only supports Hlc original series");
         }
@@ -78,24 +79,24 @@ var HlcCustomFilter = /** @class */ (function (_super) {
         return y;
     };
     HlcCustomFilter.prototype.filterOnAppend = function (count) {
-        var _a = this.filter(this.count(), count), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.appendRange(xValues, closeValues, highValues, lowValues);
+        var _a = this.filter(this.count(), count), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.appendRange(xValues, closeValues, highValues, lowValues, metadata);
     };
     HlcCustomFilter.prototype.filterOnUpdate = function (index) {
         var hlcSeries = this.originalSeries;
-        this.update(index, this.highfilterFunction(index, hlcSeries.getNativeHighValues().get(index)), this.lowfilterFunction(index, hlcSeries.getNativeLowValues().get(index)), this.closefilterFunction(index, hlcSeries.getNativeYValues().get(index)));
+        this.update(index, this.highfilterFunction(index, hlcSeries.getNativeHighValues().get(index)), this.lowfilterFunction(index, hlcSeries.getNativeLowValues().get(index)), this.closefilterFunction(index, hlcSeries.getNativeYValues().get(index)), this.originalSeries.getMetadataAt(index));
     };
     HlcCustomFilter.prototype.filterOnInsert = function (startIndex, count) {
-        var _a = this.filter(startIndex, count), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.insertRange(startIndex, xValues, closeValues, highValues, lowValues);
+        var _a = this.filter(startIndex, count), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.insertRange(startIndex, xValues, closeValues, highValues, lowValues, metadata);
     };
     HlcCustomFilter.prototype.filterOnRemove = function (startIndex, count) {
         this.removeRange(startIndex, count);
     };
     HlcCustomFilter.prototype.filterAll = function () {
         this.clear();
-        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.appendRange(xValues, closeValues, highValues, lowValues);
+        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.appendRange(xValues, closeValues, highValues, lowValues, metadata);
     };
     HlcCustomFilter.prototype.filter = function (startIndex, count) {
         var rawX = this.getOriginalXValues();
@@ -106,13 +107,15 @@ var HlcCustomFilter = /** @class */ (function (_super) {
         var highValues = [];
         var lowValues = [];
         var closeValues = [];
+        var metadata = [];
         for (var i = startIndex; i < startIndex + count; i++) {
             xValues.push(rawX.get(i));
             highValues.push(this.highfilterFunction(i, rawHigh.get(i)));
             lowValues.push(this.lowfilterFunction(i, rawLow.get(i)));
             closeValues.push(this.closefilterFunction(i, rawClose.get(i)));
+            metadata.push(this.originalSeries.getMetadataAt(i));
         }
-        return { xValues: xValues, highValues: highValues, lowValues: lowValues, closeValues: closeValues };
+        return { xValues: xValues, highValues: highValues, lowValues: lowValues, closeValues: closeValues, metadata: metadata };
     };
     return HlcCustomFilter;
 }(HlcFilterBase_1.HlcFilterBase));

package/Charting/Model/Filters/HlcFilterBase.js

@@ -22,8 +22,9 @@ var XyFilterBase_1 = require("./XyFilterBase");
 var HlcFilterBase = /** @class */ (function (_super) {
     __extends(HlcFilterBase, _super);
     function HlcFilterBase(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries.webAssemblyContext, options) || this;
+        _this = _super.call(this, originalSeries.webAssemblyContext, options) || this;
         _this.closefield = XyFilterBase_1.EDataSeriesField.Close;
         _this.highfield = XyFilterBase_1.EDataSeriesField.High;
         _this.lowfield = XyFilterBase_1.EDataSeriesField.Low;

package/Charting/Model/Filters/HlcScaleOffsetFilter.js

@@ -33,8 +33,9 @@ var HlcCustomFilter_1 = require("./HlcCustomFilter");
 var HlcScaleOffsetFilter = /** @class */ (function (_super) {
     __extends(HlcScaleOffsetFilter, _super);
     function HlcScaleOffsetFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.scaleProperty = 1;
         _this.offsetProperty = 0;
         if (originalSeries.type !== IDataSeries_1.EDataSeriesType.Hlc) {

package/Charting/Model/Filters/OhlcCustomFilter.js

@@ -21,8 +21,9 @@ var OhlcFilterBase_1 = require("./OhlcFilterBase");
 var OhlcCustomFilter = /** @class */ (function (_super) {
     __extends(OhlcCustomFilter, _super);
     function OhlcCustomFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b, _c, _d;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         if (originalSeries.type !== IDataSeries_1.EDataSeriesType.Ohlc) {
             throw new Error("OhlcCustomFilter only supports Ohlc original series");
         }
@@ -96,24 +97,24 @@ var OhlcCustomFilter = /** @class */ (function (_super) {
         return y;
     };
     OhlcCustomFilter.prototype.filterOnAppend = function (count) {
-        var _a = this.filter(this.count(), count), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.appendRange(xValues, openValues, highValues, lowValues, closeValues);
+        var _a = this.filter(this.count(), count), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.appendRange(xValues, openValues, highValues, lowValues, closeValues, metadata);
     };
     OhlcCustomFilter.prototype.filterOnUpdate = function (index) {
         var ohlcSeries = this.originalSeries;
-        this.update(index, this.openfilterFunction(index, ohlcSeries.getNativeOpenValues().get(index)), this.highfilterFunction(index, ohlcSeries.getNativeHighValues().get(index)), this.lowfilterFunction(index, ohlcSeries.getNativeLowValues().get(index)), this.closefilterFunction(index, ohlcSeries.getNativeCloseValues().get(index)));
+        this.update(index, this.openfilterFunction(index, ohlcSeries.getNativeOpenValues().get(index)), this.highfilterFunction(index, ohlcSeries.getNativeHighValues().get(index)), this.lowfilterFunction(index, ohlcSeries.getNativeLowValues().get(index)), this.closefilterFunction(index, ohlcSeries.getNativeCloseValues().get(index)), this.originalSeries.getMetadataAt(index));
     };
     OhlcCustomFilter.prototype.filterOnInsert = function (startIndex, count) {
-        var _a = this.filter(startIndex, count), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.insertRange(startIndex, xValues, openValues, highValues, lowValues, closeValues);
+        var _a = this.filter(startIndex, count), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.insertRange(startIndex, xValues, openValues, highValues, lowValues, closeValues, metadata);
     };
     OhlcCustomFilter.prototype.filterOnRemove = function (startIndex, count) {
         this.removeRange(startIndex, count);
     };
     OhlcCustomFilter.prototype.filterAll = function () {
         this.clear();
-        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues;
-        this.appendRange(xValues, openValues, highValues, lowValues, closeValues);
+        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, openValues = _a.openValues, highValues = _a.highValues, lowValues = _a.lowValues, closeValues = _a.closeValues, metadata = _a.metadata;
+        this.appendRange(xValues, openValues, highValues, lowValues, closeValues, metadata);
     };
     OhlcCustomFilter.prototype.filter = function (startIndex, count) {
         var rawX = this.getOriginalXValues();
@@ -123,14 +124,16 @@ var OhlcCustomFilter = /** @class */ (function (_super) {
         var highValues = [];
         var lowValues = [];
         var closeValues = [];
+        var metadata = [];
         for (var i = startIndex; i < startIndex + count; i++) {
             xValues.push(rawX.get(i));
             openValues.push(this.openfilterFunction(i, ohlcSeries.getNativeOpenValues().get(i)));
             highValues.push(this.highfilterFunction(i, ohlcSeries.getNativeHighValues().get(i)));
             lowValues.push(this.lowfilterFunction(i, ohlcSeries.getNativeLowValues().get(i)));
             closeValues.push(this.closefilterFunction(i, ohlcSeries.getNativeCloseValues().get(i)));
+            metadata.push(this.originalSeries.getMetadataAt(i));
         }
-        return { xValues: xValues, openValues: openValues, highValues: highValues, lowValues: lowValues, closeValues: closeValues };
+        return { xValues: xValues, openValues: openValues, highValues: highValues, lowValues: lowValues, closeValues: closeValues, metadata: metadata };
     };
     return OhlcCustomFilter;
 }(OhlcFilterBase_1.OhlcFilterBase));

package/Charting/Model/Filters/OhlcScaleOffsetFilter.js

@@ -33,8 +33,9 @@ var OhlcCustomFilter_1 = require("./OhlcCustomFilter");
 var OhlcScaleOffsetFilter = /** @class */ (function (_super) {
     __extends(OhlcScaleOffsetFilter, _super);
     function OhlcScaleOffsetFilter(originalSeries, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.scaleProperty = 1;
         _this.offsetProperty = 0;
         if (originalSeries.type !== IDataSeries_1.EDataSeriesType.Ohlc) {

package/Charting/Model/Filters/XyCustomFilter.js

@@ -32,8 +32,9 @@ var XyFilterBase_1 = require("./XyFilterBase");
 var XyCustomFilter = /** @class */ (function (_super) {
     __extends(XyCustomFilter, _super);
     function XyCustomFilter(originalSeries, options) {
+        var _this = this;
         var _a;
-        var _this = _super.call(this, originalSeries, options) || this;
+        _this = _super.call(this, originalSeries, options) || this;
         _this.filterFunctionProperty = (_a = options === null || options === void 0 ? void 0 : options.filterFunction) !== null && _a !== void 0 ? _a : _this.filterFunctionProperty;
         if (_this.getOriginalCount() > 0 && (options === null || options === void 0 ? void 0 : options.filterFunction)) {
             _this.filterAll();
@@ -57,34 +58,36 @@ var XyCustomFilter = /** @class */ (function (_super) {
         return y;
     };
     XyCustomFilter.prototype.filterOnAppend = function (count) {
-        var _a = this.filter(this.count(), count), xValues = _a.xValues, yValues = _a.yValues;
-        this.appendRange(xValues, yValues);
+        var _a = this.filter(this.count(), count), xValues = _a.xValues, yValues = _a.yValues, metadata = _a.metadata;
+        this.appendRange(xValues, yValues, metadata);
     };
     XyCustomFilter.prototype.filterOnUpdate = function (index) {
-        this.update(index, this.filterFunction(index, this.getOriginalYValues().get(index)));
+        this.update(index, this.filterFunction(index, this.getOriginalYValues().get(index)), this.originalSeries.getMetadataAt(index));
     };
     XyCustomFilter.prototype.filterOnInsert = function (startIndex, count) {
-        var _a = this.filter(startIndex, count), xValues = _a.xValues, yValues = _a.yValues;
-        this.insertRange(startIndex, xValues, yValues);
+        var _a = this.filter(startIndex, count), xValues = _a.xValues, yValues = _a.yValues, metadata = _a.metadata;
+        this.insertRange(startIndex, xValues, yValues, metadata);
     };
     XyCustomFilter.prototype.filterOnRemove = function (startIndex, count) {
         this.removeRange(startIndex, count);
     };
     XyCustomFilter.prototype.filterAll = function () {
         this.clear();
-        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, yValues = _a.yValues;
-        this.appendRange(xValues, yValues);
+        var _a = this.filter(0, this.getOriginalCount()), xValues = _a.xValues, yValues = _a.yValues, metadata = _a.metadata;
+        this.appendRange(xValues, yValues, metadata);
     };
     XyCustomFilter.prototype.filter = function (startIndex, count) {
         var rawX = this.getOriginalXValues();
         var rawY = this.getOriginalYValues();
         var xValues = [];
         var yValues = [];
+        var metadata = [];
         for (var i = startIndex; i < startIndex + count; i++) {
             xValues.push(rawX.get(i));
             yValues.push(this.filterFunction(i, rawY.get(i)));
+            metadata.push(this.originalSeries.getMetadataAt(i));
         }
-        return { xValues: xValues, yValues: yValues };
+        return { xValues: xValues, yValues: yValues, metadata: metadata };
     };
     return XyCustomFilter;
 }(XyFilterBase_1.XyFilterBase));

package/Charting/Model/Filters/XyFilterBase.d.ts

@@ -7,6 +7,7 @@ import { IXyDataSeriesOptions, XyDataSeries } from "../XyDataSeries";
 import { XyyDataSeries } from "../XyyDataSeries";
 import { XyzDataSeries } from "../XyzDataSeries";
 export declare enum EDataSeriesField {
+    X = "x",
     Open = "open",
     High = "high",
     Low = "low",
@@ -23,6 +24,10 @@ export interface IXyFilterOptions extends IXyDataSeriesOptions {
      * The field that will be returned by getOriginalYValues.
      */
     field?: EDataSeriesField;
+    /**
+     * The field that will be returned by getOriginalXValues.
+     */
+    xField?: EDataSeriesField;
 }
 /**
  * Base class for a filter that produces an {@link XyDataSeries}.
@@ -42,6 +47,10 @@ export declare abstract class XyFilterBase extends XyDataSeries {
      * The field that will be returned by getOriginalYValues.
      */
     readonly field: EDataSeriesField;
+    /**
+     * The field that will be returned by getOriginalYValues.
+     */
+    readonly xField: EDataSeriesField;
     /**
      * Creates an instance of {@link XyFilterBase}
      * @param originalSeries the {@link BaseDataSeries} to be filtered
@@ -96,9 +105,9 @@ export declare abstract class XyFilterBase extends XyDataSeries {
      */
     protected onClear(): void;
     protected onBaseDataChanged(args: IDataChangeArgs): void;
-    protected getYValuesFromOHLC(ohlcSeries: OhlcDataSeries): any;
-    protected getYValuesFromXyy(xyySeries: XyyDataSeries): any;
-    protected getYValuesFromXyz(xyzSeries: XyzDataSeries): any;
-    protected getYValuesFromHlc(hlcSeries: HlcDataSeries): any;
+    protected getValuesFromOHLC(field: EDataSeriesField, ohlcSeries: OhlcDataSeries): any;
+    protected getValuesFromXyy(field: EDataSeriesField, xyySeries: XyyDataSeries): any;
+    protected getValuesFromXyz(field: EDataSeriesField, xyzSeries: XyzDataSeries): any;
+    protected getValuesFromHlc(field: EDataSeriesField, hlcSeries: HlcDataSeries): any;
 }
-export declare const switchData: (field: EDataSeriesField, closey: any, openy1z?: any, high?: any, low?: any) => any;
+export declare const switchData: (field: EDataSeriesField, x: any, closey: any, openy1z?: any, high?: any, low?: any) => any;