scichart 2.1.2294 → 2.2.2378

package/Charting/Visuals/Axis/LabelProvider/PieLabelProvider.js

@@ -0,0 +1,82 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PieLabelProvider = void 0;
+var LabelProviderType_1 = require("../../../../types/LabelProviderType");
+var NumericFormat_1 = require("../../../../types/NumericFormat");
+var number_1 = require("../../../../utils/number");
+var SciChartPieSurface_1 = require("../../SciChartPieSurface/SciChartPieSurface");
+var LabelProvider_1 = require("./LabelProvider");
+/**
+ * @summary A Label Provider for use with Pie Charts to allow customizing of segment labels
+ * To completely customise the label output, override {@link getSegmentText}
+ * To just adjust the numeric formatting of the label, use numericformat, precision, prefix, postfix, or override {@link formatLabel}
+ */
+var PieLabelProvider = /** @class */ (function (_super) {
+    __extends(PieLabelProvider, _super);
+    function PieLabelProvider(options) {
+        var _a, _b;
+        var _this = _super.call(this, __assign({ labelFormat: (_a = options === null || options === void 0 ? void 0 : options.labelFormat) !== null && _a !== void 0 ? _a : NumericFormat_1.ENumericFormat.Decimal, labelPrecision: (_b = options === null || options === void 0 ? void 0 : options.labelPrecision) !== null && _b !== void 0 ? _b : 2 }, options)) || this;
+        _this.type = LabelProviderType_1.ELabelProviderType.Pie;
+        _this.formatLabelProperty = function (dataValue) {
+            return _this.applyFormat((0, number_1.formatNumber)(dataValue, _this.numericFormat, _this.precision)) +
+                (_this.parentSurface.valueMode === SciChartPieSurface_1.EPieValueMode.Percentage ? " %" : "");
+        };
+        return _this;
+    }
+    /**
+     * Get the text to be used as the segmet label. This picks the raw value, or percentage depending on the chart's valueMode
+     * then formats it using the {@link formatLabel} function.
+     * @param segment The PieSegment to get a label for
+     * @param total Total of all pieSegment values
+     */
+    PieLabelProvider.prototype.getSegmentText = function (segment, total) {
+        var labelValue = this.parentSurface.valueMode === SciChartPieSurface_1.EPieValueMode.Percentage ? segment.getPercentage(total) : segment.value;
+        return this.formatLabel(labelValue);
+    };
+    /**
+     * Called when the {@link LabelProvider} is attached to an {@link SciChartPieSurface }
+     * @param pieSurface The SciPieSurface we are attached to.
+     */
+    PieLabelProvider.prototype.attachedToSurface = function (pieSurface) {
+        this.parentSurface = pieSurface;
+    };
+    /**
+     * @inheritDoc
+     */
+    PieLabelProvider.prototype.onBeginAxisDraw = function () {
+        // TODO: user can override here if they want
+    };
+    PieLabelProvider.prototype.invalidateParent = function () {
+        if (this.parentSurface && this.parentSurface.invalidateElement) {
+            this.parentSurface.invalidateElement();
+        }
+    };
+    return PieLabelProvider;
+}(LabelProvider_1.LabelProvider));
+exports.PieLabelProvider = PieLabelProvider;

package/Charting/Visuals/Axis/LabelProvider/SmartDateLabelProvider.d.ts

@@ -1,6 +1,6 @@
 import { ELabelProviderType } from "../../../../types/LabelProviderType";
 import { ENumericFormat } from "../../../../types/NumericFormat";
-import { LabelProviderBase2D } from "./LabelProviderBase2D";
+import { LabelProviderBase2D, ILabel2DOptions } from "./LabelProviderBase2D";
 /**
  * The {@link SmartDateLabelProvider} formats Axis Labels and Cursor / Tooltips for {@link NumericAxis} types
  */
@@ -9,7 +9,7 @@ export declare class SmartDateLabelProvider extends LabelProviderBase2D {
     /**
      * Creates an instance of {@link SmartDateLabelProvider}
      */
-    constructor();
+    constructor(options?: ILabel2DOptions);
     /**
      * @inheritDoc
      */

package/Charting/Visuals/Axis/LabelProvider/SmartDateLabelProvider.js

@@ -14,6 +14,17 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SmartDateLabelProvider = void 0;
 var LabelProviderType_1 = require("../../../../types/LabelProviderType");
@@ -24,6 +35,8 @@ var LabelCache_1 = require("./LabelCache");
 var LabelProviderBase2D_1 = require("./LabelProviderBase2D");
 var ETradeChartLabelFormat;
 (function (ETradeChartLabelFormat) {
+    // Apr 25 ... 04:01:45 ... 02:02:30
+    ETradeChartLabelFormat["Seconds"] = "Seconds";
     // Apr 25 ... 01:34 ... 02:24
     ETradeChartLabelFormat["Minutes"] = "Minutes";
     // Apr ... 08 ... 13
@@ -31,6 +44,7 @@ var ETradeChartLabelFormat;
     // 2020 ... Jan ... Feb
     ETradeChartLabelFormat["Months"] = "Months";
 })(ETradeChartLabelFormat || (ETradeChartLabelFormat = {}));
+var ONE_HOUR = 60 * 60;
 var FIVE_DAYS = 60 * 60 * 24 * 5;
 var FIFTY_DAYS = 60 * 60 * 24 * 50;
 /**
@@ -41,11 +55,17 @@ var SmartDateLabelProvider = /** @class */ (function (_super) {
     /**
      * Creates an instance of {@link SmartDateLabelProvider}
      */
-    function SmartDateLabelProvider() {
-        var _this = _super.call(this) || this;
+    function SmartDateLabelProvider(options) {
+        var _a, _b;
+        var _this = _super.call(this, __assign({ labelFormat: (_a = options === null || options === void 0 ? void 0 : options.labelFormat) !== null && _a !== void 0 ? _a : NumericFormat_1.ENumericFormat.Date_DDMMYYYY, cursorLabelFormat: (_b = options === null || options === void 0 ? void 0 : options.cursorLabelFormat) !== null && _b !== void 0 ? _b : NumericFormat_1.ENumericFormat.Date_DDMMYYYY }, options)) || this;
         _this.type = LabelProviderType_1.ELabelProviderType.SmartDate;
-        _this.formatLabelProperty = function (dataValue) { return (0, number_1.formatNumber)(dataValue, NumericFormat_1.ENumericFormat.Date_DDMMYYYY, 0); };
-        _this.formatCursorLabelProperty = _this.formatLabelProperty;
+        _this.formatLabelProperty = function (dataValue) {
+            return _this.applyFormat((0, number_1.formatNumber)(dataValue, _this.numericFormat, _this.precision));
+        };
+        _this.formatCursorLabelProperty = function (dataValue) {
+            var _a, _b;
+            return _this.applyFormat((0, number_1.formatNumber)(dataValue, (_a = _this.cursorNumericFormat) !== null && _a !== void 0 ? _a : _this.numericFormat, (_b = _this.cursorPrecision) !== null && _b !== void 0 ? _b : _this.precision));
+        };
         return _this;
     }
     /**
@@ -105,7 +125,10 @@ var SmartDateLabelProvider = /** @class */ (function (_super) {
         configurable: true
     });
     SmartDateLabelProvider.prototype.getTradeChartLabelFormat = function (timeRange, ticksNumber) {
-        if (timeRange <= FIVE_DAYS) {
+        if (timeRange <= ONE_HOUR) {
+            return ETradeChartLabelFormat.Seconds;
+        }
+        else if (timeRange <= FIVE_DAYS) {
             return ETradeChartLabelFormat.Minutes;
         }
         else if (timeRange <= FIFTY_DAYS) {
@@ -116,7 +139,17 @@ var SmartDateLabelProvider = /** @class */ (function (_super) {
         }
     };
     SmartDateLabelProvider.prototype.formatTradeChartLabel = function (tradeChartLabelFormat, value, prevValue, prevPrevValue) {
-        if (tradeChartLabelFormat === ETradeChartLabelFormat.Minutes) {
+        if (tradeChartLabelFormat === ETradeChartLabelFormat.Seconds) {
+            var newDate = prevValue === undefined ||
+                (0, date_1.formatUnixDateToHumanStringMMMDD)(value) !== (0, date_1.formatUnixDateToHumanStringMMMDD)(prevValue);
+            if (newDate) {
+                return (0, date_1.formatUnixDateToHumanStringMMMDD)(value);
+            }
+            else {
+                return (0, date_1.formatUnixDateToHumanStringHHMMSS)(value);
+            }
+        }
+        else if (tradeChartLabelFormat === ETradeChartLabelFormat.Minutes) {
             var newDate = prevValue === undefined ||
                 (0, date_1.formatUnixDateToHumanStringMMMDD)(value) !== (0, date_1.formatUnixDateToHumanStringMMMDD)(prevValue);
             if (newDate) {

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

@@ -10,6 +10,7 @@ import { AxisBase2D } from "./AxisBase2D";
 import { DeltaCalculator } from "./DeltaCalculator/DeltaCalculator";
 import { LabelProviderBase2D } from "./LabelProvider/LabelProviderBase2D";
 import { INumericAxisOptions } from "./NumericAxis";
+export declare const MIN_LOG_AXIS_VALUE = 1e-10;
 export interface ILogarithmicAxisOptions extends INumericAxisOptions {
     /**
      * The Logarithmic Base for the axis. Defaults to 10

package/Charting/Visuals/Axis/LogarithmicAxis.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogarithmicAxis = void 0;
+exports.LogarithmicAxis = exports.MIN_LOG_AXIS_VALUE = void 0;
 var EasingFunctions_1 = require("../../../Core/Animations/EasingFunctions");
 var NumberRangeAnimator_1 = require("../../../Core/Animations/NumberRangeAnimator");
 var NumberRange_1 = require("../../../Core/NumberRange");
@@ -27,6 +27,8 @@ var AxisBase2D_1 = require("./AxisBase2D");
 var constants_1 = require("./constants");
 var LogarithmicDeltaCalculator_1 = require("./DeltaCalculator/LogarithmicDeltaCalculator");
 var LogarithmicLabelProvider_1 = require("./LabelProvider/LogarithmicLabelProvider");
+// TODO probably find better value, e.g. check if it works with Number.MIN_VALUE
+exports.MIN_LOG_AXIS_VALUE = 0.0000000001;
 /**
  * Creates an instance of a {@link LogarithmicAxis}
  * @param webAssemblyContext The {@link TSciChart | SciChart 2D WebAssembly Context} containing native methods and
@@ -55,10 +57,10 @@ var LogarithmicAxis = /** @class */ (function (_super) {
         else {
             // Log axis can be positive or negative, but not both.
             if (_this.isNegativeProperty) {
-                _this.visibleRangeLimit = new NumberRange_1.NumberRange(-Infinity, -0.0000000001);
+                _this.visibleRangeLimit = new NumberRange_1.NumberRange(-Infinity, -exports.MIN_LOG_AXIS_VALUE);
             }
             else {
-                _this.visibleRangeLimit = new NumberRange_1.NumberRange(0.0000000001, Infinity);
+                _this.visibleRangeLimit = new NumberRange_1.NumberRange(exports.MIN_LOG_AXIS_VALUE, Infinity);
             }
         }
         return _this;

package/Charting/Visuals/Helpers/NativeObject.d.ts

@@ -0,0 +1,13 @@
+import { IDeletable } from "../../../Core/IDeletable";
+import { SCRTColorVertex, SCRTRectVertex, TSciChart, VectorColorVertex, VectorRectVertex } from "../../../types/TSciChart";
+export declare const freeCache: (wasmContext: TSciChart) => IDeletable;
+/**
+ * Returns an empty vector of Rectangles
+ * @param wasmContext
+ * @param maxSize
+ * @returns
+ */
+export declare const getVectorRectVertex: (wasmContext: TSciChart, maxSize?: number) => VectorRectVertex;
+export declare const getVectorColorVertex: (wasmContext: TSciChart, maxSize?: number) => VectorColorVertex;
+export declare const getVertex: (wasmContext: TSciChart, x: number, y: number) => SCRTColorVertex;
+export declare const getNativeRect: (wasmContext: TSciChart, xTopLeft: number, yTopLeft: number, xBottomRight: number, yBottomRight: number) => SCRTRectVertex;

package/Charting/Visuals/Helpers/NativeObject.js

@@ -0,0 +1,101 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNativeRect = exports.getVertex = exports.getVectorColorVertex = exports.getVectorRectVertex = exports.freeCache = void 0;
+var Deleter_1 = require("../../../Core/Deleter");
+var objectCache = new Map();
+var getCache = function (wasmContext) {
+    if (!wasmContext.canvas)
+        return undefined;
+    var canvasId = wasmContext.canvas.id;
+    if (!objectCache.has(canvasId)) {
+        objectCache.set(canvasId, {
+            vecRects: undefined,
+            vecColorVertex: undefined,
+            vertex: undefined,
+            rect: undefined
+        });
+    }
+    return objectCache.get(canvasId);
+};
+var freeCache = function (wasmContext) {
+    return {
+        delete: function () {
+            if (!wasmContext.canvas)
+                return;
+            var canvasId = wasmContext.canvas.id;
+            var cache = objectCache.get(canvasId);
+            if (cache) {
+                (0, Deleter_1.deleteSafe)(cache.vecRects);
+                (0, Deleter_1.deleteSafe)(cache.vecColorVertex);
+                (0, Deleter_1.deleteSafe)(cache.vertex);
+                (0, Deleter_1.deleteSafe)(cache.rect);
+            }
+            objectCache.delete(canvasId);
+        }
+    };
+};
+exports.freeCache = freeCache;
+/**
+ * Returns an empty vector of Rectangles
+ * @param wasmContext
+ * @param maxSize
+ * @returns
+ */
+var getVectorRectVertex = function (wasmContext, maxSize) {
+    if (maxSize === void 0) { maxSize = 100; }
+    var cache = getCache(wasmContext);
+    if (!cache)
+        return undefined;
+    var vecRects = cache.vecRects;
+    if (!vecRects) {
+        vecRects = new wasmContext.VectorRectVertex();
+        vecRects.reserve(maxSize);
+        cache.vecRects = vecRects;
+    }
+    vecRects.clear();
+    return vecRects;
+};
+exports.getVectorRectVertex = getVectorRectVertex;
+var getVectorColorVertex = function (wasmContext, maxSize) {
+    if (maxSize === void 0) { maxSize = 100; }
+    var cache = getCache(wasmContext);
+    if (!cache)
+        return undefined;
+    var vecColorVertex = cache.vecColorVertex;
+    if (!vecColorVertex) {
+        vecColorVertex = new wasmContext.VectorColorVertex();
+        vecColorVertex.reserve(maxSize);
+        cache.vecColorVertex = vecColorVertex;
+    }
+    vecColorVertex.clear();
+    return vecColorVertex;
+};
+exports.getVectorColorVertex = getVectorColorVertex;
+var getVertex = function (wasmContext, x, y) {
+    var cache = getCache(wasmContext);
+    if (!cache)
+        return undefined;
+    var vertex = cache.vertex;
+    if (!vertex) {
+        vertex = new wasmContext.SCRTColorVertex(x, y);
+        cache.vertex = vertex;
+    }
+    else {
+        vertex.SetPosition(x, y);
+    }
+    return vertex;
+};
+exports.getVertex = getVertex;
+var getNativeRect = function (wasmContext, xTopLeft, yTopLeft, xBottomRight, yBottomRight) {
+    var cache = getCache(wasmContext);
+    var rect = cache.rect;
+    if (!rect) {
+        rect = new wasmContext.SCRTRectVertex(xTopLeft, yTopLeft, xBottomRight - xTopLeft, yBottomRight - yTopLeft);
+        cache.rect = rect;
+    }
+    else {
+        rect.Assign(xTopLeft, yTopLeft, xBottomRight - xTopLeft, yBottomRight - yTopLeft);
+    }
+    return rect;
+};
+exports.getNativeRect = getNativeRect;

package/Charting/Visuals/Helpers/createNativeRect.d.ts

@@ -1,4 +1,4 @@
-import { TSciChart } from "../../../types/TSciChart";
+import { SCRTRectVertex, TSciChart } from "../../../types/TSciChart";
 /**
  * Helper function to create a {@link SCRTRectVertex} native rectangle vertex
  * @param webAssemblyContext The {@link TSciChart | SciChart 2D WebAssembly Context} containing native methods and
@@ -8,4 +8,4 @@ import { TSciChart } from "../../../types/TSciChart";
  * @param xBottomRight
  * @param yBottomRight
  */
-export declare const createNativeRect: (webAssemblyContext: TSciChart, xTopLeft: number, yTopLeft: number, xBottomRight: number, yBottomRight: number) => import("../../../types/TSciChart").SCRTRectVertex;
+export declare const createNativeRect: (webAssemblyContext: TSciChart, xTopLeft: number, yTopLeft: number, xBottomRight: number, yBottomRight: number) => SCRTRectVertex;

package/Charting/Visuals/Helpers/createNativeRect.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNativeRect = void 0;
+var NativeObject_1 = require("./NativeObject");
+var rect;
 /**
  * Helper function to create a {@link SCRTRectVertex} native rectangle vertex
  * @param webAssemblyContext The {@link TSciChart | SciChart 2D WebAssembly Context} containing native methods and
@@ -11,6 +13,6 @@ exports.createNativeRect = void 0;
  * @param yBottomRight
  */
 var createNativeRect = function (webAssemblyContext, xTopLeft, yTopLeft, xBottomRight, yBottomRight) {
-    return new webAssemblyContext.SCRTRectVertex(xTopLeft, yTopLeft, xBottomRight - xTopLeft, yBottomRight - yTopLeft);
+    return (0, NativeObject_1.getNativeRect)(webAssemblyContext, xTopLeft, yTopLeft, xBottomRight, yBottomRight);
 };
 exports.createNativeRect = createNativeRect;

package/Charting/Visuals/Helpers/drawBorder.js

@@ -2,17 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.drawBorder = void 0;
 var createNativeRect_1 = require("./createNativeRect");
+var NativeObject_1 = require("./NativeObject");
 var drawBorder = function (renderContext, webAssemblyContext2D, solidBrushCacheBorder, borderRect, leftBorder, topBorder, rightBorder, bottomBorder, color) {
     if (bottomBorder === 0 && topBorder === 0 && leftBorder === 0 && rightBorder === 0) {
         return;
     }
     var solidBrush = solidBrushCacheBorder.newBrush(color, true);
-    var vecRects = new webAssemblyContext2D.VectorRectVertex();
+    var vecRects = (0, NativeObject_1.getVectorRectVertex)(webAssemblyContext2D);
     vecRects.push_back((0, createNativeRect_1.createNativeRect)(webAssemblyContext2D, borderRect.x, borderRect.y - topBorder, borderRect.x + borderRect.width + rightBorder, borderRect.y));
     vecRects.push_back((0, createNativeRect_1.createNativeRect)(webAssemblyContext2D, borderRect.x + borderRect.width, borderRect.y, borderRect.x + borderRect.width + rightBorder, borderRect.y + borderRect.height + bottomBorder));
     vecRects.push_back((0, createNativeRect_1.createNativeRect)(webAssemblyContext2D, borderRect.x - leftBorder, borderRect.y + borderRect.height, borderRect.x + borderRect.width, borderRect.y + borderRect.height + bottomBorder));
     vecRects.push_back((0, createNativeRect_1.createNativeRect)(webAssemblyContext2D, borderRect.x - leftBorder, borderRect.y - topBorder, borderRect.x, borderRect.y + borderRect.height));
     renderContext.drawRects(vecRects, solidBrush, 0, 0);
-    vecRects.delete();
 };
 exports.drawBorder = drawBorder;

package/Charting/Visuals/Helpers/drawLabel.d.ts

@@ -1,5 +1,5 @@
 import { Rect } from "../../../Core/Rect";
-import { ELabelPlacement } from "../../../types/LabelPlacement";
+import { EHorizontalAlignment, ELabelPlacement, EVerticalAlignment } from "../../../types/LabelPlacement";
 import { IPen2D } from "../../Drawing/IPen2D";
 import { WebGlRenderContext2D } from "../../Drawing/WebGlRenderContext2D";
 import { AxisBase2D } from "../Axis/AxisBase2D";
@@ -8,7 +8,7 @@ export declare const drawModifiersAxisLabel: (currentAxis: AxisBase2D, renderCon
 /**
  * Function to draw Vertical or Horizontal Line annotations with labels
  */
-export declare const drawLineAnnotation: (currentAxis: AxisBase2D, renderContext: WebGlRenderContext2D, labelPlacement: ELabelPlacement, displayValue: string, x1Coord: number, x2Coord: number, y1Coord: number, y2Coord: number, textStyle: TTextStyle, fill: string, strokePen: IPen2D, viewRect: Rect, showLabel: boolean, opacity: number) => Rect;
+export declare const drawLineAnnotation: (currentAxis: AxisBase2D, renderContext: WebGlRenderContext2D, labelPlacement: ELabelPlacement, displayValue: string, x1Coord: number, x2Coord: number, y1Coord: number, y2Coord: number, textStyle: TTextStyle, fill: string, strokePen: IPen2D, viewRect: Rect, showLabel: boolean, opacity: number, horizontalAlignment?: EHorizontalAlignment, verticalAlignment?: EVerticalAlignment) => Rect;
 export declare const drawAxisMarkerAnnotation: (currentAxis: AxisBase2D, renderContext: WebGlRenderContext2D, displayValue: string, markerCoordinate: number, x1Coord: number, y1Coord: number, textStyle: TTextStyle, fill: string, opacity: number, image: HTMLImageElement, imageWidth: number, imageHeight: number) => {
     xPosition: number;
     yPosition: number;
@@ -19,7 +19,7 @@ export declare const drawAxisMarkerAnnotation: (currentAxis: AxisBase2D, renderC
  * Calculates coordinates of the annotation label.
  * The coordinates are defined as an absolute position on the whole SciChartSurface.
  */
-export declare const getLabelCoordinates: (currentAxis: AxisBase2D, labelPlacement: ELabelPlacement, x1Coord: number, x2Coord: number, y1Coord: number, y2Coord: number, textureHeight: number, textureWidth: number) => {
+export declare const getLabelCoordinates: (currentAxis: AxisBase2D, labelPlacement: ELabelPlacement, x1Coord: number, x2Coord: number, y1Coord: number, y2Coord: number, textureHeight: number, textureWidth: number, horizontalAlignment?: EHorizontalAlignment, verticalAlignment?: EVerticalAlignment) => {
     xPosition: number;
     yPosition: number;
 };

package/Charting/Visuals/Helpers/drawLabel.js

@@ -27,7 +27,7 @@ exports.drawModifiersAxisLabel = drawModifiersAxisLabel;
 /**
  * Function to draw Vertical or Horizontal Line annotations with labels
  */
-var drawLineAnnotation = function (currentAxis, renderContext, labelPlacement, displayValue, x1Coord, x2Coord, y1Coord, y2Coord, textStyle, fill, strokePen, viewRect, showLabel, opacity) {
+var drawLineAnnotation = function (currentAxis, renderContext, labelPlacement, displayValue, x1Coord, x2Coord, y1Coord, y2Coord, textStyle, fill, strokePen, viewRect, showLabel, opacity, horizontalAlignment, verticalAlignment) {
     var nativeContext = renderContext.getNativeContext();
     var axisAlignment = currentAxis.axisAlignment;
     var displayVertically = (axisAlignment === AxisAlignment_1.EAxisAlignment.Top || axisAlignment === AxisAlignment_1.EAxisAlignment.Bottom) &&
@@ -41,17 +41,17 @@ var drawLineAnnotation = function (currentAxis, renderContext, labelPlacement, d
     var labelHeight = 0;
     var labelWidth = 0;
     var labelRect;
+    var _a = getLineCoordinates(x1Coord, y1Coord, x2Coord, y2Coord, labelHeight, labelWidth, labelPlacement, currentAxis), x1LineCoord = _a.x1LineCoord, y1LineCoord = _a.y1LineCoord, x2LineCoord = _a.x2LineCoord, y2LineCoord = _a.y2LineCoord;
+    renderContext.drawLine(x1LineCoord, y1LineCoord, x2LineCoord, y2LineCoord, strokePen, viewRect);
     if (showLabel) {
-        var _a = currentAxis.axisRenderer.createAnnotationLabelTexture(text, labelTextStyle, labelBackgroundColor, displayVertically, displayMirrored, opacity), bitmapTexture = _a.bitmapTexture, textureHeight = _a.textureHeight, textureWidth = _a.textureWidth;
-        var _b = (0, exports.getLabelCoordinates)(currentAxis, labelPlacement, x1Coord, x2Coord, y1Coord, y2Coord, textureHeight, textureWidth), xPosition = _b.xPosition, yPosition = _b.yPosition;
+        var _b = currentAxis.axisRenderer.createAnnotationLabelTexture(text, labelTextStyle, labelBackgroundColor, displayVertically, displayMirrored, opacity), bitmapTexture = _b.bitmapTexture, textureHeight = _b.textureHeight, textureWidth = _b.textureWidth;
+        var _c = (0, exports.getLabelCoordinates)(currentAxis, labelPlacement, x1Coord, x2Coord, y1Coord, y2Coord, textureHeight, textureWidth, horizontalAlignment, verticalAlignment), xPosition = _c.xPosition, yPosition = _c.yPosition;
         labelHeight = textureHeight;
         labelWidth = textureWidth;
         labelRect = new Rect_1.Rect(xPosition, yPosition, textureWidth, textureHeight);
         nativeContext.DrawTexture(bitmapTexture, Math.round(xPosition), Math.round(yPosition), textureWidth, textureHeight);
         bitmapTexture.delete();
     }
-    var _c = getLineCoordinates(x1Coord, y1Coord, x2Coord, y2Coord, labelHeight, labelWidth, labelPlacement, currentAxis), x1LineCoord = _c.x1LineCoord, y1LineCoord = _c.y1LineCoord, x2LineCoord = _c.x2LineCoord, y2LineCoord = _c.y2LineCoord;
-    renderContext.drawLine(x1LineCoord, y1LineCoord, x2LineCoord, y2LineCoord, strokePen, viewRect);
     return labelRect;
 };
 exports.drawLineAnnotation = drawLineAnnotation;
@@ -74,7 +74,7 @@ exports.drawAxisMarkerAnnotation = drawAxisMarkerAnnotation;
  * Calculates coordinates of the annotation label.
  * The coordinates are defined as an absolute position on the whole SciChartSurface.
  */
-var getLabelCoordinates = function (currentAxis, labelPlacement, x1Coord, x2Coord, y1Coord, y2Coord, textureHeight, textureWidth) {
+var getLabelCoordinates = function (currentAxis, labelPlacement, x1Coord, x2Coord, y1Coord, y2Coord, textureHeight, textureWidth, horizontalAlignment, verticalAlignment) {
     var axisAlignment = currentAxis.axisAlignment, seriesViewRect = currentAxis.parentSurface.seriesViewRect, axisViewRect = currentAxis.viewRect;
     var xPosition = 0;
     var yPosition = 0;
@@ -166,26 +166,46 @@ var getLabelCoordinates = function (currentAxis, labelPlacement, x1Coord, x2Coor
         switch (axisAlignment) {
             case AxisAlignment_1.EAxisAlignment.Right:
                 centerVertically();
-                xPosition =
-                    axisViewRect.width < textureWidth
-                        ? (xPosition = axisViewRect.right - textureWidth)
-                        : axisViewRect.left;
+                if (horizontalAlignment === LabelPlacement_1.EHorizontalAlignment.Left) {
+                    xPosition = seriesViewRect.left;
+                }
+                else {
+                    xPosition =
+                        axisViewRect.width < textureWidth
+                            ? (xPosition = axisViewRect.right - textureWidth)
+                            : axisViewRect.left;
+                }
                 break;
             case AxisAlignment_1.EAxisAlignment.Left:
                 centerVertically();
-                xPosition =
-                    axisViewRect.width < textureWidth
-                        ? (xPosition = axisViewRect.left)
-                        : axisViewRect.right - textureWidth;
+                if (horizontalAlignment === LabelPlacement_1.EHorizontalAlignment.Right) {
+                    xPosition = seriesViewRect.left + seriesViewRect.width - textureWidth;
+                }
+                else {
+                    xPosition =
+                        axisViewRect.width < textureWidth
+                            ? (xPosition = axisViewRect.left)
+                            : axisViewRect.right - textureWidth;
+                }
                 break;
             case AxisAlignment_1.EAxisAlignment.Top:
-                yPosition =
-                    axisViewRect.height < textureHeight ? axisViewRect.top : axisViewRect.bottom - textureHeight;
+                if (verticalAlignment === LabelPlacement_1.EVerticalAlignment.Bottom) {
+                    yPosition = seriesViewRect.top + seriesViewRect.height - textureHeight;
+                }
+                else {
+                    yPosition =
+                        axisViewRect.height < textureHeight ? axisViewRect.top : axisViewRect.bottom - textureHeight;
+                }
                 centerHorizontally();
                 break;
             case AxisAlignment_1.EAxisAlignment.Bottom:
-                yPosition =
-                    axisViewRect.height < textureHeight ? axisViewRect.bottom - textureHeight : axisViewRect.top;
+                if (verticalAlignment === LabelPlacement_1.EVerticalAlignment.Top) {
+                    yPosition = seriesViewRect.top;
+                }
+                else {
+                    yPosition =
+                        axisViewRect.height < textureHeight ? axisViewRect.bottom - textureHeight : axisViewRect.top;
+                }
                 centerHorizontally();
                 break;
         }

package/Charting/Visuals/I2DSurfaceOptions.d.ts

@@ -16,6 +16,11 @@ export interface I2DSurfaceOptions extends ISurfaceOptionsBase {
      * However if height of the div is not provided it will use width/height aspect ratio to calculate the height. The default ratio is 3/2.
      */
     heightAspect?: number;
+    /**
+     * Optional - the option of disabling / enabling scaling of the {@link SciChartSurface}.
+     * If false - the {@link SciChartSurface} will take the height and width of parent div without scaling.
+     */
+    disableAspect?: boolean;
     /**
      * Optional - Prove a layoutManager to customise the axis layout.  Use CentralAxesLayoutManager for an easy way to configure central axes.
      */
@@ -32,4 +37,5 @@ export interface I2DSurfaceOptions extends ISurfaceOptionsBase {
      * Optional - Properties of the canvas border
      */
     canvasBorder?: TBorder;
+    drawSeriesBehindAxis?: boolean;
 }

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

@@ -5,6 +5,10 @@ import { ELegendType, SciChartLegendBase } from "./SciChartLegendBase";
  */
 export declare class SciChartLegend extends SciChartLegendBase {
     readonly type = ELegendType.SciChartLegend;
+    /**
+     * Checked changed callback - when a legend item row checkbox is checked or unchecked. Set by parent {@link LegendModifier}
+     */
+    legendItemCheckedChangedCallback: (series: IRenderableSeries, isChecked: boolean) => void;
     private renderableSeriesArray;
     private showCheckboxesProperty;
     private showSeriesMarkersProperty;

package/Charting/Visuals/Legend/SciChartLegend.js

@@ -91,9 +91,15 @@ var SciChartLegend = /** @class */ (function (_super) {
      * adds event listeners to a specific {@link IRenderableSeries} series
      */
     SciChartLegend.prototype.addEventListenerToSeries = function (rs) {
+        var _this = this;
         var el = this.getParentDiv().querySelector("[id='".concat(rs.id, "']"));
         if (el) {
-            var onChangeEventListener_1 = function (e) { return (rs.isVisible = e.target.checked); };
+            var onChangeEventListener_1 = function (e) {
+                rs.isVisible = e.target.checked;
+                if (_this.legendItemCheckedChangedCallback) {
+                    _this.legendItemCheckedChangedCallback(rs, rs.isVisible);
+                }
+            };
             el.addEventListener("change", onChangeEventListener_1);
             var eventSubscriptionItem = {
                 element: el,