scichart 2.0.2228 → 2.1.2273

package/Charting/ChartModifiers/DataPointSelectionModifier.js

@@ -410,7 +410,6 @@ var DataPointSelectionModifier = /** @class */ (function (_super) {
                     topYData = yCalc.getDataValue(_this.startPoint.y);
                 }
                 if (rs.dataSeries.type === IDataSeries_1.EDataSeriesType.HeatmapUniform) {
-                    var heatmapSeries = rs.dataSeries;
                     // TODO: Heatmap series
                 }
                 else {

package/Charting/ChartModifiers/LegendModifier.d.ts

@@ -34,9 +34,9 @@ export interface ILegendModifierOptions extends IChartModifierBaseOptions {
      */
     margin?: number;
     /**
-     * The parent div element Id, the Legend will be appended to this element
+     * The parent div element Id or reference, the Legend will be appended to this element
      */
-    placementDivId?: string;
+    placementDivId?: string | HTMLDivElement;
 }
 /**
  * The LegendModifier provides interactive legend behavior on a 2D {@link SciChartSurface}

package/Charting/ChartModifiers/RolloverModifier.d.ts

@@ -49,6 +49,7 @@ export declare type TTooltipProps = {
     isCategoryAxis: boolean;
     isY1: boolean;
     height: number;
+    width: number;
     seriesInfo: SeriesInfo;
 };
 /**
@@ -237,15 +238,16 @@ export declare class RolloverModifier extends ChartModifierBase2D implements IIn
  * @param pixelRatio
  * @param isY1
  */
-export declare const calcTooltipProps: (index: number, rs: IRenderableSeries, rolloverProps: RolloverModifierRenderableSeriesProps, seriesViewRect: Rect, xValue: number, yValue: number, absoluteXCoord: number, absoluteYCoord: number, hitTestInfo: HitTestInfo, pixelRatio: number, isY1?: boolean) => TTooltipProps;
+export declare const calcTooltipProps: (index: number, rs: IRenderableSeries, rolloverProps: RolloverModifierRenderableSeriesProps, seriesViewRect: Rect, xValue: number, yValue: number, absoluteXCoord: number, absoluteYCoord: number, hitTestInfo: HitTestInfo, pixelRatio: number, isY1?: boolean, isVerticalChart?: boolean) => TTooltipProps;
 /**
  * @ignore
  * @description Used internally, calculates tooltip positions to avoid overlapping
  * @param tooltipArray
  * @param allowTooltipOverlapping
- * @param tooltipPaddingTop
+ * @param spacing
  * @param seriesViewRect
  * @param pixelRatio
+ * @param isVerticalChart
  */
-export declare const calcTooltipPositions: (tooltipArray: TTooltipProps[], allowTooltipOverlapping: boolean, tooltipPaddingTop: number, seriesViewRect: Rect, pixelRatio: number) => TTooltipProps[];
+export declare const calcTooltipPositions: (tooltipArray: TTooltipProps[], allowTooltipOverlapping: boolean, spacing: number, seriesViewRect: Rect, pixelRatio: number, isVerticalChart?: boolean) => TTooltipProps[];
 export {};

package/Charting/ChartModifiers/RolloverModifier.js

@@ -20,6 +20,7 @@ var classFactory_1 = require("../../Builder/classFactory");
 var BaseType_1 = require("../../types/BaseType");
 var ChartModifierType_1 = require("../../types/ChartModifierType");
 var SeriesType_1 = require("../../types/SeriesType");
+var tooltip_1 = require("../../utils/tooltip");
 var translate_1 = require("../../utils/translate");
 var AnnotationBase_1 = require("../Visuals/Annotations/AnnotationBase");
 var LineAnnotation_1 = require("../Visuals/Annotations/LineAnnotation");
@@ -50,7 +51,7 @@ var EMousePosition;
     EMousePosition["SeriesArea"] = "SeriesArea";
 })(EMousePosition || (EMousePosition = {}));
 /** @ignore */
-var TOOLTIP_PADDING_TOP = 4;
+var TOOLTIP_SPACING = 4;
 /**
  * The RolloverModifier provides tooltip and cursor behavior on a 2D {@link SciChartSurface}
  * within SciChart - High Performance {@link https://www.scichart.com/javascript-chart-features | JavaScript Charts}
@@ -518,7 +519,7 @@ var RolloverModifier = /** @class */ (function (_super) {
                     if (isVisible) {
                         var absoluteXCoord = _this.isVerticalChart() ? hitTestInfo.yCoord : hitTestInfo.xCoord;
                         var absoluteYCoord = _this.isVerticalChart() ? hitTestInfo.xCoord : hitTestInfo.yCoord;
-                        var tooltipProps = (0, exports.calcTooltipProps)(index, rs, rs.rolloverModifierProps, _this.parentSurface.seriesViewRect, hitTestInfo.xValue, hitTestInfo.yValue, absoluteXCoord, absoluteYCoord, hitTestInfo, DpiHelper_1.DpiHelper.PIXEL_RATIO);
+                        var tooltipProps = (0, exports.calcTooltipProps)(index, rs, rs.rolloverModifierProps, _this.parentSurface.seriesViewRect, hitTestInfo.xValue, hitTestInfo.yValue, absoluteXCoord, absoluteYCoord, hitTestInfo, DpiHelper_1.DpiHelper.PIXEL_RATIO, false, _this.isVerticalChart());
                         if (tooltipProps)
                             tooltipArray.push(tooltipProps);
                     }
@@ -528,7 +529,7 @@ var RolloverModifier = /** @class */ (function (_super) {
                     if (isVisibleY1) {
                         var absoluteXCoord = _this.isVerticalChart() ? hitTestInfo.y1Coord : hitTestInfo.xCoord;
                         var absoluteYCoord = _this.isVerticalChart() ? hitTestInfo.xCoord : hitTestInfo.y1Coord;
-                        var tooltipY1Props = (0, exports.calcTooltipProps)(index, rs, rs.rolloverModifierProps1, _this.parentSurface.seriesViewRect, hitTestInfo.xValue, hitTestInfo.y1Value, absoluteXCoord, absoluteYCoord, hitTestInfo, DpiHelper_1.DpiHelper.PIXEL_RATIO, true);
+                        var tooltipY1Props = (0, exports.calcTooltipProps)(index, rs, rs.rolloverModifierProps1, _this.parentSurface.seriesViewRect, hitTestInfo.xValue, hitTestInfo.y1Value, absoluteXCoord, absoluteYCoord, hitTestInfo, DpiHelper_1.DpiHelper.PIXEL_RATIO, true, _this.isVerticalChart());
                         if (tooltipY1Props)
                             tooltipArray.push(tooltipY1Props);
                     }
@@ -538,7 +539,7 @@ var RolloverModifier = /** @class */ (function (_super) {
         var orderedTooltipArray = tooltipArray.sort(function (a, b) {
             return a.yCoord > b.yCoord ? 1 : b.yCoord > a.yCoord ? -1 : 0;
         });
-        var tooltipPositions = (0, exports.calcTooltipPositions)(orderedTooltipArray, this.allowTooltipOverlapping, TOOLTIP_PADDING_TOP * DpiHelper_1.DpiHelper.PIXEL_RATIO, this.parentSurface.seriesViewRect, DpiHelper_1.DpiHelper.PIXEL_RATIO);
+        var tooltipPositions = (0, exports.calcTooltipPositions)(orderedTooltipArray, this.allowTooltipOverlapping, TOOLTIP_SPACING * DpiHelper_1.DpiHelper.PIXEL_RATIO, this.parentSurface.seriesViewRect, DpiHelper_1.DpiHelper.PIXEL_RATIO, this.isVerticalChart());
         tooltipPositions.forEach(function (el) {
             var rs = rsList[el.index];
             var showTooltip = _this.showTooltip && el.seriesInfo.isHit;
@@ -589,8 +590,9 @@ exports.RolloverModifier = RolloverModifier;
  * @param pixelRatio
  * @param isY1
  */
-var calcTooltipProps = function (index, rs, rolloverProps, seriesViewRect, xValue, yValue, absoluteXCoord, absoluteYCoord, hitTestInfo, pixelRatio, isY1) {
+var calcTooltipProps = function (index, rs, rolloverProps, seriesViewRect, xValue, yValue, absoluteXCoord, absoluteYCoord, hitTestInfo, pixelRatio, isY1, isVerticalChart) {
     if (isY1 === void 0) { isY1 = false; }
+    if (isVerticalChart === void 0) { isVerticalChart = false; }
     var visibleRange = rs.yAxis.visibleRange;
     var isVisible = visibleRange.min <= yValue && yValue <= visibleRange.max;
     if (isVisible) {
@@ -601,13 +603,21 @@ var calcTooltipProps = function (index, rs, rolloverProps, seriesViewRect, xValu
         var scaledHeight = height * pixelRatio;
         var distTop = absoluteYCoord;
         var distBottom = seriesViewRect.height - absoluteYCoord;
+        var defaultVerticalShift = 5 * pixelRatio;
         var xCoordShift = seriesViewRect.width - absoluteXCoord < scaledWidth ? -width : 5;
-        var yCoordShift = -height / 2;
-        if (distTop < scaledHeight / 2) {
-            yCoordShift = -distTop / pixelRatio;
+        var yCoordShift = isVerticalChart ? defaultVerticalShift : -height / 2;
+        if (isVerticalChart) {
+            if (distBottom < scaledHeight + defaultVerticalShift) {
+                yCoordShift = ((scaledHeight + defaultVerticalShift) / pixelRatio) * -1;
+            }
         }
-        else if (distBottom < scaledHeight / 2) {
-            yCoordShift = -(scaledHeight - distBottom) / pixelRatio;
+        else {
+            if (distTop < scaledHeight / 2) {
+                yCoordShift = -distTop / pixelRatio;
+            }
+            else if (distBottom < scaledHeight / 2) {
+                yCoordShift = -(scaledHeight - distBottom) / pixelRatio;
+            }
         }
         var newRecord = {
             index: index,
@@ -621,6 +631,7 @@ var calcTooltipProps = function (index, rs, rolloverProps, seriesViewRect, xValu
             xCoordShift: xCoordShift,
             yCoordShift: yCoordShift,
             height: scaledHeight,
+            width: scaledWidth,
             seriesInfo: seriesInfo
         };
         return newRecord;
@@ -628,85 +639,32 @@ var calcTooltipProps = function (index, rs, rolloverProps, seriesViewRect, xValu
     return undefined;
 };
 exports.calcTooltipProps = calcTooltipProps;
-/** @ignore */
-var spreadTooltips = function (tooltipArray, totalTooltipsHeight, startY, endY, pixelRatio) {
-    var currentTotalPadding = endY - startY - totalTooltipsHeight;
-    var currentPadding = currentTotalPadding / (tooltipArray.length - 1);
-    tooltipArray.reduce(function (tooltipTopYCoord, tooltip) {
-        tooltip.yCoordShift = (tooltipTopYCoord - tooltip.yCoord) / pixelRatio;
-        return tooltipTopYCoord + tooltip.height + currentPadding;
-    }, startY);
-};
 /**
  * @ignore
  * @description Used internally, calculates tooltip positions to avoid overlapping
  * @param tooltipArray
  * @param allowTooltipOverlapping
- * @param tooltipPaddingTop
+ * @param spacing
  * @param seriesViewRect
  * @param pixelRatio
+ * @param isVerticalChart
  */
-var calcTooltipPositions = function (tooltipArray, allowTooltipOverlapping, tooltipPaddingTop, seriesViewRect, pixelRatio) {
+var calcTooltipPositions = function (tooltipArray, allowTooltipOverlapping, spacing, seriesViewRect, pixelRatio, isVerticalChart) {
+    if (isVerticalChart === void 0) { isVerticalChart = false; }
+    var positionProperties = (0, tooltip_1.getTooltipPositionProperties)(isVerticalChart);
+    var hasOverlap = (0, tooltip_1.checkHasOverlap)(tooltipArray, spacing, pixelRatio, positionProperties);
     var length = tooltipArray.length;
-    if (!allowTooltipOverlapping && length >= 2) {
-        var checkHasOverlap = function () {
-            for (var i = 0; i < length - 1; i++) {
-                var tooltip0 = tooltipArray[i];
-                var scaledHeightTooltip0 = tooltip0.height;
-                var scaledYShiftTooltip0 = tooltip0.yCoordShift * pixelRatio;
-                var bottomYTooltip0 = tooltip0.yCoord + scaledHeightTooltip0 + scaledYShiftTooltip0;
-                var tooltip1 = tooltipArray[i + 1];
-                var scaledYShiftTooltip1 = tooltip1.yCoordShift * pixelRatio;
-                var topYTooltip1 = tooltip1.yCoord + scaledYShiftTooltip1;
-                var diff = topYTooltip1 - bottomYTooltip0;
-                if (diff < tooltipPaddingTop)
-                    return true;
-            }
-            return false;
-        };
-        if (checkHasOverlap()) {
-            var totalTooltipsHeight = tooltipArray.reduce(function (prev, cur) { return prev + cur.height; }, 0);
-            var totalPadding = (length - 1) * tooltipPaddingTop;
-            var totalTooltipsHeightWithPadding = totalTooltipsHeight + totalPadding;
-            var notEnoughViewRectHeight = seriesViewRect.height <= totalTooltipsHeightWithPadding;
-            if (notEnoughViewRectHeight) {
-                var deltaYCoord = tooltipArray[length - 1].yCoord - tooltipArray[0].yCoord;
-                var centerY = tooltipArray[0].yCoord + deltaYCoord / 2;
-                var initialY_1 = centerY - totalTooltipsHeight / 2;
-                tooltipArray.reduce(function (prevSum, cur, index, arr) {
-                    var sum = index === 0 ? initialY_1 : prevSum + arr[index - 1].height + tooltipPaddingTop;
-                    // need to get not scaled value
-                    cur.yCoordShift = (sum - cur.yCoord) / pixelRatio;
-                    return sum;
-                }, 0);
-            }
-            else {
-                var firstTooltip = tooltipArray[0];
-                var lastTooltip = tooltipArray[length - 1];
-                var startY = firstTooltip.yCoord + firstTooltip.yCoordShift * pixelRatio;
-                var endY = lastTooltip.yCoord + lastTooltip.yCoordShift * pixelRatio + lastTooltip.height;
-                var isEnoughHeight = endY - startY >= totalTooltipsHeightWithPadding;
-                if (isEnoughHeight) {
-                    spreadTooltips(tooltipArray, totalTooltipsHeight, startY, endY, pixelRatio);
-                }
-                else {
-                    var additionalHeightNeeded = totalTooltipsHeightWithPadding - (endY - startY);
-                    var availableHeightFromStart = startY;
-                    var availableHeightFromEnd = seriesViewRect.height - endY;
-                    var newStartY = startY - additionalHeightNeeded / 2;
-                    var newEndY = endY + additionalHeightNeeded / 2;
-                    if (availableHeightFromStart < additionalHeightNeeded / 2) {
-                        newStartY = 0;
-                        newEndY = endY + (additionalHeightNeeded - availableHeightFromStart);
-                    }
-                    else if (availableHeightFromEnd < additionalHeightNeeded / 2) {
-                        newStartY = startY - (additionalHeightNeeded - availableHeightFromEnd);
-                        newEndY = seriesViewRect.height;
-                    }
-                    spreadTooltips(tooltipArray, totalTooltipsHeight, newStartY, newEndY, pixelRatio);
-                }
-            }
-        }
+    if (!allowTooltipOverlapping && length >= 2 && hasOverlap) {
+        var spreadMap_1 = (0, tooltip_1.spreadTooltips)(tooltipArray, pixelRatio, positionProperties, spacing, seriesViewRect);
+        tooltipArray.forEach(function (tooltip) {
+            tooltip[positionProperties.shiftPropertyName] = spreadMap_1.get(tooltip.index);
+        });
+    }
+    // centering for vertical charts without overlapping
+    if (isVerticalChart && !hasOverlap) {
+        tooltipArray.forEach(function (tooltip) {
+            return (tooltip[positionProperties.shiftPropertyName] = -(tooltip.width / 2) / pixelRatio);
+        });
     }
     return tooltipArray;
 };

package/Charting/Drawing/WebGlRenderContext2D.d.ts

@@ -39,6 +39,7 @@ export declare class WebGlRenderContext2D implements IRenderContext2D {
     private readonly layers;
     private readonly webAssemblyContext;
     private readonly effects;
+    private nativeContext;
     /**
      * Creates an instance of the WebGlRenderContext2D
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing native methods and access to our WebGL2 Engine

package/Charting/Drawing/WebGlRenderContext2D.js

@@ -43,7 +43,10 @@ var WebGlRenderContext2D = /** @class */ (function () {
      * Get the native {@link SCRTRenderContext} for direct access to SciChart's WebAssembly Visual Xccelerator engine
      */
     WebGlRenderContext2D.prototype.getNativeContext = function () {
-        return this.webAssemblyContext.SCRTGetMainRenderContext2D();
+        if (!this.nativeContext) {
+            this.nativeContext = this.webAssemblyContext.SCRTGetMainRenderContext2D();
+        }
+        return this.nativeContext;
     };
     /**
      * Draw lines: grid lines, etc.

package/Charting/Model/BaseDataSeries.d.ts

@@ -1,13 +1,19 @@
 import { EventHandler } from "../../Core/EventHandler";
 import { NumberRange } from "../../Core/NumberRange";
-import { DoubleVector, TSciChart } from "../../types/TSciChart";
+import { ESearchMode } from "../../types/SearchMode";
+import { SCRTDoubleVector, TSciChart } from "../../types/TSciChart";
 import { SeriesAnimation } from "../Visuals/RenderableSeries/Animations/SeriesAnimation";
+import { IDataDistributionCalculator } from "./DataDistributionCalculator/IDataDistributionCalculator";
 import { EDataChangeType, EDataSeriesType, EDataSeriesValueType, IDataChangeArgs, IDataSeries } from "./IDataSeries";
 import { IMetadataGenerator, IPointMetadata } from "./IPointMetadata";
 /**
  * Options to pass to the {@link BaseDataSeries} constructor
  */
 export interface IBaseDataSeriesOptions {
+    /**
+     * A unique Id for the {@link IDataSeries}
+     */
+    id?: string;
     /**
      * The DataSeries name, used in legends, tooltips to identify the chart series
      */
@@ -19,6 +25,14 @@ export interface IBaseDataSeriesOptions {
      * algorithms for zooming, panning and ranging and ensure best performance.
      */
     dataIsSortedInX?: boolean;
+    /**
+     * When true, the Data is evenly spaced in X.
+     * @remarks
+     * The user must specify this flag (defaults to true) in order to choose the correct, and
+     * fastest algorithms for drawing, indexing and ranging. If you experience glitches or
+     * strange drawing, it may be because you have set data with uneven spacing in X but not set this flag.
+     */
+    dataEvenlySpacedInX?: boolean;
     /**
      * Gets or sets whether the Y data contains NaN values.
      */
@@ -49,6 +63,10 @@ export declare abstract class BaseDataSeries implements IDataSeries {
     abstract readonly type: EDataSeriesType;
     /** @inheritDoc */
     readonly dataChanged: EventHandler<IDataChangeArgs>;
+    /** @inheritDoc */
+    readonly id: string;
+    /** @inheritDoc */
+    readonly dataDistributionCalculator: IDataDistributionCalculator;
     minXSpacing: number;
     /**
      * If set, these will be included in the serialised definition, so that it can be used with sharedData
@@ -61,28 +79,30 @@ export declare abstract class BaseDataSeries implements IDataSeries {
     /**
      * X vector with initial animation values
      */
-    xInitialAnimationValues: DoubleVector;
+    xInitialAnimationValues: SCRTDoubleVector;
     /**
      * Y vector with initial animation values
      */
-    yInitialAnimationValues: DoubleVector;
+    yInitialAnimationValues: SCRTDoubleVector;
     /**
      * X vector with final animation values
      */
-    xFinalAnimationValues: DoubleVector;
+    xFinalAnimationValues: SCRTDoubleVector;
     /**
      * Y vector with final animation values
      */
-    yFinalAnimationValues: DoubleVector;
-    protected xValues: DoubleVector;
-    protected yValues: DoubleVector;
-    protected indexes: DoubleVector;
+    yFinalAnimationValues: SCRTDoubleVector;
+    protected xValues: SCRTDoubleVector;
+    protected yValues: SCRTDoubleVector;
+    protected indexes: SCRTDoubleVector;
     protected isDeleted: boolean;
     private dataSeriesNameProperty;
     private isSortedProperty;
     private containsNaNProperty;
+    private isEvenlySpacedProperty;
     private metadataProperty;
     private metadataGeneratorProperty;
+    private changeCountProperty;
     /**
      * Creates an instance of {@link BaseDataSeries}
      * @param webAssemblyContext the {@link TSciChart | SciChart WebAssembly Context} containing native methods
@@ -91,7 +111,7 @@ export declare abstract class BaseDataSeries implements IDataSeries {
      */
     protected constructor(webAssemblyContext: TSciChart, options?: IBaseDataSeriesOptions);
     /** @inheritDoc */
-    abstract clear(): void;
+    clear(): void;
     /** @inheritDoc */
     get containsNaN(): boolean;
     /** @inheritDoc */
@@ -101,6 +121,10 @@ export declare abstract class BaseDataSeries implements IDataSeries {
     /** @inheritDoc */
     set isSorted(isSorted: boolean);
     /** @inheritDoc */
+    get isEvenlySpaced(): boolean;
+    /** @inheritDoc */
+    set isEvenlySpaced(isSorted: boolean);
+    /** @inheritDoc */
     get dataSeriesName(): string;
     /** @inheritDoc */
     set dataSeriesName(dataSeriesName: string);
@@ -109,11 +133,11 @@ export declare abstract class BaseDataSeries implements IDataSeries {
     /** @inheritDoc */
     getIsDeleted(): boolean;
     /** @inheritDoc */
-    getNativeIndexes(): DoubleVector;
+    getNativeIndexes(): SCRTDoubleVector;
     /** @inheritDoc */
-    getNativeXValues(): DoubleVector;
+    getNativeXValues(): SCRTDoubleVector;
     /** @inheritDoc */
-    getNativeYValues(): DoubleVector;
+    getNativeYValues(): SCRTDoubleVector;
     /** @inheritDoc */
     delete(): void;
     /**
@@ -126,7 +150,8 @@ export declare abstract class BaseDataSeries implements IDataSeries {
     getXRange(dataSeriesValueType?: EDataSeriesValueType): NumberRange;
     /** @inheritDoc */
     getWindowedYRange(xRange: NumberRange, getPositiveRange: boolean, isXCategoryAxis?: boolean, dataSeriesValueType?: EDataSeriesValueType): NumberRange;
-    getIndicesRange(xRange: NumberRange): NumberRange;
+    /** @inheritDoc */
+    getIndicesRange(xRange: NumberRange, isCategoryData?: boolean, downSearchMode?: ESearchMode, upSearchMode?: ESearchMode): NumberRange;
     /** @inheritDoc */
     get hasValues(): boolean;
     /**
@@ -169,6 +194,8 @@ export declare abstract class BaseDataSeries implements IDataSeries {
     updateAnimationProperties(progress: number, animation: SeriesAnimation): void;
     /** @inheritDoc */
     toJSON(excludeData?: boolean): any;
+    /** @inheritDoc */
+    get changeCount(): number;
     protected validateIndex(index: number, message?: string): void;
     protected setMetadataAt(index: number, metadata: IPointMetadata): void;
     protected appendMetadata(metadata: IPointMetadata): void;
@@ -178,8 +205,8 @@ export declare abstract class BaseDataSeries implements IDataSeries {
     protected removeMetadataAt(index: number): void;
     protected removeMetadataRange(startIndex: number, count: number): void;
     protected setMetadata(value: IPointMetadata[]): void;
-    protected getXValues(dataSeriesValueType: EDataSeriesValueType): DoubleVector;
+    protected getXValues(dataSeriesValueType: EDataSeriesValueType): SCRTDoubleVector;
     private fillMetadataIfUndefined;
     private getYValues;
 }
-export declare const getWindowedYRange: (webAssemblyContext: TSciChart, xValues: DoubleVector, yValues: DoubleVector, xRange: NumberRange, getPositiveRange: boolean, isXCategoryAxis: boolean, 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

@@ -26,9 +26,11 @@ var Deleter_1 = require("../../Core/Deleter");
 var EventHandler_1 = require("../../Core/EventHandler");
 var NumberRange_1 = require("../../Core/NumberRange");
 var BaseType_1 = require("../../types/BaseType");
-var fillDoubleVectorFromJsArray_1 = require("../../utils/ccall/fillDoubleVectorFromJsArray");
+var SearchMode_1 = require("../../types/SearchMode");
+var guid_1 = require("../../utils/guid");
 var isRealNumber_1 = require("../../utils/isRealNumber");
 var animationHelpers_1 = require("../Visuals/RenderableSeries/Animations/animationHelpers");
+var DataDistributionCalculator_1 = require("./DataDistributionCalculator/DataDistributionCalculator");
 var IDataSeries_1 = require("./IDataSeries");
 var IPointMetadata_1 = require("./IPointMetadata");
 /**
@@ -49,28 +51,34 @@ 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;
+        var _a, _b, _c, _d, _e;
         /** @inheritDoc */
         this.dataChanged = new EventHandler_1.EventHandler();
+        /** @inheritDoc */
+        this.dataDistributionCalculator = new DataDistributionCalculator_1.DataDistributionCalculator();
         this.minXSpacing = 0;
-        this.isSortedProperty = true;
-        this.containsNaNProperty = true;
+        this.isSortedProperty = undefined;
+        this.containsNaNProperty = undefined;
+        this.isEvenlySpacedProperty = false;
         this.metadataGeneratorProperty = undefined;
+        this.changeCountProperty = 0;
         this.webAssemblyContext = webAssemblyContext;
-        this.xValues = new webAssemblyContext.DoubleVector();
-        this.yValues = new webAssemblyContext.DoubleVector();
-        this.indexes = new webAssemblyContext.DoubleVector();
-        this.xInitialAnimationValues = new webAssemblyContext.DoubleVector();
-        this.yInitialAnimationValues = new webAssemblyContext.DoubleVector();
-        this.xFinalAnimationValues = new webAssemblyContext.DoubleVector();
-        this.yFinalAnimationValues = new webAssemblyContext.DoubleVector();
-        this.dataSeriesNameProperty = (_a = options === null || options === void 0 ? void 0 : options.dataSeriesName) !== null && _a !== void 0 ? _a : this.dataSeriesNameProperty;
+        this.id = (_a = options === null || options === void 0 ? void 0 : options.id) !== null && _a !== void 0 ? _a : (0, guid_1.generateGuid)();
+        this.xValues = new webAssemblyContext.SCRTDoubleVector();
+        this.yValues = new webAssemblyContext.SCRTDoubleVector();
+        this.indexes = new webAssemblyContext.SCRTDoubleVector();
+        this.xInitialAnimationValues = new webAssemblyContext.SCRTDoubleVector();
+        this.yInitialAnimationValues = new webAssemblyContext.SCRTDoubleVector();
+        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 = (_b = options === null || options === void 0 ? void 0 : options.containsNaN) !== null && _b !== void 0 ? _b : this.containsNaNProperty;
+        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;
         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 = (_c = this.metadataGeneratorProperty) === null || _c === void 0 ? void 0 : _c.getMetadata();
+                options.metadata = (_e = this.metadataGeneratorProperty) === null || _e === void 0 ? void 0 : _e.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);
@@ -78,6 +86,12 @@ var BaseDataSeries = /** @class */ (function () {
             }
         }
     }
+    /** @inheritDoc */
+    BaseDataSeries.prototype.clear = function () {
+        var _a;
+        (_a = this.indexes) === null || _a === void 0 ? void 0 : _a.clear();
+        this.dataDistributionCalculator.clear(this.isSorted, this.containsNaN);
+    };
     Object.defineProperty(BaseDataSeries.prototype, "containsNaN", {
         /** @inheritDoc */
         get: function () {
@@ -86,6 +100,9 @@ var BaseDataSeries = /** @class */ (function () {
         /** @inheritDoc */
         set: function (containsNaN) {
             this.containsNaNProperty = containsNaN;
+            if (containsNaN !== undefined) {
+                this.dataDistributionCalculator.setContainsNaN(containsNaN);
+            }
             this.notifyDataChanged(IDataSeries_1.EDataChangeType.Property, undefined, undefined, "containsNaN");
         },
         enumerable: false,
@@ -99,11 +116,27 @@ var BaseDataSeries = /** @class */ (function () {
         /** @inheritDoc */
         set: function (isSorted) {
             this.isSortedProperty = isSorted;
+            if (isSorted !== undefined) {
+                this.dataDistributionCalculator.setIsSortedAscending(isSorted);
+            }
             this.notifyDataChanged(IDataSeries_1.EDataChangeType.Property, undefined, undefined, "isSorted");
         },
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(BaseDataSeries.prototype, "isEvenlySpaced", {
+        /** @inheritDoc */
+        get: function () {
+            return this.isEvenlySpacedProperty;
+        },
+        /** @inheritDoc */
+        set: function (isSorted) {
+            this.isEvenlySpacedProperty = isSorted;
+            this.notifyDataChanged(IDataSeries_1.EDataChangeType.Property, undefined, undefined, "isEvenlySpaced");
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(BaseDataSeries.prototype, "dataSeriesName", {
         /** @inheritDoc */
         get: function () {
@@ -135,9 +168,7 @@ var BaseDataSeries = /** @class */ (function () {
         }
         var indexes = this.indexes;
         if (indexes.size() < this.count()) {
-            var newIndexesLength = this.count() - indexes.size();
-            var indexValues = Array.from(Array(newIndexesLength), function (_, i) { return i + indexes.size(); });
-            (0, fillDoubleVectorFromJsArray_1.fillDoubleVectorFromJsArray)(this.webAssemblyContext, this.indexes, indexValues);
+            this.webAssemblyContext.SCRTFillVectorSequential(this.indexes, this.count());
         }
         return this.indexes;
     };
@@ -165,6 +196,7 @@ var BaseDataSeries = /** @class */ (function () {
      * Call to notify subscribers of {@link dataChanged} that the data has changed and {@link SciChartSurface} needs redrawing
      */
     BaseDataSeries.prototype.notifyDataChanged = function (changeType, index, count, name) {
+        this.changeCountProperty++;
         this.dataChanged.raiseEvent({ changeType: changeType, index: index, count: count });
     };
     Object.defineProperty(BaseDataSeries.prototype, "xRange", {
@@ -187,14 +219,18 @@ var BaseDataSeries = /** @class */ (function () {
         else if (this.count() > 1) {
             var min = xValues.get(0);
             var max = xValues.get(this.count() - 1);
-            if (!this.isSorted) {
-                for (var i = 0; i < this.count(); i++) {
-                    if (xValues.get(i) < min) {
-                        min = xValues.get(i);
-                    }
-                    if (xValues.get(i) > max) {
-                        max = xValues.get(i);
+            if (!this.dataDistributionCalculator.isSortedAscending) {
+                var minMax = void 0;
+                try {
+                    minMax = this.webAssemblyContext.NumberUtil.MinMax(this.getNativeXValues());
+                    if (!(0, isRealNumber_1.isRealNumber)(minMax.minD) || !(0, isRealNumber_1.isRealNumber)(minMax.maxD)) {
+                        return new NumberRange_1.NumberRange(0, 0);
                     }
+                    min = minMax.minD;
+                    max = minMax.maxD;
+                }
+                finally {
+                    (0, Deleter_1.deleteSafe)(minMax);
                 }
             }
             if (min === max) {
@@ -207,7 +243,7 @@ var BaseDataSeries = /** @class */ (function () {
             }
             return new NumberRange_1.NumberRange(min, max);
         }
-        return new NumberRange_1.NumberRange();
+        return new NumberRange_1.NumberRange(0, 0);
     };
     /** @inheritDoc */
     BaseDataSeries.prototype.getWindowedYRange = function (xRange, getPositiveRange, isXCategoryAxis, dataSeriesValueType) {
@@ -215,11 +251,16 @@ var BaseDataSeries = /** @class */ (function () {
         if (dataSeriesValueType === void 0) { dataSeriesValueType = IDataSeries_1.EDataSeriesValueType.Default; }
         var xValues = this.getXValues(dataSeriesValueType);
         var yValues = this.getYValues(dataSeriesValueType);
-        return (0, exports.getWindowedYRange)(this.webAssemblyContext, xValues, yValues, xRange, getPositiveRange, isXCategoryAxis, this.isSorted);
+        return (0, exports.getWindowedYRange)(this.webAssemblyContext, xValues, yValues, xRange, getPositiveRange, isXCategoryAxis, this.dataDistributionCalculator.isSortedAscending);
     };
-    BaseDataSeries.prototype.getIndicesRange = function (xRange) {
+    /** @inheritDoc */
+    BaseDataSeries.prototype.getIndicesRange = function (xRange, isCategoryData, downSearchMode, upSearchMode) {
+        if (isCategoryData === void 0) { isCategoryData = false; }
+        if (downSearchMode === void 0) { downSearchMode = SearchMode_1.ESearchMode.RoundDown; }
+        if (upSearchMode === void 0) { upSearchMode = SearchMode_1.ESearchMode.RoundUp; }
         // TODO SearchMode downSearchMode = SearchMode.RoundDown, SearchMode upSearchMode = SearchMode.RoundUp
-        return getIndicesRange(this.webAssemblyContext, this.xValues, xRange, this.isSorted);
+        var vector = isCategoryData ? this.getNativeIndexes() : this.xValues;
+        return getIndicesRange(this.webAssemblyContext, vector, xRange, this.dataDistributionCalculator.isSortedAscending);
     };
     Object.defineProperty(BaseDataSeries.prototype, "hasValues", {
         /** @inheritDoc */
@@ -329,6 +370,14 @@ var BaseDataSeries = /** @class */ (function () {
             metadata: this.metadataGeneratorProperty ? this.metadataGeneratorProperty.toJSON() : this.metadataProperty }, this.dataIds);
         return options;
     };
+    Object.defineProperty(BaseDataSeries.prototype, "changeCount", {
+        /** @inheritDoc */
+        get: function () {
+            return this.changeCountProperty;
+        },
+        enumerable: false,
+        configurable: true
+    });
     BaseDataSeries.prototype.validateIndex = function (index, message) {
         if (Math.round(index) !== index) {
             throw Error("Index must be an integer");