scichart 3.2.446 → 3.2.461

package/Charting/Model/BaseDataSeries.d.ts

@@ -286,5 +286,5 @@ export declare abstract class BaseDataSeries extends DeletableEntity implements
     private getYValues;
 }
 /** @ignore */
-export declare const getIndicesRange: (webAssemblyContext: TSciChart, xValues: SCRTDoubleVector, xRange: NumberRange, isSorted: boolean) => NumberRange;
+export declare const getIndicesRange: (webAssemblyContext: TSciChart, xValues: SCRTDoubleVector, xRange: NumberRange, isSorted: boolean, downSearchMode?: ESearchMode, upSearchMode?: ESearchMode) => 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

@@ -352,7 +352,7 @@ var BaseDataSeries = /** @class */ (function (_super) {
         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 (0, exports.getIndicesRange)(this.webAssemblyContext, vector, xRange, this.dataDistributionCalculator.isSortedAscending);
+        return (0, exports.getIndicesRange)(this.webAssemblyContext, vector, xRange, this.dataDistributionCalculator.isSortedAscending, downSearchMode, upSearchMode);
     };
     Object.defineProperty(BaseDataSeries.prototype, "hasValues", {
         /** @inheritDoc */
@@ -665,7 +665,9 @@ var BaseDataSeries = /** @class */ (function (_super) {
 }(DeletableEntity_1.DeletableEntity));
 exports.BaseDataSeries = BaseDataSeries;
 /** @ignore */
-var getIndicesRange = function (webAssemblyContext, xValues, xRange, isSorted) {
+var getIndicesRange = function (webAssemblyContext, xValues, xRange, isSorted, downSearchMode, upSearchMode) {
+    if (downSearchMode === void 0) { downSearchMode = SearchMode_1.ESearchMode.RoundDown; }
+    if (upSearchMode === void 0) { upSearchMode = SearchMode_1.ESearchMode.RoundUp; }
     var count = xValues.size();
     var result = new NumberRange_1.NumberRange(0, -1);
     if (count > 0) {
@@ -673,9 +675,21 @@ var getIndicesRange = function (webAssemblyContext, xValues, xRange, isSorted) {
         if (!isSorted) {
             return new NumberRange_1.NumberRange(0, count - 1);
         }
+        var convertSearchMode = function (mode) {
+            switch (mode) {
+                case SearchMode_1.ESearchMode.Exact:
+                    return webAssemblyContext.SCRTFindIndexSearchMode.Exact;
+                case SearchMode_1.ESearchMode.Nearest:
+                    return webAssemblyContext.SCRTFindIndexSearchMode.Nearest;
+                case SearchMode_1.ESearchMode.RoundDown:
+                    return webAssemblyContext.SCRTFindIndexSearchMode.RoundDown;
+                case SearchMode_1.ESearchMode.RoundUp:
+                    return webAssemblyContext.SCRTFindIndexSearchMode.RoundUp;
+            }
+        };
         // For sorted data, we search the points in the viewport
-        var iMin = webAssemblyContext.NumberUtil.FindIndex(xValues, xRange.min, webAssemblyContext.SCRTFindIndexSearchMode.RoundDown, true);
-        var iMax = webAssemblyContext.NumberUtil.FindIndex(xValues, xRange.max, webAssemblyContext.SCRTFindIndexSearchMode.RoundUp, true);
+        var iMin = webAssemblyContext.NumberUtil.FindIndex(xValues, xRange.min, convertSearchMode(downSearchMode), true);
+        var iMax = webAssemblyContext.NumberUtil.FindIndex(xValues, xRange.max, convertSearchMode(upSearchMode), true);
         result = new NumberRange_1.NumberRange(iMin, iMax);
     }
     return result;
@@ -691,7 +705,9 @@ isSorted) {
         var y = yValues.get(0);
         return new NumberRange_1.NumberRange(y, y);
     }
-    var indicesRange = isXCategoryAxis ? xRange : (0, exports.getIndicesRange)(webAssemblyContext, xValues, xRange, isSorted);
+    var indicesRange = isXCategoryAxis
+        ? xRange
+        : (0, exports.getIndicesRange)(webAssemblyContext, xValues, xRange, isSorted, SearchMode_1.ESearchMode.RoundUp, SearchMode_1.ESearchMode.RoundDown);
     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/HlcDataSeries.js

@@ -20,6 +20,7 @@ var Deleter_1 = require("../../Core/Deleter");
 var Guard_1 = require("../../Core/Guard");
 var NumberRange_1 = require("../../Core/NumberRange");
 var NumberArray_1 = require("../../types/NumberArray");
+var SearchMode_1 = require("../../types/SearchMode");
 var appendDoubleVectorFromJsArray_1 = require("../../utils/ccall/appendDoubleVectorFromJsArray");
 var isRealNumber_1 = require("../../utils/isRealNumber");
 var animationHelpers_1 = require("../Visuals/RenderableSeries/Animations/animationHelpers");
@@ -409,7 +410,9 @@ var HlcDataSeries = /** @class */ (function (_super) {
                 return new NumberRange_1.NumberRange(min, max);
             }
         }
-        var indicesRange = isXCategoryAxis ? xRange : this.getIndicesRange(xRange);
+        var indicesRange = isXCategoryAxis
+            ? xRange
+            : this.getIndicesRange(xRange, false, SearchMode_1.ESearchMode.RoundUp, SearchMode_1.ESearchMode.RoundDown);
         var yMin = Number.MAX_VALUE;
         var yMax = Number.MIN_VALUE;
         var iMin = Math.max(Math.floor(indicesRange.min), 0);

package/Charting/Model/OhlcDataSeries.js

@@ -20,6 +20,7 @@ var Deleter_1 = require("../../Core/Deleter");
 var Guard_1 = require("../../Core/Guard");
 var NumberRange_1 = require("../../Core/NumberRange");
 var NumberArray_1 = require("../../types/NumberArray");
+var SearchMode_1 = require("../../types/SearchMode");
 var appendDoubleVectorFromJsArray_1 = require("../../utils/ccall/appendDoubleVectorFromJsArray");
 var animationHelpers_1 = require("../Visuals/RenderableSeries/Animations/animationHelpers");
 var BaseDataSeries_1 = require("./BaseDataSeries");
@@ -360,7 +361,9 @@ var OhlcDataSeries = /** @class */ (function (_super) {
             var y = closeValues.get(0);
             return new NumberRange_1.NumberRange(y, y);
         }
-        var indicesRange = isXCategoryAxis ? xRange : this.getIndicesRange(xRange);
+        var indicesRange = isXCategoryAxis
+            ? xRange
+            : this.getIndicesRange(xRange, false, SearchMode_1.ESearchMode.RoundUp, SearchMode_1.ESearchMode.RoundDown);
         var yMin = Number.MAX_VALUE;
         var yMax = Number.MIN_VALUE;
         var iMin = Math.max(indicesRange.min, 0);

package/Charting/Model/XyyDataSeries.js

@@ -20,6 +20,7 @@ var Deleter_1 = require("../../Core/Deleter");
 var Guard_1 = require("../../Core/Guard");
 var NumberRange_1 = require("../../Core/NumberRange");
 var NumberArray_1 = require("../../types/NumberArray");
+var SearchMode_1 = require("../../types/SearchMode");
 var appendDoubleVectorFromJsArray_1 = require("../../utils/ccall/appendDoubleVectorFromJsArray");
 var isRealNumber_1 = require("../../utils/isRealNumber");
 var animationHelpers_1 = require("../Visuals/RenderableSeries/Animations/animationHelpers");
@@ -300,7 +301,9 @@ var XyyDataSeries = /** @class */ (function (_super) {
             var max = Math.max(yValues.get(0), y1Values.get(0));
             return new NumberRange_1.NumberRange(min, max);
         }
-        var indicesRange = isXCategoryAxis ? xRange : this.getIndicesRange(xRange);
+        var indicesRange = isXCategoryAxis
+            ? xRange
+            : this.getIndicesRange(xRange, false, SearchMode_1.ESearchMode.RoundUp, SearchMode_1.ESearchMode.RoundDown);
         var iMin = Math.max(Math.floor(indicesRange.min), 0);
         var iMax = Math.min(Math.ceil(indicesRange.max), this.count() - 1);
         if (iMax < iMin) {

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

@@ -156,6 +156,11 @@ export interface IAxisBase2dOptions extends IAxisCoreOptions {
      * which is 0 for normal axes, but is used to position stacked axes.
      */
     overrideOffset?: number;
+    /**
+     * For an X Axis only - Determines whether the series will be clipped to the {@link visibleRange}.  Defaults true.
+     * You may want to set this false if you have stacked horizontal axes, or are using {@link offsetOverride}.
+     */
+    clipToXRange?: boolean;
 }
 /**
  * The base class for 2D Chart Axis within SciChart - High Performance {@link https://www.scichart.com/javascript-chart-features | JavaScript Charts}.
@@ -323,6 +328,16 @@ export declare abstract class AxisBase2D extends AxisCore implements IThemeable
      * Gets or sets a {@link IAutoRangeAnimationOptions} object that controls if and how the visible range is animated during autoRanging
      */
     set autoRangeAnimation(autoRangeAnimation: IAutoRangeAnimationOptions);
+    /**
+     * For an X Axis only - Determines whether the series will be clipped to the {@link visibleRange}.  Defaults true.
+     * You may want to set this false if you have stacked horizontal axes, or are using {@link offsetOverride}.
+     */
+    get clipToXRange(): boolean;
+    /**
+     * For an X Axis only - Determines whether the series will be clipped to the {@link visibleRange}.  Defaults true.
+     * You may want to set this false if you have stacked horizontal axes, or are using {@link offsetOverride}.
+     */
+    set clipToXRange(clipToXRange: boolean);
     abstract type: EAxisType.CategoryAxis | EAxisType.LogarithmicAxis | EAxisType.NumericAxis | EAxisType.DateTimeNumericAxis;
     /**
      * Gets the parent {@link SciChartSurface} that this axis is attached to
@@ -369,6 +384,7 @@ export declare abstract class AxisBase2D extends AxisCore implements IThemeable
     private tickCache;
     private backgroundColorProperty;
     private dpiAdjustedLabelStyleCache;
+    private clipToXRangeProperty;
     /**
      * Creates an instance of the {@link AxisBase2D}
      * @param webAssemblyContext The {@link TSciChart | SciChart 2D WebAssembly Context} containing native methods and

package/Charting/Visuals/Axis/AxisBase2D.js

@@ -102,7 +102,7 @@ var AxisBase2D = /** @class */ (function (_super) {
      */
     function AxisBase2D(webAssemblyContext, options) {
         var _this = this;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         _this = _super.call(this, options) || this;
         /**
          * Gets the {@link AxisLayoutState} class which manages layout
@@ -130,6 +130,7 @@ var AxisBase2D = /** @class */ (function (_super) {
         _this.offsetProperty = 0;
         _this.offsetOverrideProperty = undefined;
         _this.tickCache = undefined;
+        _this.clipToXRangeProperty = true;
         _this.webAssemblyContext2D = webAssemblyContext;
         _this.penCacheForMajorGridLines = new Pen2DCache_1.Pen2DCache(webAssemblyContext);
         _this.penCacheForMinorGridLines = new Pen2DCache_1.Pen2DCache(webAssemblyContext);
@@ -163,6 +164,7 @@ var AxisBase2D = /** @class */ (function (_super) {
         _this.autoRangeAnimationProperty = options === null || options === void 0 ? void 0 : options.autoRangeAnimation;
         _this.backgroundColor = (_k = options === null || options === void 0 ? void 0 : options.backgroundColor) !== null && _k !== void 0 ? _k : _this.backgroundColor;
         _this.offsetOverrideProperty = options === null || options === void 0 ? void 0 : options.overrideOffset; // undefined if not set
+        _this.clipToXRangeProperty = (_l = options === null || options === void 0 ? void 0 : options.clipToXRange) !== null && _l !== void 0 ? _l : _this.clipToXRange;
         return _this;
     }
     Object.defineProperty(AxisBase2D.prototype, "labelProvider", {
@@ -559,6 +561,27 @@ var AxisBase2D = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(AxisBase2D.prototype, "clipToXRange", {
+        /**
+         * For an X Axis only - Determines whether the series will be clipped to the {@link visibleRange}.  Defaults true.
+         * You may want to set this false if you have stacked horizontal axes, or are using {@link offsetOverride}.
+         */
+        get: function () {
+            return this.clipToXRangeProperty;
+        },
+        /**
+         * For an X Axis only - Determines whether the series will be clipped to the {@link visibleRange}.  Defaults true.
+         * You may want to set this false if you have stacked horizontal axes, or are using {@link offsetOverride}.
+         */
+        set: function (clipToXRange) {
+            if (this.clipToXRangeProperty !== clipToXRange) {
+                this.clipToXRangeProperty = clipToXRange;
+                this.notifyPropertyChanged(constants_1.PROPERTY.DRAW_ONLY_WITHIN_XRANGE);
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
     /** @inheritDoc */
     AxisBase2D.prototype.applyTheme = function (themeProvider) {
         var previousThemeProvider = this.parentSurface.previousThemeProvider;
@@ -974,7 +997,8 @@ var AxisBase2D = /** @class */ (function (_super) {
             minorDelta: this.minorDelta,
             // @ts-ignore
             labelProvider: this.labelProvider.toJSON(),
-            keepLabelsWithinAxis: this.axisRenderer.keepLabelsWithinAxis
+            keepLabelsWithinAxis: this.axisRenderer.keepLabelsWithinAxis,
+            clipToXRange: this.clipToXRange
         };
         return { type: this.type, options: options };
     };

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

@@ -45,5 +45,6 @@ export declare enum PROPERTY {
     VISIBLE_RANGE_SIZE_LIMIT = "VISIBLE_RANGE_SIZE_LIMIT",
     TICK_PROVIDER = "TICK_PROVIDER",
     VIEW_RECT = "VIEW_RECT",
-    ZOOMEXTENTS_RANGE = "ZOOMEXTENTS_RANGE"
+    ZOOMEXTENTS_RANGE = "ZOOMEXTENTS_RANGE",
+    DRAW_ONLY_WITHIN_XRANGE = "DRAW_ONLY_WITHIN_XRANGE"
 }

package/Charting/Visuals/Axis/constants.js

@@ -50,4 +50,5 @@ var PROPERTY;
     PROPERTY["TICK_PROVIDER"] = "TICK_PROVIDER";
     PROPERTY["VIEW_RECT"] = "VIEW_RECT";
     PROPERTY["ZOOMEXTENTS_RANGE"] = "ZOOMEXTENTS_RANGE";
+    PROPERTY["DRAW_ONLY_WITHIN_XRANGE"] = "DRAW_ONLY_WITHIN_XRANGE";
 })(PROPERTY = exports.PROPERTY || (exports.PROPERTY = {}));

package/Charting/Visuals/PointMarkers/BasePointMarker.js

@@ -300,7 +300,9 @@ var BasePointMarker = /** @class */ (function (_super) {
         strokeMask.copyTexture();
         var fillMask = new CanvasTexture_1.CanvasTexture(this.webAssemblyContext, widthPadded, heightPadded);
         fillMask.clear();
-        this.drawSprite(fillMask.getContext(), this.width * DpiHelper_1.DpiHelper.PIXEL_RATIO, this.height * DpiHelper_1.DpiHelper.PIXEL_RATIO, "#00000000", 0, "#ffffffff");
+        this.drawSprite(fillMask.getContext(), 
+        // Temporary fix for ring around pointmarkers with paletteProvider
+        this.width * DpiHelper_1.DpiHelper.PIXEL_RATIO - 3, this.height * DpiHelper_1.DpiHelper.PIXEL_RATIO - 3, "#00000000", 0, "#ffffffff");
         fillMask.copyTexture();
         return { spriteTexture: spriteTexture, strokeMask: strokeMask, fillMask: fillMask };
     };

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

@@ -14,7 +14,7 @@ export declare const animationHelpers: {
     checkCanDraw: (animationFSM: AnimationFiniteStateMachine) => boolean;
     checkIsAnimationRunning: (animationQueue: IAnimation[], animationFSM: AnimationFiniteStateMachine) => boolean;
     animationUpdate: (animationFSM: SeriesAnimationFiniteStateMachine, timeElapsed: number, beforeAnimationStart: () => void, afterAnimationComplete: () => void, updateAnimationProperties: (progress: number, animationFSM: SeriesAnimationFiniteStateMachine) => void) => void;
-    createPointMarker: (wasmContext: TSciChart, pointMarkerStyle: BasePointMarkerStyle) => CrossPointMarker | EllipsePointMarker | SpritePointMarker | SquarePointMarker | TrianglePointMarker | XPointMarker;
+    createPointMarker: (wasmContext: TSciChart, pointMarkerStyle: BasePointMarkerStyle) => EllipsePointMarker | SpritePointMarker | CrossPointMarker | XPointMarker | SquarePointMarker | TrianglePointMarker;
     interpolateNumber: (from: number, to: number, progress: number) => number;
     interpolateColor: (from: number, to: number, progress: number) => number;
     copyVector: (sourceVector: SCRTDoubleVector, targetVector: SCRTDoubleVector) => void;

package/Charting/Visuals/RenderableSeries/BaseBandRenderableSeries.js

@@ -193,7 +193,6 @@ var BaseBandRenderableSeries = /** @class */ (function (_super) {
             else {
                 this.pointSeries.xRange = rp.xVisibleRange;
             }
-            console.log(rp.resamplingMode);
             var ps = this.pointSeries;
             var ds = this.dataSeries;
             var xValues = ds.getNativeXValues();
@@ -202,7 +201,6 @@ var BaseBandRenderableSeries = /** @class */ (function (_super) {
             var result = this.resamplerHelper.resampleIntoPointSeries(this.webAssemblyContext, rp, xValues, yValues, this.xyyTempPointSeries.intIndexes, undefined, this.xyyTempPointSeries.xValues, this.xyyTempPointSeries.yValues, false);
             this.pointSeries.fifoStartIndex = result.OutputSplitIndex;
             var xySize = this.xyyTempPointSeries.intIndexes.size();
-            console.log(this.xyyTempPointSeries.xValues.size(), xySize);
             this.resamplerHelper.resampleIntoPointSeries(this.webAssemblyContext, rp, xValues, y1Values, this.xyyTempPointSeries.intIndexes, undefined, this.xyyTempPointSeries.xValues, this.xyyTempPointSeries.y1Values);
             // Because intIndexes vector is not cleared indexes for rpLow are appended at the end of rpHigh indexes
             var xy1Size = this.xyyTempPointSeries.intIndexes.size() - xySize;

package/Charting/Visuals/RenderableSeries/BaseRenderableSeries.js

@@ -454,7 +454,8 @@ var BaseRenderableSeries = /** @class */ (function (_super) {
         /** @inheritDoc */
         get: function () {
             var _this = this;
-            return this.parentSurface.xAxes.asArray().find(function (el) { return el.id === _this.xAxisId; });
+            var _a;
+            return (_a = this.parentSurface) === null || _a === void 0 ? void 0 : _a.xAxes.asArray().find(function (el) { return el.id === _this.xAxisId; });
         },
         enumerable: false,
         configurable: true
@@ -463,7 +464,8 @@ var BaseRenderableSeries = /** @class */ (function (_super) {
         /** @inheritDoc */
         get: function () {
             var _this = this;
-            return this.parentSurface.yAxes.asArray().find(function (el) { return el.id === _this.yAxisId; });
+            var _a;
+            return (_a = this.parentSurface) === null || _a === void 0 ? void 0 : _a.yAxes.asArray().find(function (el) { return el.id === _this.yAxisId; });
         },
         enumerable: false,
         configurable: true

package/Charting/Visuals/RenderableSeries/BaseStackedRenderableSeries.js

@@ -76,7 +76,7 @@ var BaseStackedRenderableSeries = /** @class */ (function (_super) {
      * Called when the {@link BaseStackedRenderableSeries} is detached from its parent {@link BaseStackedCollection}
      */
     BaseStackedRenderableSeries.prototype.onDetachFromParentCollection = function () {
-        console.log("onDetachFromParentCollection");
+        // console.log("onDetachFromParentCollection");
         this.parentCollection = undefined;
         this.getParentSurfaceFn = undefined;
         this.notifyParentPropertyChangedFn = undefined;

package/Charting/Visuals/RenderableSeries/DrawingProviders/BaseSeriesDrawingProvider.js

@@ -67,12 +67,14 @@ var BaseSeriesDrawingProvider = /** @class */ (function (_super) {
      * @returns
      */
     BaseSeriesDrawingProvider.prototype.getStartAndCount = function (renderPassData, xValues) {
-        var _a;
+        var _a, _b, _c;
         var pointSeries = renderPassData === null || renderPassData === void 0 ? void 0 : renderPassData.pointSeries;
+        var xAxis = (_a = this.parentSeries) === null || _a === void 0 ? void 0 : _a.xAxis;
+        var shouldClip = (_b = xAxis === null || xAxis === void 0 ? void 0 : xAxis.clipToXRange) !== null && _b !== void 0 ? _b : true; // fo the sake of tests
         var xCount = xValues.size();
         var count = Math.min(pointSeries ? pointSeries.indexes.size() : xCount, xCount);
         var startIndex = 0;
-        if (!(pointSeries === null || pointSeries === void 0 ? void 0 : pointSeries.resampled) && ((_a = renderPassData === null || renderPassData === void 0 ? void 0 : renderPassData.indexRange) === null || _a === void 0 ? void 0 : _a.diff) > 0) {
+        if (shouldClip && !(pointSeries === null || pointSeries === void 0 ? void 0 : pointSeries.resampled) && ((_c = renderPassData === null || renderPassData === void 0 ? void 0 : renderPassData.indexRange) === null || _c === void 0 ? void 0 : _c.diff) > 0) {
             if (renderPassData.indexRange.diff + 1 < count) {
                 startIndex = renderPassData.indexRange.min;
             }
@@ -134,7 +136,7 @@ var BaseSeriesDrawingProvider = /** @class */ (function (_super) {
         }
     };
     BaseSeriesDrawingProvider.prototype.applyStrokeFillPaletting = function (stroke, strokePen, fill, fillBrush, opacity, usePalette, resetPenBrushColors) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         if (usePalette === void 0) { usePalette = false; }
         if (resetPenBrushColors === void 0) { resetPenBrushColors = true; }
         var hasStrokePaletteProvider = this.parentSeries.hasStrokePaletteProvider();
@@ -166,20 +168,15 @@ var BaseSeriesDrawingProvider = /** @class */ (function (_super) {
             var dataSeries = this.parentSeries.dataSeries;
             var renderPassData = this.parentSeries.getCurrentRenderPassData();
             var pointSeries = renderPassData === null || renderPassData === void 0 ? void 0 : renderPassData.pointSeries;
-            var xValues = (_a = pointSeries === null || pointSeries === void 0 ? void 0 : pointSeries.xValues) !== null && _a !== void 0 ? _a : dataSeries.getNativeXValues();
-            var yValues = (_b = pointSeries === null || pointSeries === void 0 ? void 0 : pointSeries.yValues) !== null && _b !== void 0 ? _b : dataSeries.getNativeYValues();
-            var drawCount = pointSeries ? pointSeries.indexes.size() : xValues.size();
-            var indexStart = 0;
-            if (!(pointSeries === null || pointSeries === void 0 ? void 0 : pointSeries.resampled) && ((_c = renderPassData === null || renderPassData === void 0 ? void 0 : renderPassData.indexRange) === null || _c === void 0 ? void 0 : _c.diff) > 0) {
-                drawCount = renderPassData.indexRange.diff + 1;
-                indexStart = renderPassData.indexRange.min;
-            }
+            var xValues = (_a = (pointSeries ? this.xSelector(pointSeries) : undefined)) !== null && _a !== void 0 ? _a : dataSeries.getNativeXValues();
+            var yValues = (_b = (pointSeries ? this.ySelector(pointSeries) : undefined)) !== null && _b !== void 0 ? _b : dataSeries.getNativeYValues();
+            var _f = this.getStartAndCount(renderPassData, xValues), startIndex = _f.startIndex, count = _f.count;
             if (!this.palettingState.palettedColors) {
                 this.palettingState.palettedColors = new this.webAssemblyContext.UIntVector();
             }
             this.palettingState.paletteTextureCache.reset();
             this.palettingState.palettedColors.clear();
-            this.palettingState.palettedColors.reserve(drawCount * 2);
+            this.palettingState.palettedColors.reserve(count * 2);
             // Commented this code out, because I don't know what this code does
             if (resetPenBrushColors) {
                 if (strokePen) {
@@ -203,7 +200,7 @@ var BaseSeriesDrawingProvider = /** @class */ (function (_super) {
             }
             // Override stroke and fill colors
             var hashCode = 0;
-            for (var index = indexStart; index < indexStart + drawCount; index++) {
+            for (var index = startIndex; index < startIndex + count; index++) {
                 var originalDataIndex = pointSeries ? pointSeries.indexes.get(index) : index;
                 if (originalDataIndex < 0)
                     originalDataIndex = 0;
@@ -212,8 +209,8 @@ var BaseSeriesDrawingProvider = /** @class */ (function (_super) {
                 var xValue = xValues.get(index);
                 var yValue = yValues.get(index);
                 var overriddenColors = this.overridePaletteProviderColors(this.parentSeries, xValue, yValue, originalDataIndex, opacity, dataSeries.getMetadataAt(originalDataIndex));
-                var overrideStrokeColor = (_d = overriddenColors.stroke) !== null && _d !== void 0 ? _d : strokeColor;
-                var overrideFillColor = (_e = overriddenColors.fill) !== null && _e !== void 0 ? _e : fillColor;
+                var overrideStrokeColor = (_c = overriddenColors.stroke) !== null && _c !== void 0 ? _c : strokeColor;
+                var overrideFillColor = (_d = overriddenColors.fill) !== null && _d !== void 0 ? _d : fillColor;
                 this.palettingState.palettedColors.push_back(overrideStrokeColor);
                 this.palettingState.palettedColors.push_back(overrideFillColor);
                 hashCode = (0, number_1.numericHashCode)(hashCode, overrideStrokeColor);
@@ -230,7 +227,7 @@ var BaseSeriesDrawingProvider = /** @class */ (function (_super) {
         }
         else {
             this.palettingState.paletteTextureCache.reset();
-            (_f = this.palettingState.palettedColors) === null || _f === void 0 ? void 0 : _f.clear();
+            (_e = this.palettingState.palettedColors) === null || _e === void 0 ? void 0 : _e.clear();
             // This was needed for resetPenBrushColors, therefore commented out as well
             if (strokePen) {
                 if (this.palettingState.originalPenColor) {

package/Charting/Visuals/SciChartSurfaceBase.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocateFile = exports.copyToCanvas = exports.getMasterCanvas = exports.createChartDestination = exports.SciChartSurfaceBase = exports.ESurfaceType = exports.DebugForDpi = void 0;
 var classFactory_1 = require("../../Builder/classFactory");
 var licenseManager2D_1 = require("../../Charting/Visuals/licenseManager2D");
+var licenseManager3D_1 = require("../../Charting3D/Visuals/licenseManager3D");
 var DeletableEntity_1 = require("../../Core/DeletableEntity");
 var Deleter_1 = require("../../Core/Deleter");
 var EventHandler_1 = require("../../Core/EventHandler");
@@ -160,6 +161,8 @@ var SciChartSurfaceBase = /** @class */ (function (_super) {
                 SciChartSurfaceBase.domMasterCanvas = undefined;
             }
         }
+        (0, licenseManager2D_1.forceReapplyLicense2D)();
+        (0, licenseManager3D_1.forceReapplyLicense3D)();
         // try {
         //     if (process.env.NODE_ENV !== "production") {
         //         if (MemoryUsageHelper.isMemoryUsageDebugEnabled) {

package/Charting/Visuals/createMaster.js

@@ -111,6 +111,7 @@ var initializeChartEngine = function () { return __awaiter(void 0, void 0, void
                 WebGlHelper_1.WebGlHelper.initialize();
                 if (!(!sciChartMaster.wasmContext || !sciChartMaster.createChildSurface || !sciChartMaster.getChildSurfaces)) return [3 /*break*/, 2];
                 if (!sciChartMasterPromise) {
+                    (0, licenseManager2D_1.forceReapplyLicense2D)();
                     sciChartMasterPromise = createMaster();
                 }
                 return [4 /*yield*/, sciChartMasterPromise];

package/Charting/Visuals/licenseManager2D.d.ts

@@ -34,6 +34,7 @@ interface ILicenseCookie {
     lastValidated: Date;
 }
 export declare const getLicenseCookie: () => ILicenseCookie;
+export declare const forceReapplyLicense2D: () => void;
 export declare const applyLicense: (licenseContext: TLicenseContext, sciChartSurface: ISciChartSurfaceBase) => void;
 export declare type TLicenseContext = {
     SCRTCredentials: {

package/Charting/Visuals/licenseManager2D.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.licenseManager = exports.updateLicenseDisplay = exports.getLicenseInfo = exports.applyLicense = exports.getLicenseCookie = exports.setCallbacks3D = exports.setUseLicenseWizard = exports.setRuntimeLicenseKey = exports.setLicenseCallback = exports.setIsDebugLicensing = exports.setDependencies = void 0;
+exports.licenseManager = exports.updateLicenseDisplay = exports.getLicenseInfo = exports.applyLicense = exports.forceReapplyLicense2D = exports.getLicenseCookie = exports.setCallbacks3D = exports.setUseLicenseWizard = exports.setRuntimeLicenseKey = exports.setLicenseCallback = exports.setIsDebugLicensing = exports.setDependencies = void 0;
 var app_1 = require("../../constants/app");
 var BuildStamp_1 = require("../../Core/BuildStamp");
 var Dictionary_1 = require("../../Core/Dictionary");
@@ -406,6 +406,10 @@ var dolicenseChallenge = function (licenseContext, sciChartSurface) { return __a
     });
 }); };
 var shouldApplyLicense2D = true;
+var forceReapplyLicense2D = function () {
+    shouldApplyLicense2D = true;
+};
+exports.forceReapplyLicense2D = forceReapplyLicense2D;
 var checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicense;
 // let licenseContext2D: TLicenseContext;
 // let sciChartSurface2D: SciChartSurfaceBase;
@@ -675,11 +679,8 @@ var createLicenseModal = function (message, postFormMessage) {
     closeDiv.innerHTML = "×";
     closeDiv.className = "licenseModalClose";
     modalHeader.appendChild(closeDiv);
-    var modalInfo = document.createElement("div");
-    modalInfo.style.padding = "10px 26px 10px 16px";
-    modalInfo.innerHTML = "<ol><li>If you have not done so already, download the SciChart Cross Platform Licensing Wizard for\n    <a href=\"https://github.com/ABTSoftware/SciChart.LicenseWizard/releases/latest/download/SciChart-Licensing-Wizard.exe\" download> Windows</a> or\n    <a href=\"https://github.com/ABTSoftware/SciChart.LicenseWizard/releases/latest/download/SciChart-Licensing-Wizard.dmg\" download> macOS</a></li>\n    <li>Install it and sign in with your SciChart username and password</li>\n    <li>Start a trial for SciChart Web</li>\n    <li>This web page should pick up your license from the wizard in a few seconds, or refresh the page</li>";
     var buttonLabel = document.createElement("div");
-    modalInfo.innerHTML = "To toggle License debug mode use button below and refresh the page.";
+    buttonLabel.innerHTML = "If you contact support with a licensing issue, we will ask you to send us the license debug log.\n    To toggle License debug mode use the button below and refresh the page, then check the console output.  \n    When copying the log, make sure to start from the beginning, indicated by the reported version number";
     var toggleDebugModeButton = document.createElement("button");
     toggleDebugModeButton.style.margin = "10px";
     var setDebugModeSwitchLabel = function () {
@@ -690,7 +691,6 @@ var createLicenseModal = function (message, postFormMessage) {
         (0, exports.setIsDebugLicensing)(!isDebug, true);
         setDebugModeSwitchLabel();
     };
-    modalContentForm.appendChild(modalInfo);
     modalContentForm.appendChild(buttonLabel);
     modalContentForm.appendChild(toggleDebugModeButton);
     var modalFooter = document.createElement("div");
@@ -842,7 +842,7 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
             return;
         }
         // Update license message text
-        var licensingLink = "<a href=\"https://www.scichart.com/licensing-scichart\"  target=\"_blank\" style=\"color: white\">www.scichart.com/licensing-scichart</a>";
+        var licensingLink = "<a href=\"https://www.scichart.com/licensing-scichart-js\"  target=\"_blank\" style=\"color: white\">www.scichart.com/licensing-scichart-js</a>";
         var contactSupportLink = "<a href=\"https://www.scichart.com/contact-us/\"  target=\"_blank\" style=\"color: orange\">contact support</a>";
         if (licenseType === licensingClasses_1.LicenseType.NoLicense) {
             premsg = "You need to have a license to use SciChart.  ";
@@ -850,7 +850,7 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
         }
         else if (licenseType === licensingClasses_1.LicenseType.Invalid) {
             if (error.startsWith("License is not valid for this domain"))
-                premsg = "Sorry! Your license key is invalid for this domain</br>Please ".concat(contactSupportLink, " with your OrderID if you believe this to be incorrect.");
+                premsg = "Sorry! The runtime license key is not valid for this domain</br>\n                Please ".concat(contactSupportLink, " with your OrderID if you believe this to be incorrect. <u>Click for more information</u></br>\n                For local development, make sure the Licensing Wizard is running and activated.</br>\n                To use Community Edition, remove the call to setRuntimeLicenseKey");
             else if (error.startsWith("This version of SciChart can no longer be trialed"))
                 premsg = "Sorry! This version of SciChart is too old to be trialed.  Please update to the latest version";
             else if (error.startsWith("This version of SciChart can no longer be used for the community edition"))
@@ -902,18 +902,18 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
                 if (licenseType === licensingClasses_1.LicenseType.Community) {
                     (0, Telemetry_1.sendTelemetry)();
                 }
-                chartmsg = "<br>Looking for Licensing Wizard...  <u>Please run it or click for download and installation instructions</u>.";
+                chartmsg = "<br>Looking for Licensing Wizard...";
             }
             else if (checkStatus === licensingClasses_1.LicenseCheckStatus.FailedToFindLicenseWizard)
                 if (licenseManager2dState_1.licenseManager2dState.getIsDev()) {
-                    chartmsg = "<br><u>Could not connect to the Licensing Wizard.  Please run it or click for download and installation instructions, then reload this page.</u>";
+                    chartmsg = "<br><u>Could not connect to the Licensing Wizard.  Please run it, then reload this page.</u>";
                 }
                 else {
                     chartmsg = "<br><u>Could not connect to the server licensing endpoint</u>";
                 }
             else if (checkStatus === licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense)
                 if (licenseManager2dState_1.licenseManager2dState.getIsDev()) {
-                    chartmsg = "<br><u>Trying to validate your license...  Please run the Licensing Wizard or click for download and installation instructions</u>.";
+                    chartmsg = "<br><u>Trying to validate your license...";
                 }
                 else {
                     chartmsg = "<br><u>Trying to validate your license with the server...</u>.";

package/Charting3D/Visuals/createMaster3d.js

@@ -78,6 +78,7 @@ var createMultichart3d = function (divElement, options) { return __awaiter(void
                     !sciChartMaster3D.createChildSurface ||
                     !sciChartMaster3D.getChildSurfaces)) return [3 /*break*/, 3];
                 if (!sciChartMaster3DPromise) {
+                    (0, licenseManager3D_1.forceReapplyLicense3D)();
                     sciChartMaster3DPromise = createMaster();
                 }
                 return [4 /*yield*/, sciChartMaster3DPromise];

package/Charting3D/Visuals/licenseManager3D.d.ts

@@ -1,3 +1,4 @@
 import { TSciChart3D } from "../../types/TSciChart3D";
 import { SciChart3DSurface } from "./SciChart3DSurface";
+export declare const forceReapplyLicense3D: () => void;
 export declare const applyLicense3D: (licenseContext: TSciChart3D, sciChartSurface: SciChart3DSurface, isSingle: boolean) => void;

package/Charting3D/Visuals/licenseManager3D.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyLicense3D = void 0;
+exports.applyLicense3D = exports.forceReapplyLicense3D = void 0;
 var licenseManager2D_1 = require("../../Charting/Visuals/licenseManager2D");
 // tslint:disable: no-console
 var getCallbacks3D = function (licenseContext3D, sciChartSurface) {
@@ -27,6 +27,10 @@ var getCallbacks3D = function (licenseContext3D, sciChartSurface) {
         }
     };
 };
+var forceReapplyLicense3D = function () {
+    shouldApplyLicense3D = true;
+};
+exports.forceReapplyLicense3D = forceReapplyLicense3D;
 var shouldApplyLicense3D = true;
 // let licenseContext3D: TSciChart3D;
 // let sciChartSurface3D: SciChart3DSurface;

package/Core/BuildStamp.d.ts

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

package/Core/BuildStamp.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkBuildStamp = exports.libraryVersion = void 0;
-var buildStamp = "2023-07-28T00:00:00";
+var buildStamp = "2023-08-28T00:00:00";
 var result;
 // tslint:disable-next-line:no-var-requires
-exports.libraryVersion = "3.2.446";
+exports.libraryVersion = "3.2.461";
 var checkBuildStamp = function (wasmContext) {
     if (result !== undefined)
         return result;