scichart 3.2.491 → 3.2.516

package/Charting/Visuals/Axis/AxisBase2D.js

@@ -43,6 +43,7 @@ var Pen2DCache_1 = require("../../Drawing/Pen2DCache");
 var SolidBrushCache_1 = require("../../Drawing/SolidBrushCache");
 var WebGlRenderContext2D_1 = require("../../Drawing/WebGlRenderContext2D");
 var DefaultTickCoordinatesProvider_1 = require("../../Numerics/TickCoordinateProviders/DefaultTickCoordinatesProvider");
+var StaticTickCoordinatesProvider_1 = require("../../Numerics/TickCoordinateProviders/StaticTickCoordinatesProvider");
 var createNativeRect_1 = require("../Helpers/createNativeRect");
 var drawBorder_1 = require("../Helpers/drawBorder");
 var NativeObject_1 = require("../Helpers/NativeObject");
@@ -102,7 +103,7 @@ var AxisBase2D = /** @class */ (function (_super) {
      */
     function AxisBase2D(webAssemblyContext, options) {
         var _this = this;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         _this = _super.call(this, options) || this;
         /**
          * Gets the {@link AxisLayoutState} class which manages layout
@@ -142,6 +143,7 @@ var AxisBase2D = /** @class */ (function (_super) {
         _this.offsetOverrideProperty = undefined;
         _this.tickCache = undefined;
         _this.clipToXRangeProperty = true;
+        _this.isStaticAxisProperty = false;
         _this.webAssemblyContext2D = webAssemblyContext;
         _this.penCacheForMajorGridLines = new Pen2DCache_1.Pen2DCache(webAssemblyContext);
         _this.penCacheForMinorGridLines = new Pen2DCache_1.Pen2DCache(webAssemblyContext);
@@ -156,16 +158,18 @@ var AxisBase2D = /** @class */ (function (_super) {
             (_b = options === null || options === void 0 ? void 0 : options.hideOverlappingLabels) !== null && _b !== void 0 ? _b : _this.axisRenderer.hideOverlappingLabels;
         _this.axisRenderer.axisThickness = (_c = options === null || options === void 0 ? void 0 : options.axisThickness) !== null && _c !== void 0 ? _c : _this.axisRenderer.axisThickness;
         _this.axisTitleRenderer = new AxisTitleRenderer_1.AxisTitleRenderer(webAssemblyContext);
-        _this.tickCoordinatesProvider = new DefaultTickCoordinatesProvider_1.DefaultTickCoordinatesProvider();
-        _this.visibleRangeLimit = (_d = options === null || options === void 0 ? void 0 : options.visibleRangeLimit) !== null && _d !== void 0 ? _d : _this.visibleRangeLimit;
-        _this.visibleRangeSizeLimit = (_e = options === null || options === void 0 ? void 0 : options.visibleRangeSizeLimit) !== null && _e !== void 0 ? _e : _this.visibleRangeSizeLimit;
+        _this.isStaticAxis = (_d = options === null || options === void 0 ? void 0 : options.isStaticAxis) !== null && _d !== void 0 ? _d : _this.isStaticAxisProperty;
+        // setting isStaticAxis sets the tickCoordinatesProvider
+        //this.tickCoordinatesProvider = new DefaultTickCoordinatesProvider();
+        _this.visibleRangeLimit = (_e = options === null || options === void 0 ? void 0 : options.visibleRangeLimit) !== null && _e !== void 0 ? _e : _this.visibleRangeLimit;
+        _this.visibleRangeSizeLimit = (_f = options === null || options === void 0 ? void 0 : options.visibleRangeSizeLimit) !== null && _f !== void 0 ? _f : _this.visibleRangeSizeLimit;
         _this.zoomExtentsRange = (options === null || options === void 0 ? void 0 : options.zoomExtentsToInitialRange) ? _this.visibleRange : options === null || options === void 0 ? void 0 : options.zoomExtentsRange;
-        _this.axisAlignment = (_f = options === null || options === void 0 ? void 0 : options.axisAlignment) !== null && _f !== void 0 ? _f : _this.axisAlignment;
-        _this.axisTitle = (_g = options === null || options === void 0 ? void 0 : options.axisTitle) !== null && _g !== void 0 ? _g : _this.axisTitle;
+        _this.axisAlignment = (_g = options === null || options === void 0 ? void 0 : options.axisAlignment) !== null && _g !== void 0 ? _g : _this.axisAlignment;
+        _this.axisTitle = (_h = options === null || options === void 0 ? void 0 : options.axisTitle) !== null && _h !== void 0 ? _h : _this.axisTitle;
         _this.labelStyle = _this.getlabelStyleProxy(__assign(__assign({}, _this.labelStyle), options === null || options === void 0 ? void 0 : options.labelStyle));
         _this.axisBorder = __assign(__assign({}, _this.axisBorder), options === null || options === void 0 ? void 0 : options.axisBorder);
-        _this.isInnerAxis = (_h = options === null || options === void 0 ? void 0 : options.isInnerAxis) !== null && _h !== void 0 ? _h : _this.isInnerAxis;
-        _this.stackedAxisLength = (_j = options === null || options === void 0 ? void 0 : options.stackedAxisLength) !== null && _j !== void 0 ? _j : _this.stackedAxisLength;
+        _this.isInnerAxis = (_j = options === null || options === void 0 ? void 0 : options.isInnerAxis) !== null && _j !== void 0 ? _j : _this.isInnerAxis;
+        _this.stackedAxisLength = (_k = options === null || options === void 0 ? void 0 : options.stackedAxisLength) !== null && _k !== void 0 ? _k : _this.stackedAxisLength;
         _this.solidBrushCacheBorder = new SolidBrushCache_1.SolidBrushCache(webAssemblyContext);
         if (options === null || options === void 0 ? void 0 : options.labelProvider) {
             if (!("getLabels" in (options === null || options === void 0 ? void 0 : options.labelProvider))) {
@@ -173,9 +177,9 @@ 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.backgroundColor = (_l = options === null || options === void 0 ? void 0 : options.backgroundColor) !== null && _l !== void 0 ? _l : _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;
+        _this.clipToXRangeProperty = (_m = options === null || options === void 0 ? void 0 : options.clipToXRange) !== null && _m !== void 0 ? _m : _this.clipToXRange;
         return _this;
     }
     Object.defineProperty(AxisBase2D.prototype, "labelProvider", {
@@ -595,6 +599,28 @@ var AxisBase2D = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(AxisBase2D.prototype, "isStaticAxis", {
+        /**
+         * Gets whether the gridlines and axis labels keep their initial position when the visible range changes.
+         */
+        get: function () {
+            return this.isStaticAxisProperty;
+        },
+        /**
+         * Sets whether the gridlines and axis labels keep their initial position when the visible range changes.
+         */
+        set: function (value) {
+            this.isStaticAxisProperty = value;
+            if (value) {
+                this.tickCoordinatesProvider = new StaticTickCoordinatesProvider_1.StaticTickCoordinatesProvider();
+            }
+            else {
+                this.tickCoordinatesProvider = new DefaultTickCoordinatesProvider_1.DefaultTickCoordinatesProvider();
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
     /** @inheritDoc */
     AxisBase2D.prototype.applyTheme = function (themeProvider) {
         var previousThemeProvider = this.parentSurface.previousThemeProvider;
@@ -1011,7 +1037,8 @@ var AxisBase2D = /** @class */ (function (_super) {
             // @ts-ignore
             labelProvider: this.labelProvider.toJSON(),
             keepLabelsWithinAxis: this.axisRenderer.keepLabelsWithinAxis,
-            clipToXRange: this.clipToXRange
+            clipToXRange: this.clipToXRange,
+            isStaticAxis: this.isStaticAxis
         };
         return { type: this.type, options: options };
     };
@@ -1207,13 +1234,15 @@ var AxisBase2D = /** @class */ (function (_super) {
                 this.minorDeltaProperty = delta.min;
                 this.majorDeltaProperty = delta.max;
             }
+            // See if tickCoordinatesProvider has cached ticks (if isStaticAxis)
+            var _c = this.tickCoordinatesProvider.getTickCoordinates(undefined, undefined), majorTickCoords = _c.majorTickCoords, minorTickCoords = _c.minorTickCoords, majorTickOverrides = _c.majorTickOverrides, minorTickOverRides = _c.minorTickOverRides;
             var majorTicks = this.drawLabels || this.drawMajorGridLines || this.drawMajorTickLines
-                ? this.tickProvider.getMajorTicks((_a = this.minorDeltaProperty) !== null && _a !== void 0 ? _a : this.majorDeltaProperty / this.minorsPerMajor, this.majorDeltaProperty, this.visibleRange)
+                ? majorTickOverrides !== null && majorTickOverrides !== void 0 ? majorTickOverrides : this.tickProvider.getMajorTicks((_a = this.minorDeltaProperty) !== null && _a !== void 0 ? _a : this.majorDeltaProperty / this.minorsPerMajor, this.majorDeltaProperty, this.visibleRange)
                 : [];
             var minorTicks = this.drawMinorGridLines || this.drawMinorTickLines
-                ? this.tickProvider.getMinorTicks((_b = this.minorDeltaProperty) !== null && _b !== void 0 ? _b : this.majorDeltaProperty / this.minorsPerMajor, this.majorDeltaProperty, this.visibleRange)
+                ? minorTickOverRides !== null && minorTickOverRides !== void 0 ? minorTickOverRides : this.tickProvider.getMinorTicks((_b = this.minorDeltaProperty) !== null && _b !== void 0 ? _b : this.majorDeltaProperty / this.minorsPerMajor, this.majorDeltaProperty, this.visibleRange)
                 : [];
-            var _c = this.visibleRange, min_1 = _c.min, max_1 = _c.max;
+            var _d = this.visibleRange, min_1 = _d.min, max_1 = _d.max;
             majorTicks = majorTicks.filter(function (t) { return t >= min_1 && t <= max_1; });
             minorTicks = minorTicks.filter(function (t) { return t >= min_1 && t <= max_1; });
             var majorTickLabels = [];
@@ -1226,9 +1255,9 @@ var AxisBase2D = /** @class */ (function (_super) {
             this.tickCache = {
                 majorTicks: majorTicks,
                 majorTickLabels: majorTickLabels,
-                majorTickCoords: null,
+                majorTickCoords: majorTickCoords,
                 minorTicks: minorTicks,
-                minorTickCoords: null
+                minorTickCoords: minorTickCoords // probably undefined unless isStaticAxis
             };
         }
         return this.tickCache;
@@ -1237,9 +1266,12 @@ var AxisBase2D = /** @class */ (function (_super) {
         if (!this.tickCache) {
             this.getTicks(true);
         }
-        var _a = this.tickCoordinatesProvider.getTickCoordinates(this.tickCache.majorTicks, this.tickCache.minorTicks), majorTickCoords = _a.majorTickCoords, minorTickCoords = _a.minorTickCoords;
-        this.tickCache.majorTickCoords = majorTickCoords;
-        this.tickCache.minorTickCoords = minorTickCoords;
+        if (this.tickCache.majorTickCoords === undefined) {
+            var _a = this.tickCoordinatesProvider.getTickCoordinates(this.tickCache.majorTicks, this.tickCache.minorTicks), majorTickCoords = _a.majorTickCoords, minorTickCoords = _a.minorTickCoords;
+            // tick values are never overridden at this point.  If they could be, it would have been done in the call from measure.
+            this.tickCache.majorTickCoords = majorTickCoords;
+            this.tickCache.minorTickCoords = minorTickCoords;
+        }
         return this.tickCache;
     };
     AxisBase2D.prototype.applyVisibleRangeLimit = function (visibleRange) {

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

@@ -784,7 +784,7 @@ export declare abstract class AxisCore extends DeletableEntity implements IAxisP
     /**
      * Gets the long dimension of the axis, in pixels
      */
-    protected abstract getAxisSize(): number;
+    abstract getAxisSize(): number;
     /**
      * SET INTERNALLY. Sets whether this axis is an XAxis or not
      * @remarks

package/Charting/Visuals/Axis/DeltaCalculator/LogarithmicDeltaCalculator.d.ts

@@ -11,6 +11,7 @@ export declare class LogarithmicDeltaCalculator extends DeltaCalculator {
      * Gets or sets the logarithmic base. Defaults to 10
      */
     logarithmicBase: number;
+    isHighPrecisionTicks: boolean;
     private webAssemblyContext;
     /**
      * Creates an instance of the {@link LogarithmicDeltaCalculator}

package/Charting/Visuals/Axis/DeltaCalculator/LogarithmicDeltaCalculator.js

@@ -36,6 +36,7 @@ var LogarithmicDeltaCalculator = /** @class */ (function (_super) {
          * Gets or sets the logarithmic base. Defaults to 10
          */
         _this.logarithmicBase = 10;
+        _this.isHighPrecisionTicks = true;
         _this.webAssemblyContext = webAssemblyContext;
         return _this;
     }
@@ -54,10 +55,18 @@ var LogarithmicDeltaCalculator = /** @class */ (function (_super) {
             min = max;
             max = temp;
         }
-        var delta = this.webAssemblyContext.NiceLogScale.CalculateTickSpacing(min, max, this.logarithmicBase, minorsPerMajor, maxTicks);
-        var tsDelta = new NumberRange_1.NumberRange(delta.minD, delta.maxD);
-        delta.delete();
-        return tsDelta;
+        if (this.isHighPrecisionTicks) {
+            var delta = this.webAssemblyContext.NiceLogScale.CalculateTickSpacing(min, max, this.logarithmicBase, minorsPerMajor, maxTicks);
+            var tsDelta = new NumberRange_1.NumberRange(delta.minD, delta.maxD);
+            delta.delete();
+            return tsDelta;
+        }
+        else {
+            var delta = this.webAssemblyContext.NiceLogScale.CalculateLowPrecisionTickSpacing(min, max, this.logarithmicBase, minorsPerMajor, maxTicks);
+            var tsDelta = new NumberRange_1.NumberRange(delta.minD, delta.maxD);
+            delta.delete();
+            return tsDelta;
+        }
     };
     return LogarithmicDeltaCalculator;
 }(DeltaCalculator_1.DeltaCalculator));

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

@@ -1,6 +1,6 @@
 import { NumberRange } from "../../../Core/NumberRange";
 import { EAutoRange } from "../../../types/AutoRange";
-import { TGridLineStyle, TTextStyle, TTickLineStyle } from "./AxisCore";
+import { TAxisTitleStyle, TGridLineStyle, TTickLineStyle } from "./AxisCore";
 /**
  * Optional parameters passed to {@link AxisCore} constructor to set defaults at construction time
  */
@@ -70,7 +70,7 @@ export interface IAxisCoreOptions {
      * @summary Sets the Axis Title style
      * @remarks See {@link TTextStyle} for the type which contains style options
      */
-    axisTitleStyle?: TTextStyle;
+    axisTitleStyle?: TAxisTitleStyle;
     /**
      * The maximum number of ticks on the axis when SciChart's Axis is in {@link AxisCore.autoTicks} mode
      * @remarks

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

@@ -34,6 +34,8 @@ export interface ILogarithmicAxisOptions extends INumericAxisOptions {
      *  the first linear minor tick would be more than 70% of the major tick)
      */
     minorTickMode?: ELogarithmicMinorTickMode;
+    /** If false, only ticks that are whole number multiples of the log base will be used */
+    isHighPrecisionTicks?: boolean;
 }
 /**
  * Creates an instance of a {@link LogarithmicAxis}
@@ -45,6 +47,7 @@ export declare class LogarithmicAxis extends AxisBase2D {
     readonly type = EAxisType.LogarithmicAxis;
     private logBaseProperty;
     private isNegativeProperty;
+    private isHighPrecisionTicksProperty;
     constructor(wasmContext: TSciChart, options?: ILogarithmicAxisOptions);
     /**
      * Gets or sets the Logarithmic Base for the axis. Defaults to 10
@@ -56,6 +59,8 @@ export declare class LogarithmicAxis extends AxisBase2D {
     set logBase(logBase: number);
     get isNegative(): boolean;
     set isNegative(isNegative: boolean);
+    get isHighPrecisionTicks(): boolean;
+    set isHighPrecisionTicks(isHighPrecisionTicks: boolean);
     getDefaultNonZeroRange(): NumberRange;
     hasValidVisibleRange(): boolean;
     get tickProvider(): TickProvider;
@@ -102,5 +107,5 @@ export declare class LogarithmicAxis extends AxisBase2D {
     protected getCurrentCoordinateCalculatorInternal(): CoordinateCalculatorBase;
     protected getMaxXRange(): NumberRange;
     private get logTickProvider();
-    private updateLogarithmicBase;
+    private updateProviders;
 }

package/Charting/Visuals/Axis/LogarithmicAxis.js

@@ -39,10 +39,11 @@ var LogarithmicAxis = /** @class */ (function (_super) {
     __extends(LogarithmicAxis, _super);
     function LogarithmicAxis(wasmContext, options) {
         var _this = this;
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         _this = _super.call(this, wasmContext, options) || this;
         _this.type = AxisType_1.EAxisType.LogarithmicAxis;
         _this.logBaseProperty = 10;
+        _this.isHighPrecisionTicksProperty = true;
         _this.tickProvider = new LogarithmicTickProvider_1.LogarithmicTickProvider(wasmContext);
         _this.deltaCalculator = new LogarithmicDeltaCalculator_1.LogarithmicDeltaCalculator(wasmContext);
         _this.labelProvider =
@@ -52,6 +53,7 @@ var LogarithmicAxis = /** @class */ (function (_super) {
         _this.visibleRange = (options === null || options === void 0 ? void 0 : options.visibleRange) || _this.getDefaultNonZeroRange();
         _this.majorTickMode = (options === null || options === void 0 ? void 0 : options.majorTickMode) || _this.majorTickMode;
         _this.minorTickMode = (options === null || options === void 0 ? void 0 : options.minorTickMode) || _this.minorTickMode;
+        _this.isHighPrecisionTicks = (_d = options === null || options === void 0 ? void 0 : options.isHighPrecisionTicks) !== null && _d !== void 0 ? _d : _this.isHighPrecisionTicksProperty;
         if (options === null || options === void 0 ? void 0 : options.visibleRangeLimit) {
             _this.visibleRangeLimit = options.visibleRangeLimit;
         }
@@ -80,7 +82,7 @@ var LogarithmicAxis = /** @class */ (function (_super) {
             if (this.logBaseProperty !== logBase) {
                 this.logBaseProperty = logBase;
                 this.clearCoordCalcCache();
-                this.updateLogarithmicBase(this.logBase);
+                this.updateProviders();
                 this.notifyPropertyChanged(constants_1.PROPERTY.LOG_BASE);
             }
         },
@@ -104,6 +106,18 @@ var LogarithmicAxis = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(LogarithmicAxis.prototype, "isHighPrecisionTicks", {
+        get: function () {
+            return this.isHighPrecisionTicksProperty;
+        },
+        set: function (isHighPrecisionTicks) {
+            this.isHighPrecisionTicksProperty = isHighPrecisionTicks;
+            this.updateProviders();
+            this.notifyPropertyChanged(constants_1.PROPERTY.HIGH_PRECISION_TICKS);
+        },
+        enumerable: false,
+        configurable: true
+    });
     LogarithmicAxis.prototype.getDefaultNonZeroRange = function () {
         var adj = this.isNegativeProperty ? -1 : 1;
         return new NumberRange_1.NumberRange(adj * Math.pow(this.logBase, -1), adj * Math.pow(this.logBase, 2));
@@ -117,7 +131,7 @@ var LogarithmicAxis = /** @class */ (function (_super) {
         },
         set: function (tickProvider) {
             this.tickProviderProperty = tickProvider;
-            this.updateLogarithmicBase(this.logBase);
+            this.updateProviders();
             this.notifyPropertyChanged(constants_1.PROPERTY.TICK_PROVIDER);
         },
         enumerable: false,
@@ -129,7 +143,7 @@ var LogarithmicAxis = /** @class */ (function (_super) {
         },
         set: function (deltaCalculator) {
             this.deltaCalculatorProperty = deltaCalculator;
-            this.updateLogarithmicBase(this.logBase);
+            this.updateProviders();
             this.notifyPropertyChanged(constants_1.PROPERTY.DELTA_CALCULATOR);
         },
         enumerable: false,
@@ -141,7 +155,7 @@ var LogarithmicAxis = /** @class */ (function (_super) {
         },
         set: function (labelProvider) {
             this.labelProviderProperty = labelProvider;
-            this.updateLogarithmicBase(this.logBase);
+            this.updateProviders();
             this.notifyPropertyChanged(constants_1.PROPERTY.LABEL_PROVIDER);
         },
         enumerable: false,
@@ -268,7 +282,8 @@ var LogarithmicAxis = /** @class */ (function (_super) {
             logBase: this.logBase,
             isNegative: this.isNegative,
             majorTickMode: this.majorTickMode,
-            minorTickMode: this.minorTickMode
+            minorTickMode: this.minorTickMode,
+            isHighPrecisionTicks: this.isHighPrecisionTicks
         };
         Object.assign(json.options, options);
         return json;
@@ -300,18 +315,20 @@ var LogarithmicAxis = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    LogarithmicAxis.prototype.updateLogarithmicBase = function (logBase) {
+    LogarithmicAxis.prototype.updateProviders = function () {
         var logTickProvider = this.tickProvider;
         if (logTickProvider) {
-            logTickProvider.logarithmicBase = logBase;
+            logTickProvider.logarithmicBase = this.logBase;
+            logTickProvider.isHighPrecisionTicks = this.isHighPrecisionTicks;
         }
         var logDeltaCalculator = this.deltaCalculator;
         if (logDeltaCalculator) {
-            logDeltaCalculator.logarithmicBase = logBase;
+            logDeltaCalculator.logarithmicBase = this.logBase;
+            logDeltaCalculator.isHighPrecisionTicks = this.isHighPrecisionTicks;
         }
         var logLabelProvider = this.labelProvider;
         if (logLabelProvider) {
-            logLabelProvider.logarithmicBase = logBase;
+            logLabelProvider.logarithmicBase = this.logBase;
         }
     };
     return LogarithmicAxis;

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

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

package/Charting/Visuals/Axis/constants.js

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

package/Charting/Visuals/Helpers/createPen.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSCRTPen = void 0;
 var app_1 = require("../../../constants/app");
+var MemoryUsageHelper_1 = require("../../../utils/MemoryUsageHelper");
 var colorUtil_1 = require("../../../utils/colorUtil");
 var parseColor_1 = require("../../../utils/parseColor");
 /**
@@ -27,6 +28,13 @@ var createSCRTPen = function (wasmContext, htmlColorCode, strokeThickness, opaci
     if (strokeDashArray && strokeDashArray.length) {
         // Create a dashed pen
         var strokeDashFloatVector_1 = new wasmContext.FloatVector();
+        if (process.env.NODE_ENV !== "production") {
+            // prevent unnecessary warning
+            if (MemoryUsageHelper_1.MemoryUsageHelper.isMemoryUsageDebugEnabled) {
+                var vectorId = MemoryUsageHelper_1.MemoryUsageHelper.objectRegistry.getObjectId(strokeDashFloatVector_1);
+                MemoryUsageHelper_1.MemoryUsageHelper.unregister(vectorId);
+            }
+        }
         strokeDashArray.forEach(function (item) { return strokeDashFloatVector_1.push_back(item); });
         return wasmContext.SCRTCreateDahedPen(colorArgb, strokeThickness, antiAliased, strokeDashFloatVector_1);
     }

package/Charting/Visuals/Legend/SciChartLegendBase.d.ts

@@ -235,4 +235,4 @@ export declare abstract class SciChartLegendBase extends DeletableEntity impleme
     protected getParentDiv(): HTMLDivElement;
 }
 export declare const getLegendItemHtml: (orientation: ELegendOrientation, showCheckboxes: boolean, showSeriesMarkers: boolean, item: TLegendItem) => string;
-export declare const getLegendContainerHtml: (placement: ELegendPlacement, textColor: string, backgroundColor: string, margin: Thickness, body: string) => string;
+export declare const getLegendContainerHtml: (placement: ELegendPlacement, textColor: string, backgroundColor: string, margin: Thickness, body: string, isExternal?: boolean) => string;

package/Charting/Visuals/Legend/SciChartLegendBase.js

@@ -297,7 +297,7 @@ var SciChartLegendBase = /** @class */ (function (_super) {
             var _a;
             return (prev + _this.getLegendItemHTML(orientation, showCheckboxes, (_a = curr.showMarker) !== null && _a !== void 0 ? _a : showSeriesMarkers, curr));
         }, "");
-        return (0, exports.getLegendContainerHtml)(placement, textColor, backgroundColor, margin, body);
+        return (0, exports.getLegendContainerHtml)(placement, textColor, backgroundColor, margin, body, this.isExternal());
     };
     /**
      * Gets HTML string for legend items
@@ -368,11 +368,16 @@ var getLegendItemHtml = function (orientation, showCheckboxes, showSeriesMarkers
     return str;
 };
 exports.getLegendItemHtml = getLegendItemHtml;
-var getLegendContainerHtml = function (placement, textColor, backgroundColor, margin, body) {
+var getLegendContainerHtml = function (placement, textColor, backgroundColor, margin, body, isExternal) {
+    if (isExternal === void 0) { isExternal = false; }
     if (!body)
         return "";
     //const float = [ELegendPlacement.TopLeft, ELegendPlacement.BottomLeft].includes(placement) ? "left" : "right";
+    var position = "";
     var positionStyle = "";
+    if (!isExternal) {
+        position = "position: absolute;";
+    }
     if (placement === ELegendPlacement.TopLeft) {
         positionStyle = "left: 0; top: 0;";
     }
@@ -385,7 +390,7 @@ var getLegendContainerHtml = function (placement, textColor, backgroundColor, ma
     else if (placement === ELegendPlacement.BottomRight) {
         positionStyle = "right: 0; bottom: 0;";
     }
-    var htmlStr = "<div class=\"scichart__legend\" style=\"height: 100%; position: absolute; display: flex; ".concat(positionStyle, " text-align: center;\">");
+    var htmlStr = "<div class=\"scichart__legend\" style=\"height: 100%; ".concat(position, " display: flex; ").concat(positionStyle, " text-align: center;\">");
     var alignSelf = [ELegendPlacement.TopLeft, ELegendPlacement.TopRight].includes(placement)
         ? "flex-start"
         : "flex-end";

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

@@ -91,6 +91,7 @@ export declare abstract class BaseRenderableSeries extends DeletableEntity imple
     private isHoveredProperty;
     private resamplingModeProperty;
     private resamplingPrecisionProperty;
+    private clipToYRangeProperty;
     /**
      * Creates an instance of the {@link BaseRenderableSeries}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
@@ -186,6 +187,12 @@ export declare abstract class BaseRenderableSeries extends DeletableEntity imple
      */
     get resamplingPrecision(): number;
     set resamplingPrecision(value: number);
+    /**
+     * If true, the drawing will be clipped to the visibleRange of the associated Y Axis.
+     * This is only really relevant if you are using Stacked Y Axes and do not want the series to be drawn outside that axis range
+     */
+    get clipToYRange(): boolean;
+    set clipToYRange(value: boolean);
     /** @inheritDoc */
     get isSpline(): boolean;
     /** @inheritDoc */

package/Charting/Visuals/RenderableSeries/BaseRenderableSeries.js

@@ -50,6 +50,7 @@ var SeriesHoveredArgs_1 = require("./SeriesHoveredArgs");
 var SeriesSelectedArgs_1 = require("./SeriesSelectedArgs");
 var SeriesVisibleChangedArgs_1 = require("./SeriesVisibleChangedArgs");
 var DataLabelProviderType_1 = require("../../../types/DataLabelProviderType");
+var Rect_1 = require("../../../Core/Rect");
 var DeletableEntity_1 = require("../../../Core/DeletableEntity");
 var XyzSeriesInfo_1 = require("../../Model/ChartData/XyzSeriesInfo");
 /**
@@ -72,7 +73,7 @@ var BaseRenderableSeries = /** @class */ (function (_super) {
      */
     function BaseRenderableSeries(webAssemblyContext, options) {
         var _this = this;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         _this = _super.call(this) || this;
         /** @inheritDoc */
         _this.rolloverModifierProps = new RolloverModifierRenderableSeriesProps_1.RolloverModifierRenderableSeriesProps(_this);
@@ -99,6 +100,7 @@ var BaseRenderableSeries = /** @class */ (function (_super) {
         _this.isDigitalLineProperty = false;
         _this.resamplingModeProperty = ResamplingMode_1.EResamplingMode.Auto;
         _this.resamplingPrecisionProperty = 0;
+        _this.clipToYRangeProperty = false;
         _this.isStacked = false;
         _this.webAssemblyContext = webAssemblyContext;
         _this.id = (_a = options === null || options === void 0 ? void 0 : options.id) !== null && _a !== void 0 ? _a : (0, guid_1.generateGuid)();
@@ -155,6 +157,7 @@ var BaseRenderableSeries = /** @class */ (function (_super) {
         _this.hitTestProvider = _this.newHitTestProvider();
         _this.isSelected = (_q = options === null || options === void 0 ? void 0 : options.isSelected) !== null && _q !== void 0 ? _q : false;
         _this.isHovered = (_r = options === null || options === void 0 ? void 0 : options.isHovered) !== null && _r !== void 0 ? _r : false;
+        _this.clipToYRangeProperty = (_s = options === null || options === void 0 ? void 0 : options.clipToYRange) !== null && _s !== void 0 ? _s : _this.clipToYRangeProperty;
         if (options === null || options === void 0 ? void 0 : options.onIsVisibleChanged) {
             if (typeof options.onIsVisibleChanged === "string") {
                 _this.typeMap.set("onIsVisibleChanged", options.onIsVisibleChanged);
@@ -563,6 +566,23 @@ var BaseRenderableSeries = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(BaseRenderableSeries.prototype, "clipToYRange", {
+        /**
+         * If true, the drawing will be clipped to the visibleRange of the associated Y Axis.
+         * This is only really relevant if you are using Stacked Y Axes and do not want the series to be drawn outside that axis range
+         */
+        get: function () {
+            return this.clipToYRangeProperty;
+        },
+        set: function (value) {
+            if (this.clipToYRangeProperty !== value) {
+                this.clipToYRangeProperty = value;
+                this.notifyPropertyChanged(constants_1.PROPERTY.CLIPTOYRANGE);
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(BaseRenderableSeries.prototype, "isSpline", {
         /** @inheritDoc */
         get: function () {
@@ -573,29 +593,33 @@ var BaseRenderableSeries = /** @class */ (function (_super) {
     });
     /** @inheritDoc */
     BaseRenderableSeries.prototype.draw = function (renderContext, renderPassData) {
-        var _a;
+        var _a, _b;
         this.currentRenderPassData = renderPassData;
         (_a = this.hitTestProvider) === null || _a === void 0 ? void 0 : _a.update(renderPassData);
         if (this.canDraw) {
-            // const nativeContext = renderContext.getNativeContext();
-            // const viewRect = this.parentSurface.seriesViewRect;
+            var nativeContext = renderContext.getNativeContext();
+            var viewRect = (_b = this.parentSurface) === null || _b === void 0 ? void 0 : _b.seriesViewRect;
             try {
                 renderContext.pushShaderEffect(this.effect);
-                // This is prep for clipping series to the axis range.  Need to add an option to AxisBase to drive it.
-                // need to handle case where clipping is only set for one axis
-                // const { offset: x, viewportDimension: width } = renderPassData.xCoordinateCalculator;
-                // const { offset: y, viewportDimension: height } = renderPassData.yCoordinateCalculator;
-                // if (renderPassData.isVerticalChart) {
-                //     const clipRect = new Rect(viewRect.x + y, viewRect.y + x, height, width);
-                //     nativeContext.SetClipRect(clipRect.x, clipRect.y, clipRect.width, clipRect.height);
-                // } else {
-                //     const clipRect = new Rect(viewRect.x + x, viewRect.y + y, width, height);
-                //     nativeContext.SetClipRect(clipRect.x, clipRect.y, clipRect.width, clipRect.height);
-                // }
+                if (this.clipToYRange) {
+                    var _c = renderPassData.xCoordinateCalculator, x = _c.offset, width = _c.viewportDimension;
+                    var _d = renderPassData.yCoordinateCalculator, y = _d.offset, height = _d.viewportDimension;
+                    if (renderPassData.isVerticalChart) {
+                        var clipRect = new Rect_1.Rect(viewRect.x + y, viewRect.y + x, height, width);
+                        nativeContext.SetClipRect(clipRect.x, clipRect.y, clipRect.width, clipRect.height);
+                    }
+                    else {
+                        var clipRect = new Rect_1.Rect(viewRect.x + x, viewRect.y + y, width, height);
+                        nativeContext.SetClipRect(clipRect.x, clipRect.y, clipRect.width, clipRect.height);
+                    }
+                }
                 this.drawingProviders.forEach(function (dp) { return dp.draw(renderContext, renderPassData); });
             }
             finally {
-                //nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
+                if (this.clipToYRange) {
+                    // Reset clip rect
+                    nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
+                }
                 renderContext.popShaderEffect();
             }
             if (this.dataLabelProvider) {
@@ -774,6 +798,7 @@ var BaseRenderableSeries = /** @class */ (function (_super) {
             animation: this.animation,
             resamplingMode: this.resamplingMode,
             resamplingPrecision: this.resamplingPrecision,
+            clipToYRange: this.clipToYRange,
             // @ts-ignore
             dataLabelProvider: (_c = this.dataLabelProvider) === null || _c === void 0 ? void 0 : _c.toJSON()
             // onSelectedChanged: this.onSelectedChanged

package/Charting/Visuals/RenderableSeries/DataLabels/DataLabelProvider.js

@@ -271,7 +271,7 @@ var DataLabelProvider = /** @class */ (function (_super) {
         var firstlabel = this.getText(state);
         var bounds = (0, NativeObject_1.getTextBounds)(this.webAssemblyContext);
         state.font.CalculateStringBounds(firstlabel !== null && firstlabel !== void 0 ? firstlabel : "", bounds, (_b = (_a = this.style) === null || _a === void 0 ? void 0 : _a.lineSpacing) !== null && _b !== void 0 ? _b : 2);
-        return state.pointGap > bounds.m_fWidth * this.pointGapThreshold;
+        return state.pointGap >= bounds.m_fWidth * this.pointGapThreshold;
     };
     DataLabelProvider.prototype.getPosition = function (state, textBounds) {
         var _a, _b, _c, _d, _e, _f, _g, _h;

package/Charting/Visuals/RenderableSeries/DataLabels/DataLabelState.js

@@ -30,7 +30,7 @@ var DataLabelState = /** @class */ (function () {
             var indicesRange = this.parentSeries.getIndicesRange(new NumberRange_1.NumberRange(renderPassData.xCoordinateCalculator.visibleMin, renderPassData.xCoordinateCalculator.visibleMax), isCategoryAxis);
             this.indexStart = indicesRange.min;
             this.indexEnd = indicesRange.max;
-            this.pointCount = indicesRange.diff + 1;
+            this.pointCount = renderPassData.indexRange.diff + 1;
             if (this.pointCount > 1) {
                 this.pointGap = renderPassData.isVerticalChart
                     ? Math.abs(this.yCoord(this.indexStart) - this.yCoord(this.indexEnd)) / this.pointCount
@@ -40,9 +40,9 @@ var DataLabelState = /** @class */ (function () {
                 this.pointGap = Infinity; // Single point
         }
         else {
-            this.indexStart = renderPassData.indexRange.min;
-            this.pointCount = renderPassData.indexRange.diff + 1;
-            this.indexEnd = renderPassData.indexRange.max;
+            this.indexStart = pointSeries.resampled ? 0 : renderPassData.indexRange.min;
+            this.pointCount = pointSeries.resampled ? pointSeries.count : renderPassData.indexRange.diff + 1;
+            this.indexEnd = pointSeries.resampled ? pointSeries.count - 1 : renderPassData.indexRange.max;
             if (this.pointCount > 1) {
                 this.pointGap = renderPassData.isVerticalChart
                     ? Math.abs(this.yCoord(this.indexStart) - this.yCoord(this.indexEnd)) / this.pointCount

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

@@ -180,4 +180,9 @@ export interface IBaseRenderableSeriesOptions {
      * A {@link SeriesTextProvider} used for creating and drawing per-point text.
      */
     dataLabelProvider?: BaseDataLabelProvider | TDataLabelProviderDefinition;
+    /**
+     * If true, the drawing will be clipped to the visibleRange of the associated Y Axis.
+     * This is only really relevant if you are using Stacked Y Axes and do not want the series to be drawn outside that axis range
+     */
+    clipToYRange?: boolean;
 }