scichart 2.2.2416 → 3.0.0-beta.224

package/Charting/Visuals/RenderableSeries/StackedMountainCollection.js

@@ -119,7 +119,7 @@ var StackedMountainCollection = /** @class */ (function (_super) {
                 var accumulatedValues = index === 0 ? _this.accumulatedValues0 : collection[index - 1].accumulatedValues;
                 // wrap XyDataSeries as XyyDataSeries
                 var xyyPointSeries = new XyyPointSeriesWrapped_1.XyyPointSeriesWrapped(series.dataSeries, accumulatedValues, currAccumVec);
-                var renderData = new RenderPassData_1.RenderPassData(undefined, renderPassData.xCoordinateCalculator, renderPassData.yCoordinateCalculator, xAxis_1.isVerticalChart, xyyPointSeries);
+                var renderData = new RenderPassData_1.RenderPassData(undefined, renderPassData.getxCoordinateCalculator, renderPassData.getyCoordinateCalculator, xAxis_1.isVerticalChart, xyyPointSeries);
                 series.strokeY1 = index === 0 ? "transparent" : collection[index - 1].stroke;
                 series.strokeY1DashArray = index === 0 ? [] : collection[index - 1].strokeDashArray;
                 series.draw(renderContext, renderData);
@@ -169,6 +169,9 @@ var StackedMountainCollection = /** @class */ (function (_super) {
     };
     StackedMountainCollection.prototype.attachChildSeries = function (series) {
         series.onAttachToParentCollection(this, this.getParentSurface, this.notifyPropertyChanged);
+        if (this.parentSurface) {
+            series.onAttach(this.parentSurface);
+        }
         this.invalidateParent();
     };
     StackedMountainCollection.prototype.checkXValuesCorrect = function () {

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

@@ -6,6 +6,7 @@ import { IPaletteProvider } from "../../Model/IPaletteProvider";
 import { IPointSeries } from "../../Model/PointSeries/IPointSeries";
 import { ResamplingParams } from "../../Numerics/Resamplers/ResamplingParams";
 import { RenderPassData } from "../../Services/RenderPassData";
+import { IThemeProvider } from "../../Themes/IThemeProvider";
 import { SciChartSurface } from "../SciChartSurface";
 import { TDpiChangedEventArgs } from "../TextureManager/DpiHelper";
 import { BaseStackedCollection } from "./BaseStackedCollection";
@@ -144,6 +145,10 @@ export declare class StackedMountainRenderableSeries extends BaseStackedRenderab
      * @remarks This property is set internally to the value of a previous StackedMountainSeries.
      */
     set strokeY1DashArray(strokeY1DashArray: number[]);
+    /**
+     * Gets the RenderPassData instance used for this render pass
+     */
+    getCurrentRenderPassData(): RenderPassData;
     toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;
     /** @inheritDoc */
     toPointSeries(resamplingParams?: ResamplingParams): IPointSeries;
@@ -154,5 +159,7 @@ export declare class StackedMountainRenderableSeries extends BaseStackedRenderab
     /** @inheritDoc */
     hasPointMarkerPaletteProvider(): boolean;
     /** @inheritDoc */
+    resolveAutoColors(index: number, maxSeries: number, theme: IThemeProvider): void;
+    /** @inheritDoc */
     protected newHitTestProvider(): IHitTestProvider;
 }

package/Charting/Visuals/RenderableSeries/StackedMountainRenderableSeries.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StackedMountainRenderableSeries = void 0;
 var SeriesType_1 = require("../../../types/SeriesType");
 var XyPointSeriesWrapped_1 = require("../../Model/PointSeries/XyPointSeriesWrapped");
+var IThemeProvider_1 = require("../../Themes/IThemeProvider");
 var SciChartSurfaceBase_1 = require("../SciChartSurfaceBase");
 var BaseStackedRenderableSeries_1 = require("./BaseStackedRenderableSeries");
 var constants_1 = require("./constants");
@@ -57,14 +58,15 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link IStackedMountainRenderableSeriesOptions} to configure the series
      */
     function StackedMountainRenderableSeries(webAssemblyContext, options) {
+        var _this = this;
         var _a, _b, _c;
-        var _this = _super.call(this, webAssemblyContext, options) || this;
+        _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = SeriesType_1.ESeriesType.StackedMountainSeries;
         _this.fillProperty = "#7e8486";
         _this.strokeY1Property = "transparent";
         _this.strokeDashArrayProperty = [];
         _this.strokeY1DashArrayProperty = [];
-        _this.fill = (_a = options === null || options === void 0 ? void 0 : options.fill) !== null && _a !== void 0 ? _a : _this.fillProperty;
+        _this.fillProperty = (_a = options === null || options === void 0 ? void 0 : options.fill) !== null && _a !== void 0 ? _a : _this.fillProperty;
         _this.stroke = (_b = options === null || options === void 0 ? void 0 : options.stroke) !== null && _b !== void 0 ? _b : SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.mountainLineColor;
         _this.strokeDashArrayProperty = (_c = options === null || options === void 0 ? void 0 : options.strokeDashArray) !== null && _c !== void 0 ? _c : _this.strokeDashArrayProperty;
         _this.drawingProviders.push(new BandSeriesDrawingProvider_1.BandSeriesDrawingProvider(webAssemblyContext, 
@@ -130,14 +132,19 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
          * Gets or sets the fill brush of the mountain as an HTML color code
          */
         get: function () {
-            return this.fillProperty;
+            return (0, IThemeProvider_1.stripAutoColor)(this.fillProperty);
         },
         /**
          * Gets or sets the fill brush of the mountain as an HTML color code
          */
         set: function (fill) {
-            this.fillProperty = fill;
-            this.notifyPropertyChanged(constants_1.PROPERTY.FILL);
+            if (this.fillProperty !== fill) {
+                this.fillProperty = fill;
+                this.drawingProviders.forEach(function (dp) { return dp.onSeriesPropertyChange(constants_1.PROPERTY.FILL); });
+                // If fill changes, we need to redo both brushes on the drawing provider
+                this.drawingProviders.forEach(function (dp) { return dp.onSeriesPropertyChange(constants_1.PROPERTY.FILL_Y1); });
+                this.notifyPropertyChanged(constants_1.PROPERTY.FILL);
+            }
         },
         enumerable: false,
         configurable: true
@@ -157,9 +164,11 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
          *  @remarks This property is set internally to the value of a previous StackedMountainSeries.
          */
         set: function (strokeY1) {
-            this.strokeY1Property = strokeY1;
-            // no need to call notifyPropertyChange here since this will cause an unwanted redraw loop, so just updating a pen
-            this.drawingProviders.forEach(function (dp) { return dp.onSeriesPropertyChange(constants_1.PROPERTY.STROKE_Y1); });
+            if (this.strokeY1Property !== strokeY1) {
+                this.strokeY1Property = strokeY1;
+                // no need to call notifyPropertyChange here since this will cause an unwanted redraw loop, so just updating a pen
+                this.drawingProviders.forEach(function (dp) { return dp.onSeriesPropertyChange(constants_1.PROPERTY.STROKE_Y1); });
+            }
         },
         enumerable: false,
         configurable: true
@@ -169,7 +178,7 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
          * Gets or sets the fill color for when Y1 is less than Y as an HTML Color code
          */
         get: function () {
-            return this.fillProperty;
+            return (0, IThemeProvider_1.stripAutoColor)(this.fillProperty);
         },
         /**
          * Gets or sets the fill color for when Y1 is less than Y as an HTML Color code
@@ -221,6 +230,12 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    /**
+     * Gets the RenderPassData instance used for this render pass
+     */
+    StackedMountainRenderableSeries.prototype.getCurrentRenderPassData = function () {
+        return this.currentRenderPassData;
+    };
     // PROPERTIES END
     StackedMountainRenderableSeries.prototype.toJSON = function (excludeData) {
         if (excludeData === void 0) { excludeData = false; }
@@ -254,6 +269,15 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
         var pointMarkerPalette = this.paletteProvider;
         return (pointMarkerPalette === null || pointMarkerPalette === void 0 ? void 0 : pointMarkerPalette.overridePointMarkerArgb) !== undefined;
     };
+    /** @inheritDoc */
+    StackedMountainRenderableSeries.prototype.resolveAutoColors = function (index, maxSeries, theme) {
+        _super.prototype.resolveAutoColors.call(this, index, maxSeries, theme);
+        if (this.fillProperty.startsWith(IThemeProvider_1.AUTO_COLOR)) {
+            var color = theme.getFillColor(index, maxSeries, this.webAssemblyContext);
+            this.fill = IThemeProvider_1.AUTO_COLOR + this.adjustAutoColor("fill", color);
+        }
+        // No need to resolve strokeY1 as the collection sets it based on previous series
+    };
     // PROTECTED
     /** @inheritDoc */
     StackedMountainRenderableSeries.prototype.newHitTestProvider = function () {

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

@@ -5,6 +5,7 @@ import { IPointSeries } from "../../Model/PointSeries/IPointSeries";
 import { UniformHeatmapDataSeries } from "../../Model/UniformHeatmapDataSeries";
 import { ResamplingParams } from "../../Numerics/Resamplers/ResamplingParams";
 import { BaseRenderableSeries } from "./BaseRenderableSeries";
+import { IContoursDataLabelProviderOptions } from "./DataLabels/ContoursDataLabelProvider";
 import { HeatmapColorMap, IHeatmapColorMapOptions } from "./HeatmapColorMap";
 import { IHitTestProvider } from "./HitTest/IHitTestProvider";
 import { IBaseRenderableSeriesOptions } from "./IBaseRenderableSeriesOptions";
@@ -27,6 +28,10 @@ export interface IContoursRenderableSeriesOptions extends IBaseRenderableSeriesO
     majorLineStyle?: TContourLineStyle;
     minorLineStyle?: TContourLineStyle;
     minorsPerMajor?: number;
+    /**
+     * Options to pass to the {@link DataLabelProvider}. Set a style with font and size to enable per-point text for this series.
+     */
+    dataLabels?: IContoursDataLabelProviderOptions;
 }
 export interface IContourDrawingParams {
     xMin: number;

package/Charting/Visuals/RenderableSeries/UniformContoursRenderableSeries.js

@@ -21,6 +21,7 @@ var isRealNumber_1 = require("../../../utils/isRealNumber");
 var AxisCore_1 = require("../Axis/AxisCore");
 var BaseRenderableSeries_1 = require("./BaseRenderableSeries");
 var constants_1 = require("./constants");
+var ContoursDataLabelProvider_1 = require("./DataLabels/ContoursDataLabelProvider");
 var UniformContoursDrawingProvider_1 = require("./DrawingProviders/UniformContoursDrawingProvider");
 var HeatmapColorMap_1 = require("./HeatmapColorMap");
 /** @ignore */
@@ -48,8 +49,9 @@ var UniformContoursRenderableSeries = /** @class */ (function (_super) {
      * @param options optional parameters of type {@link IHeatmapRenderableSeriesOptions} applied when constructing the series type
      */
     function UniformContoursRenderableSeries(webAssemblyContext, options) {
+        var _this = this;
         var _a, _b, _c;
-        var _this = _super.call(this, webAssemblyContext, options) || this;
+        _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = SeriesType_1.ESeriesType.UniformContoursSeries;
         _this.colorMapPropertyChanged = _this.colorMapPropertyChanged.bind(_this);
         if (options === null || options === void 0 ? void 0 : options.colorMap) {
@@ -71,6 +73,10 @@ var UniformContoursRenderableSeries = /** @class */ (function (_super) {
         if ((_b = _this.paletteProvider) === null || _b === void 0 ? void 0 : _b.onAttached) {
             (_c = _this.paletteProvider) === null || _c === void 0 ? void 0 : _c.onAttached(_this);
         }
+        if (!_this.dataLabelProviderProperty) {
+            _this.dataLabelProviderProperty = new ContoursDataLabelProvider_1.ContoursDataLabelProvider(options === null || options === void 0 ? void 0 : options.dataLabels);
+            _this.dataLabelProviderProperty.onAttach(_this.webAssemblyContext, _this);
+        }
         _this.drawingProviders = [];
         _this.drawingProviders.push(new UniformContoursDrawingProvider_1.UniformContoursDrawingProvider(webAssemblyContext, _this));
         return _this;

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

@@ -1,38 +1,7 @@
-import { PropertyChangedEventArgs } from "../../../Core/PropertyChangedEventArgs";
 import { ESeriesType } from "../../../types/SeriesType";
 import { TSciChart } from "../../../types/TSciChart";
-import { IPointSeries } from "../../Model/PointSeries/IPointSeries";
-import { UniformHeatmapDataSeries } from "../../Model/UniformHeatmapDataSeries";
-import { ResamplingParams } from "../../Numerics/Resamplers/ResamplingParams";
-import { LabelProvider } from "../Axis/LabelProvider/LabelProvider";
-import { BaseRenderableSeries } from "./BaseRenderableSeries";
-import { HeatmapColorMap, IHeatmapColorMapOptions } from "./HeatmapColorMap";
+import { BaseHeatmapRenderableSeries, IHeatmapRenderableSeriesOptions } from "./BaseHeatmapRenderableSeries";
 import { IHitTestProvider } from "./HitTest/IHitTestProvider";
-import { IBaseRenderableSeriesOptions } from "./IBaseRenderableSeriesOptions";
-/**
- * Optional parameters passed to {@link UniformHeatmapRenderableSeries} constructor
- */
-export interface IHeatmapRenderableSeriesOptions extends IBaseRenderableSeriesOptions {
-    /**
-     * The {@link HeatmapColorMap} instance, which maps heatmap z-values to colors
-     * or an {@link IHeatmapColorMapOptions} object which will be used to build a HeatmapColorMap
-     */
-    colorMap?: HeatmapColorMap | IHeatmapColorMapOptions;
-    /**
-     * The {@link UniformHeatmapDataSeries} instance containing 2-dimensional heatmap data
-     */
-    dataSeries?: UniformHeatmapDataSeries;
-    /**
-     * The flag whether to make the heatmap linearly interpolated or smoothed between cells
-     */
-    useLinearTextureFiltering?: boolean;
-    /**
-     * The flag whether to fill cells with edge color if its value is outside of {@link colorMap.minimum} to {@link colorMap.maximum} range
-     */
-    fillValuesOutOfRange?: boolean;
-}
-/** @ignore */
-export declare const COLOR_MAP_PREFIX = "colorMap.";
 /**
  * @summary A JavaScript Heatmap chart type rendering a 2-dimensional array of data as color values between X,Y bounds in
  * SciChart's High Performance Real-time {@link https://www.scichart.com/javascript-chart-features | JavaScript Chart Library}
@@ -72,12 +41,8 @@ export declare const COLOR_MAP_PREFIX = "colorMap.";
  * sciChartSurface.renderableSeries.add(heatmapSeries);
  * ```
  */
-export declare class UniformHeatmapRenderableSeries extends BaseRenderableSeries {
+export declare class UniformHeatmapRenderableSeries extends BaseHeatmapRenderableSeries {
     readonly type: ESeriesType;
-    private colorMapProperty;
-    private useLinearTextureFilteringProperty;
-    private fillValuesOutOfRangeProperty;
-    private zLabelProviderProperty;
     /**
      * Creates an instance of the {@link UniformHeatmapRenderableSeries}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
@@ -85,44 +50,6 @@ export declare class UniformHeatmapRenderableSeries extends BaseRenderableSeries
      * @param options optional parameters of type {@link IHeatmapRenderableSeriesOptions} applied when constructing the series type
      */
     constructor(webAssemblyContext: TSciChart, options?: IHeatmapRenderableSeriesOptions);
-    /**
-     * Gets or sets the {@link HeatmapColorMap}, which maps heatmap z-values to colors
-     */
-    get colorMap(): HeatmapColorMap;
-    /**
-     * Gets or sets the {@link HeatmapColorMap}, which maps heatmap z-values to colors
-     */
-    set colorMap(colorMap: HeatmapColorMap);
-    /**
-     * Gets or sets whether to make the heatmap linearly interpolated or smoothed between cells
-     */
-    get useLinearTextureFiltering(): boolean;
-    /**
-     * Gets or sets whether to make the heatmap linearly interpolated or smoothed between cells
-     */
-    set useLinearTextureFiltering(value: boolean);
-    /** @inheritDoc */
-    checkIsOutOfDataRange(xValue: number, yValue: number): boolean;
-    get zLabelProvider(): LabelProvider;
-    set zLabelProvider(labelProvider: LabelProvider);
-    /**
-     * Gets or sets whether to fill cells with edge color if its value is outside of {@link colorMap.minimum} to {@link colorMap.maximum} range
-     */
-    get fillValuesOutOfRange(): boolean;
-    /**
-     * Gets or sets whether to fill cells with edge color if its value is outside of {@link colorMap.minimum} to {@link colorMap.maximum} range
-     */
-    set fillValuesOutOfRange(value: boolean);
-    /** @inheritDoc */
-    toPointSeries(resamplingParams?: ResamplingParams): IPointSeries;
-    /** @inheritDoc */
-    toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;
-    /**
-     * Called when a property changes on {@link HeatmapColorMap}, and notifies the parent {@link SciChartSurface}
-     * that a redraw is required.
-     * @param args
-     */
-    protected colorMapPropertyChanged(args: PropertyChangedEventArgs): void;
     /**
      * @inheritDoc
      */

package/Charting/Visuals/RenderableSeries/UniformHeatmapRenderableSeries.js

@@ -15,18 +15,13 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UniformHeatmapRenderableSeries = exports.COLOR_MAP_PREFIX = void 0;
+exports.UniformHeatmapRenderableSeries = void 0;
 var app_1 = require("../../../constants/app");
 var SeriesType_1 = require("../../../types/SeriesType");
-var AxisCore_1 = require("../Axis/AxisCore");
-var NumericLabelProvider_1 = require("../Axis/LabelProvider/NumericLabelProvider");
-var BaseRenderableSeries_1 = require("./BaseRenderableSeries");
-var constants_1 = require("./constants");
+var BaseHeatmapRenderableSeries_1 = require("./BaseHeatmapRenderableSeries");
+var HeatMapDataLabelProvider_1 = require("./DataLabels/HeatMapDataLabelProvider");
 var UniformHeatmapDrawingProvider_1 = require("./DrawingProviders/UniformHeatmapDrawingProvider");
-var HeatmapColorMap_1 = require("./HeatmapColorMap");
 var UniformHeatmapHitTestProvider_1 = require("./HitTest/UniformHeatmapHitTestProvider");
-/** @ignore */
-exports.COLOR_MAP_PREFIX = "colorMap.";
 /**
  * @summary A JavaScript Heatmap chart type rendering a 2-dimensional array of data as color values between X,Y bounds in
  * SciChart's High Performance Real-time {@link https://www.scichart.com/javascript-chart-features | JavaScript Chart Library}
@@ -75,135 +70,18 @@ var UniformHeatmapRenderableSeries = /** @class */ (function (_super) {
      * @param options optional parameters of type {@link IHeatmapRenderableSeriesOptions} applied when constructing the series type
      */
     function UniformHeatmapRenderableSeries(webAssemblyContext, options) {
-        var _a, _b, _c, _d, _e, _f;
         var _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = SeriesType_1.ESeriesType.UniformHeatmapSeries;
-        _this.useLinearTextureFilteringProperty = false;
-        _this.fillValuesOutOfRangeProperty = true;
-        _this.colorMapPropertyChanged = _this.colorMapPropertyChanged.bind(_this);
-        if (options === null || options === void 0 ? void 0 : options.colorMap) {
-            if (!("toJSON" in options.colorMap)) {
-                options.colorMap = new HeatmapColorMap_1.HeatmapColorMap(options.colorMap);
-            }
-        }
-        _this.colorMap = options === null || options === void 0 ? void 0 : options.colorMap;
-        _this.dataSeries = options === null || options === void 0 ? void 0 : options.dataSeries;
-        _this.xAxisId = (_a = options === null || options === void 0 ? void 0 : options.xAxisId) !== null && _a !== void 0 ? _a : AxisCore_1.AxisCore.DEFAULT_AXIS_ID;
-        _this.xAxisId = (_b = options === null || options === void 0 ? void 0 : options.yAxisId) !== null && _b !== void 0 ? _b : AxisCore_1.AxisCore.DEFAULT_AXIS_ID;
-        _this.useLinearTextureFilteringProperty =
-            (_c = options === null || options === void 0 ? void 0 : options.useLinearTextureFiltering) !== null && _c !== void 0 ? _c : _this.useLinearTextureFilteringProperty;
-        _this.fillValuesOutOfRangeProperty = (_d = options === null || options === void 0 ? void 0 : options.fillValuesOutOfRange) !== null && _d !== void 0 ? _d : _this.fillValuesOutOfRangeProperty;
-        // Must be called here for the series type to be available
-        if ((_e = _this.paletteProvider) === null || _e === void 0 ? void 0 : _e.onAttached) {
-            (_f = _this.paletteProvider) === null || _f === void 0 ? void 0 : _f.onAttached(_this);
-        }
         _this.drawingProviders = [];
         if (!app_1.IS_TEST_ENV) {
             _this.drawingProviders.push(new UniformHeatmapDrawingProvider_1.UniformHeatmapDrawingProvider(webAssemblyContext, _this));
         }
-        _this.zLabelProviderProperty = new NumericLabelProvider_1.NumericLabelProvider({ labelPrecision: 2 });
+        if (!_this.dataLabelProviderProperty) {
+            _this.dataLabelProviderProperty = new HeatMapDataLabelProvider_1.HeatMapDataLabelProvider(options === null || options === void 0 ? void 0 : options.dataLabels);
+            _this.dataLabelProviderProperty.onAttach(_this.webAssemblyContext, _this);
+        }
         return _this;
     }
-    Object.defineProperty(UniformHeatmapRenderableSeries.prototype, "colorMap", {
-        /**
-         * Gets or sets the {@link HeatmapColorMap}, which maps heatmap z-values to colors
-         */
-        get: function () {
-            return this.colorMapProperty;
-        },
-        /**
-         * Gets or sets the {@link HeatmapColorMap}, which maps heatmap z-values to colors
-         */
-        set: function (colorMap) {
-            var _a, _b;
-            (_a = this.colorMapProperty) === null || _a === void 0 ? void 0 : _a.propertyChanged.unsubscribe(this.colorMapPropertyChanged);
-            this.colorMapProperty = colorMap;
-            (_b = this.colorMapProperty) === null || _b === void 0 ? void 0 : _b.propertyChanged.subscribe(this.colorMapPropertyChanged);
-            this.notifyPropertyChanged(constants_1.PROPERTY.COLOR_MAP);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(UniformHeatmapRenderableSeries.prototype, "useLinearTextureFiltering", {
-        /**
-         * Gets or sets whether to make the heatmap linearly interpolated or smoothed between cells
-         */
-        get: function () {
-            return this.useLinearTextureFilteringProperty;
-        },
-        /**
-         * Gets or sets whether to make the heatmap linearly interpolated or smoothed between cells
-         */
-        set: function (value) {
-            this.useLinearTextureFilteringProperty = value;
-            this.notifyPropertyChanged(constants_1.PROPERTY.USE_LINEAR_TEXTURE_FILTERING);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    /** @inheritDoc */
-    UniformHeatmapRenderableSeries.prototype.checkIsOutOfDataRange = function (xValue, yValue) {
-        var dataSeries = this.dataSeries;
-        return (!dataSeries ||
-            xValue <= dataSeries.xRange.min ||
-            xValue >= dataSeries.xRange.max ||
-            yValue <= dataSeries.yRange.min ||
-            yValue >= dataSeries.yRange.max);
-    };
-    Object.defineProperty(UniformHeatmapRenderableSeries.prototype, "zLabelProvider", {
-        get: function () {
-            return this.zLabelProviderProperty;
-        },
-        set: function (labelProvider) {
-            this.zLabelProviderProperty = labelProvider;
-            this.notifyPropertyChanged(constants_1.PROPERTY.Z_LABEL_PROVIDER);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(UniformHeatmapRenderableSeries.prototype, "fillValuesOutOfRange", {
-        /**
-         * Gets or sets whether to fill cells with edge color if its value is outside of {@link colorMap.minimum} to {@link colorMap.maximum} range
-         */
-        get: function () {
-            return this.fillValuesOutOfRangeProperty;
-        },
-        /**
-         * Gets or sets whether to fill cells with edge color if its value is outside of {@link colorMap.minimum} to {@link colorMap.maximum} range
-         */
-        set: function (value) {
-            this.fillValuesOutOfRangeProperty = value;
-            this.notifyPropertyChanged(constants_1.PROPERTY.FILL_VALUES_OUT_OF_RANGE);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    /** @inheritDoc */
-    UniformHeatmapRenderableSeries.prototype.toPointSeries = function (resamplingParams) {
-        // not used for Heatmap
-        return undefined;
-    };
-    /** @inheritDoc */
-    UniformHeatmapRenderableSeries.prototype.toJSON = function (excludeData) {
-        var _a;
-        if (excludeData === void 0) { excludeData = false; }
-        var json = _super.prototype.toJSON.call(this, excludeData);
-        var options = {
-            colorMap: (_a = this.colorMap) === null || _a === void 0 ? void 0 : _a.toJSON(),
-            fillValuesOutOfRange: this.fillValuesOutOfRange,
-            useLinearTextureFiltering: this.useLinearTextureFiltering
-        };
-        Object.assign(json.options, options);
-        return json;
-    };
-    /**
-     * Called when a property changes on {@link HeatmapColorMap}, and notifies the parent {@link SciChartSurface}
-     * that a redraw is required.
-     * @param args
-     */
-    UniformHeatmapRenderableSeries.prototype.colorMapPropertyChanged = function (args) {
-        this.notifyPropertyChanged(exports.COLOR_MAP_PREFIX + args.propertyName);
-    };
     /**
      * @inheritDoc
      */
@@ -211,5 +89,5 @@ var UniformHeatmapRenderableSeries = /** @class */ (function (_super) {
         return new UniformHeatmapHitTestProvider_1.UniformHeatmapHitTestProvider(this, this.webAssemblyContext);
     };
     return UniformHeatmapRenderableSeries;
-}(BaseRenderableSeries_1.BaseRenderableSeries));
+}(BaseHeatmapRenderableSeries_1.BaseHeatmapRenderableSeries));
 exports.UniformHeatmapRenderableSeries = UniformHeatmapRenderableSeries;

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

@@ -3,12 +3,17 @@ import { TSciChart } from "../../../types/TSciChart";
 import { IPointSeries } from "../../Model/PointSeries/IPointSeries";
 import { ResamplingParams } from "../../Numerics/Resamplers/ResamplingParams";
 import { BaseRenderableSeries } from "./BaseRenderableSeries";
+import { IDataLabelProviderOptions } from "./DataLabels/DataLabelProvider";
 import { IHitTestProvider } from "./HitTest/IHitTestProvider";
 import { IBaseRenderableSeriesOptions } from "./IBaseRenderableSeriesOptions";
 /**
  * Optional parameters passed to the constructor of {@link XyScatterRenderableSeries}
  */
 export interface IXyScatterRenderableSeriesOptions extends IBaseRenderableSeriesOptions {
+    /**
+     * Options to pass to the DataLabelProvider. Set a style with font and size to enable per-point text for this series.
+     */
+    dataLabels?: IDataLabelProviderOptions;
 }
 /**
  * Defines a scatter-series or scatter chart type in the SciChart's High Performance Real-time

package/Charting/Visuals/RenderableSeries/XyScatterRenderableSeries.js

@@ -21,6 +21,7 @@ var XyPointSeriesWrapped_1 = require("../../Model/PointSeries/XyPointSeriesWrapp
 var EllipsePointMarker_1 = require("../PointMarkers/EllipsePointMarker");
 var BaseRenderableSeries_1 = require("./BaseRenderableSeries");
 var constants_1 = require("./constants");
+var DataLabelProvider_1 = require("./DataLabels/DataLabelProvider");
 var PointMarkerDrawingProvider_1 = require("./DrawingProviders/PointMarkerDrawingProvider");
 var ScatterSeriesHitTestProvider_1 = require("./HitTest/ScatterSeriesHitTestProvider");
 /**
@@ -60,8 +61,9 @@ var XyScatterRenderableSeries = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link IBaseRenderableSeriesOptions} to configure the series
      */
     function XyScatterRenderableSeries(webAssemblyContext, options) {
+        var _this = this;
         var _a, _b, _c;
-        var _this = _super.call(this, webAssemblyContext, options) || this;
+        _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = SeriesType_1.ESeriesType.ScatterSeries;
         _this.scatterOpacityProperty = 1;
         if (!_this.pointMarker) {
@@ -72,6 +74,10 @@ var XyScatterRenderableSeries = /** @class */ (function (_super) {
         if (options === null || options === void 0 ? void 0 : options.animation) {
             _this.animationQueue.push(options.animation);
         }
+        if (!_this.dataLabelProviderProperty) {
+            _this.dataLabelProviderProperty = new DataLabelProvider_1.DataLabelProvider(options === null || options === void 0 ? void 0 : options.dataLabels);
+            _this.dataLabelProviderProperty.onAttach(_this.webAssemblyContext, _this);
+        }
         // Must be called here for the series type to be available
         if ((_a = _this.paletteProvider) === null || _a === void 0 ? void 0 : _a.onAttached) {
             (_b = _this.paletteProvider) === null || _b === void 0 ? void 0 : _b.onAttached(_this);

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

@@ -8,6 +8,7 @@ export declare enum PROPERTY {
     CONTOUR_MINOR_LINE_STYLE = "CONTOUR_MINOR_LINE_STYLE",
     CONTOUR_MAJOR_LINE_STYLE = "CONTOUR_MAJOR_LINE_STYLE",
     CONTOUR_COLOR_MAP_MODE = "CONTOUR_COLOR_MAP_MODE",
+    CORNER_RADIUS = "CORNER_RADIUS",
     DATA_POINT_WIDTH = "dataPointWidth",
     DATA_POINT_WIDTH_MODE = "DATA_POINT_WIDTH_MODE",
     DATA_SERIES = "dataSeries",
@@ -31,6 +32,7 @@ export declare enum PROPERTY {
     IS_SELECTED = "IS_SELECTED",
     IS_VISIBLE = "IS_VISIBLE",
     INTENSITY = "INTENSITY",
+    LINE_TYPE = "LINE_TYPE",
     MAXIMUM = "MAXIMUM",
     MINIMUM = "MINIMUM",
     OFFSET = "OFFSET",
@@ -57,5 +59,7 @@ export declare enum PROPERTY {
     Z_STEP = "Z_STEP",
     Z_MAX = "Z_MAX",
     Z_MIN = "Z_MIN",
-    Z_LABEL_PROVIDER = "Z_LABEL_PROVIDER"
+    Z_MULTIPLIER = "Z_MULTIPLIER",
+    Z_LABEL_PROVIDER = "Z_LABEL_PROVIDER",
+    SERIES_TEXT_PROVIDER = "SERIES_TEXT_PROVIDER"
 }

package/Charting/Visuals/RenderableSeries/constants.js

@@ -12,6 +12,7 @@ var PROPERTY;
     PROPERTY["CONTOUR_MINOR_LINE_STYLE"] = "CONTOUR_MINOR_LINE_STYLE";
     PROPERTY["CONTOUR_MAJOR_LINE_STYLE"] = "CONTOUR_MAJOR_LINE_STYLE";
     PROPERTY["CONTOUR_COLOR_MAP_MODE"] = "CONTOUR_COLOR_MAP_MODE";
+    PROPERTY["CORNER_RADIUS"] = "CORNER_RADIUS";
     PROPERTY["DATA_POINT_WIDTH"] = "dataPointWidth";
     PROPERTY["DATA_POINT_WIDTH_MODE"] = "DATA_POINT_WIDTH_MODE";
     PROPERTY["DATA_SERIES"] = "dataSeries";
@@ -35,6 +36,7 @@ var PROPERTY;
     PROPERTY["IS_SELECTED"] = "IS_SELECTED";
     PROPERTY["IS_VISIBLE"] = "IS_VISIBLE";
     PROPERTY["INTENSITY"] = "INTENSITY";
+    PROPERTY["LINE_TYPE"] = "LINE_TYPE";
     PROPERTY["MAXIMUM"] = "MAXIMUM";
     PROPERTY["MINIMUM"] = "MINIMUM";
     PROPERTY["OFFSET"] = "OFFSET";
@@ -61,5 +63,7 @@ var PROPERTY;
     PROPERTY["Z_STEP"] = "Z_STEP";
     PROPERTY["Z_MAX"] = "Z_MAX";
     PROPERTY["Z_MIN"] = "Z_MIN";
+    PROPERTY["Z_MULTIPLIER"] = "Z_MULTIPLIER";
     PROPERTY["Z_LABEL_PROVIDER"] = "Z_LABEL_PROVIDER";
+    PROPERTY["SERIES_TEXT_PROVIDER"] = "SERIES_TEXT_PROVIDER";
 })(PROPERTY = exports.PROPERTY || (exports.PROPERTY = {}));

package/Charting/Visuals/RubberBandSvgRect/RubberBandSvgRect.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RubberBandSvgRect = void 0;
+var annotationHelpers_1 = require("../Annotations/annotationHelpers");
 var constants_1 = require("./constants");
 /**
  * Used by the {@link RubberBandXyZoomModifier} to draw an {@link SVGSVGElement | SVGElement} rectangle over the chart.
@@ -113,9 +114,8 @@ var RubberBandSvgRect = /** @class */ (function () {
         }
         if (this.svgRoot) {
             var svgString = svgTemplate(fill, stroke, strokeThickness);
-            var svgNode = document.createRange().createContextualFragment(svgString);
-            this.svgRoot.appendChild(svgNode);
-            this.svg = this.svgRoot.lastChild;
+            var svgNode = annotationHelpers_1.annotationHelpers.createSvg(svgString, this.svgRoot);
+            this.svg = svgNode;
             this.svg.setAttribute("x", "100px");
             this.svg.setAttribute("y", "100px");
         }

package/Charting/Visuals/SciChartDefaults.d.ts

@@ -16,4 +16,8 @@ export declare class SciChartDefaults {
      * Turn on/off warnings to optimize performance
      */
     static performanceWarnings: boolean;
+    /**
+     * Experimental - set true to use native text for axes.  Not all text features currently supported
+     */
+    static useNativeText: boolean;
 }

package/Charting/Visuals/SciChartDefaults.js

@@ -21,6 +21,10 @@ var SciChartDefaults = /** @class */ (function () {
      * Turn on/off warnings to optimize performance
      */
     SciChartDefaults.performanceWarnings = true;
+    /**
+     * Experimental - set true to use native text for axes.  Not all text features currently supported
+     */
+    SciChartDefaults.useNativeText = false;
     return SciChartDefaults;
 }());
 exports.SciChartDefaults = SciChartDefaults;

package/Charting/Visuals/SciChartOverview.js

@@ -227,9 +227,11 @@ var createSciChartOverview = function (originalSciChartSurface, overviewRootElem
                 }
                 originalMainAxis.visibleRangeChanged.subscribe(function (_a) {
                     var visibleRange = _a.visibleRange;
-                    var min = visibleRange.min > mainOverviewAxis.visibleRange.min ? visibleRange.min : mainOverviewAxis.visibleRange.min;
-                    var max = visibleRange.max < mainOverviewAxis.visibleRange.max ? visibleRange.max : mainOverviewAxis.visibleRange.max;
-                    var updatedSelectedRange = new NumberRange_1.NumberRange(min, max);
+                    if (visibleRange.min < mainOverviewAxis.visibleRange.min ||
+                        visibleRange.max > mainOverviewAxis.visibleRange.max) {
+                        mainOverviewAxis.visibleRange = new NumberRange_1.NumberRange(Math.min(visibleRange.min, mainOverviewAxis.visibleRange.min), Math.max(visibleRange.max, mainOverviewAxis.visibleRange.max));
+                    }
+                    var updatedSelectedRange = visibleRange.clip(mainOverviewAxis.visibleRange);
                     var shouldUpdateSelectedRange = !updatedSelectedRange.equals(rangeSelectionModifier.selectedArea);
                     if (shouldUpdateSelectedRange) {
                         rangeSelectionModifier.selectedArea = updatedSelectedRange;

package/Charting/Visuals/SciChartPieSurface/PieSegment/IPieSegment.d.ts

@@ -16,6 +16,10 @@ export interface IPieSegment {
     labelStyle: TTextStyle;
     labelOffset: Point;
     radiusAdjustment: number;
+    /**
+     * When true (default value = true) a label is shown, else false
+     */
+    showLabel: boolean;
     onAttach(scs: SciChartPieSurface): void;
     onDetach(): void;
     toJSON(): IPieSegmentOptions;