scichart 2.2.2417 → 3.0.0-beta.230

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

@@ -27,6 +27,7 @@ import { RolloverModifierRenderableSeriesProps } from "./RolloverModifier/Rollov
 import { SeriesHoveredArgs } from "./SeriesHoveredArgs";
 import { SeriesSelectedArgs } from "./SeriesSelectedArgs";
 import { SeriesVisibleChangedArgs } from "./SeriesVisibleChangedArgs";
+import { BaseDataLabelProvider } from "./DataLabels/BaseDataLabelProvider";
 /**
  * @summary Defines the interface to a Render Series (or Chart Type) in SciChart's High Performance Real-time
  * {@link https://www.scichart.com/javascript-chart-features | JavaScript Charts}
@@ -246,6 +247,10 @@ export interface IRenderableSeries extends IDeletable, IThemeable, INotifyOnDpiC
      * Gets or sets the resampling precision for this series
      */
     resamplingPrecision: number;
+    /**
+     * Gets or sets the {@link BaseDataLabelProvider} used for creating and drawing per-point text
+     */
+    dataLabelProvider: BaseDataLabelProvider;
     /**
      * Called when the {@link BaseRenderableSeries} must be drawn
      * @param renderContext The {@link WebGL2RenderingContext} with methods for drawing on the WebGL Canvas via our WebAssembly Rendering Engine
@@ -356,4 +361,11 @@ export interface IRenderableSeries extends IDeletable, IThemeable, INotifyOnDpiC
      * Gets the RenderPassData instance used for this render pass
      */
     getCurrentRenderPassData(): RenderPassData;
+    /**
+     * Resolve colors marked AUTO_COLOR using the theme's strokePalette and fillPalette
+     * To do custom adjustments to the resolved colors, override the adjustAutoColor method
+     */
+    resolveAutoColors(index: number, maxSeries: number, theme: IThemeProvider): void;
+    /** Replace this to do custom adjustments to the auto color for a particular property */
+    adjustAutoColor(propertyName: string, color: string): string;
 }

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

@@ -0,0 +1,74 @@
+import { ESeriesType } from "../../../types/SeriesType";
+import { TSciChart } from "../../../types/TSciChart";
+import { NonUniformHeatmapDataSeries } from "../../Model/NonUniformHeatmapDataSeries";
+import { BaseHeatmapRenderableSeries } from "./BaseHeatmapRenderableSeries";
+import { IHeatmapRenderableSeriesOptions } from "./BaseHeatmapRenderableSeries";
+import { IHitTestProvider } from "./HitTest/IHitTestProvider";
+/**
+ * Optional parameters passed to {@link NonUniformHeatmapRenderableSeries} constructor
+ */
+export interface INonUniformHeatmapRenderableSeriesOptions extends IHeatmapRenderableSeriesOptions {
+    /**
+     * The {@link NonUniformHeatmapDataSeries} instance containing 2-dimensional heatmap data
+     */
+    dataSeries?: NonUniformHeatmapDataSeries;
+}
+/**
+ * @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}
+ * @description
+ * Heatmaps are 2-dimensional arrays of data, rendered as a color-map on the chart. The {@link NonUniformHeatmapRenderableSeries}
+ * assumes the cells are equal size, and spaced along the X,Y axis according to properties on the {@link NonUniformHeatmapDataSeries}.
+ *
+ * For a code sample how to initialize a non-uniform heatmap, see below
+ *
+ * ```ts
+ * // Create a 2D array with heat values
+ * const zValues = [
+ *     [0, 2, 3.4],
+ *     [5, 3, 4],
+ *     [3, 1.5, -1],
+ * ];
+ * // Define offsets of the heatmap cells
+ * const xCellOffsets = [0, 10, 25, 40];
+ * const yCellOffsets = [100, 200, 300, 400];
+ *
+ * // Create a UniformHeatmapDataSeries passing in zValues
+ * const heatmapDataSeries = new NonUniformHeatmapDataSeries(wasmContext, xCellOffsets, yCellOffsets, zValues);
+ *
+ * // Create a Heatmap RenderableSeries with the color map. ColorMap.minimum/maximum defines the values in
+ * // HeatmapDataSeries which correspond to gradient stops at 0..1
+ * const heatmapSeries = new NonUniformHeatmapRenderableSeries(wasmContext, {
+ *     dataSeries: heatmapDataSeries,
+ *     colorMap: new HeatmapColorMap({
+ *         minimum: 0,
+ *         maximum: 200,
+ *         gradientStops: [
+ *             { offset: 0, color: "#00008B" },
+ *             { offset: 0.2, color: "#6495ED" },
+ *             { offset: 0.4, color: "#006400" },
+ *             { offset: 0.6, color: "#7FFF00" },
+ *             { offset: 0.8, color: "#FFFF00" },
+ *             { offset: 1.0, color: "#FF0000" }
+ *         ]
+ *     })
+ * });
+ *
+ * // Add heatmap to the chart
+ * sciChartSurface.renderableSeries.add(heatmapSeries);
+ * ```
+ */
+export declare class NonUniformHeatmapRenderableSeries extends BaseHeatmapRenderableSeries {
+    readonly type: ESeriesType;
+    /**
+     * Creates an instance of the {@link NonUniformHeatmapRenderableSeries}
+     * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
+     * native methods and access to our WebGL2 WebAssembly Drawing Engine
+     * @param options optional parameters of type {@link IHeatmapRenderableSeriesOptions} applied when constructing the series type
+     */
+    constructor(webAssemblyContext: TSciChart, options?: INonUniformHeatmapRenderableSeriesOptions);
+    /**
+     * @inheritDoc
+     */
+    protected newHitTestProvider(): IHitTestProvider;
+}

package/Charting/Visuals/RenderableSeries/NonUniformHeatmapRenderableSeries.js

@@ -0,0 +1,99 @@
+"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 __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NonUniformHeatmapRenderableSeries = void 0;
+var app_1 = require("../../../constants/app");
+var SeriesType_1 = require("../../../types/SeriesType");
+var BaseHeatmapRenderableSeries_1 = require("./BaseHeatmapRenderableSeries");
+var NonUniformHeatmapDataLabelProvider_1 = require("./DataLabels/NonUniformHeatmapDataLabelProvider");
+var NonUniformHeatmapDrawingProvider_1 = require("./DrawingProviders/NonUniformHeatmapDrawingProvider");
+var NonUniformHeatmapHitTestProvider_1 = require("./HitTest/NonUniformHeatmapHitTestProvider");
+/**
+ * @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}
+ * @description
+ * Heatmaps are 2-dimensional arrays of data, rendered as a color-map on the chart. The {@link NonUniformHeatmapRenderableSeries}
+ * assumes the cells are equal size, and spaced along the X,Y axis according to properties on the {@link NonUniformHeatmapDataSeries}.
+ *
+ * For a code sample how to initialize a non-uniform heatmap, see below
+ *
+ * ```ts
+ * // Create a 2D array with heat values
+ * const zValues = [
+ *     [0, 2, 3.4],
+ *     [5, 3, 4],
+ *     [3, 1.5, -1],
+ * ];
+ * // Define offsets of the heatmap cells
+ * const xCellOffsets = [0, 10, 25, 40];
+ * const yCellOffsets = [100, 200, 300, 400];
+ *
+ * // Create a UniformHeatmapDataSeries passing in zValues
+ * const heatmapDataSeries = new NonUniformHeatmapDataSeries(wasmContext, xCellOffsets, yCellOffsets, zValues);
+ *
+ * // Create a Heatmap RenderableSeries with the color map. ColorMap.minimum/maximum defines the values in
+ * // HeatmapDataSeries which correspond to gradient stops at 0..1
+ * const heatmapSeries = new NonUniformHeatmapRenderableSeries(wasmContext, {
+ *     dataSeries: heatmapDataSeries,
+ *     colorMap: new HeatmapColorMap({
+ *         minimum: 0,
+ *         maximum: 200,
+ *         gradientStops: [
+ *             { offset: 0, color: "#00008B" },
+ *             { offset: 0.2, color: "#6495ED" },
+ *             { offset: 0.4, color: "#006400" },
+ *             { offset: 0.6, color: "#7FFF00" },
+ *             { offset: 0.8, color: "#FFFF00" },
+ *             { offset: 1.0, color: "#FF0000" }
+ *         ]
+ *     })
+ * });
+ *
+ * // Add heatmap to the chart
+ * sciChartSurface.renderableSeries.add(heatmapSeries);
+ * ```
+ */
+var NonUniformHeatmapRenderableSeries = /** @class */ (function (_super) {
+    __extends(NonUniformHeatmapRenderableSeries, _super);
+    /**
+     * Creates an instance of the {@link NonUniformHeatmapRenderableSeries}
+     * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
+     * native methods and access to our WebGL2 WebAssembly Drawing Engine
+     * @param options optional parameters of type {@link IHeatmapRenderableSeriesOptions} applied when constructing the series type
+     */
+    function NonUniformHeatmapRenderableSeries(webAssemblyContext, options) {
+        var _this = _super.call(this, webAssemblyContext, options) || this;
+        _this.type = SeriesType_1.ESeriesType.NonUniformHeatmapSeries;
+        _this.drawingProviders = [];
+        if (!app_1.IS_TEST_ENV) {
+            _this.drawingProviders.push(new NonUniformHeatmapDrawingProvider_1.NonUniformHeatmapDrawingProvider(webAssemblyContext, _this));
+        }
+        if (!_this.dataLabelProviderProperty) {
+            _this.dataLabelProviderProperty = new NonUniformHeatmapDataLabelProvider_1.NonUniformHeatMapDataLabelProvider(options === null || options === void 0 ? void 0 : options.dataLabels);
+            _this.dataLabelProviderProperty.onAttach(_this.webAssemblyContext, _this);
+        }
+        return _this;
+    }
+    /**
+     * @inheritDoc
+     */
+    NonUniformHeatmapRenderableSeries.prototype.newHitTestProvider = function () {
+        return new NonUniformHeatmapHitTestProvider_1.NonUniformHeatmapHitTestProvider(this, this.webAssemblyContext);
+    };
+    return NonUniformHeatmapRenderableSeries;
+}(BaseHeatmapRenderableSeries_1.BaseHeatmapRenderableSeries));
+exports.NonUniformHeatmapRenderableSeries = NonUniformHeatmapRenderableSeries;

package/Charting/Visuals/RenderableSeries/RolloverModifier/RolloverModifierRenderableSeriesProps.d.ts

@@ -1,9 +1,14 @@
-import { RolloverModifier, TRolloverTooltipDataTemplate } from "../../../ChartModifiers/RolloverModifier";
+import { TRolloverTooltipDataTemplate } from "../../../ChartModifiers/RolloverModifier";
 import { SeriesInfo } from "../../../Model/ChartData/SeriesInfo";
 import { RolloverMarkerSvgAnnotation } from "../../Annotations/RolloverMarkerSvgAnnotation";
 import { RolloverTooltipSvgAnnotation } from "../../Annotations/RolloverTooltipSvgAnnotation";
 import { IRenderableSeries } from "../IRenderableSeries";
+import { EMousePosition } from "../../../../types/MousePosition";
 export declare type TRolloverTooltipSvgTemplate = (id: string, seriesInfo: SeriesInfo, rolloverTooltip: RolloverTooltipSvgAnnotation) => string;
+export interface IRolloverModifier {
+    getMousePosition: () => EMousePosition;
+    tooltipDataTemplate: TRolloverTooltipDataTemplate;
+}
 export declare class RolloverModifierRenderableSeriesProps {
     tooltip: RolloverTooltipSvgAnnotation;
     marker: RolloverMarkerSvgAnnotation;
@@ -14,7 +19,7 @@ export declare class RolloverModifierRenderableSeriesProps {
     tooltipTemplate: TRolloverTooltipSvgTemplate;
     tooltipLegendOffsetX: number;
     tooltipLegendOffsetY: number;
-    rolloverModifier: RolloverModifier;
+    rolloverModifier: IRolloverModifier;
     private tooltipLegendTemplateProperty;
     private invalidateParentCallback;
     private showsRolloverProperty;

package/Charting/Visuals/RenderableSeries/ShaderEffect.js

@@ -10,6 +10,7 @@ var PropertyChangedEventArgs_1 = require("../../../Core/PropertyChangedEventArgs
 var parseColor_1 = require("../../../utils/parseColor");
 var tsrExtensions_1 = require("../../../utils/tsrExtensions");
 var constants_1 = require("./constants");
+var NativeObject_1 = require("../Helpers/NativeObject");
 /**
  * A {@link ShaderEffect} can be applied to a {@link BaseRenderableSeries | RenderableSeries} via the
  * {@link BaseRenderableSeries.effect} property. The effect modifies the render output of the chart type.
@@ -96,10 +97,9 @@ var ShaderEffect = /** @class */ (function () {
         set: function (color) {
             this.colorProperty = color;
             var colorArgb = (0, parseColor_1.parseColorToTArgb)(color);
-            var tsrVector4 = new this.webAssemblyContext.TSRVector4();
+            var tsrVector4 = (0, NativeObject_1.getVector4)(this.webAssemblyContext, 0, 0, 0, 0);
             (0, tsrExtensions_1.updateTsrVector4)(colorArgb, tsrVector4);
             this.nativeEffect.SetColor(tsrVector4);
-            (0, Deleter_1.deleteSafe)(tsrVector4);
             this.notifyPropertyChanged(constants_1.PROPERTY.COLOR);
         },
         enumerable: false,

package/Charting/Visuals/RenderableSeries/SplineBandRenderableSeries.js

@@ -54,8 +54,9 @@ var SplineBandRenderableSeries = /** @class */ (function (_super) {
      * @param options optional parameters of type {@link ISplineBandRenderableSeriesOptions} applied when constructing the series type
      */
     function SplineBandRenderableSeries(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.SplineBandSeries;
         _this.warnOnSplineFailure = true;
         _this.isSplineProperty = true;

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

@@ -3,11 +3,10 @@ import { NumberRange } from "../../../Core/NumberRange";
 import { ESeriesType } from "../../../types/SeriesType";
 import { SCRTDoubleVector, TSciChart } from "../../../types/TSciChart";
 import { SeriesAnimation } from "./Animations/SeriesAnimation";
-import { BaseLineRenderableSeries } from "./BaseLineRenderableSeries";
+import { BaseLineRenderableSeries, IBaseLineRenderableSeriesOptions } from "./BaseLineRenderableSeries";
 import { TPalettingState } from "./DrawingProviders/BaseSeriesDrawingProvider";
-import { IBaseRenderableSeriesOptions } from "./IBaseRenderableSeriesOptions";
 import { ISpline } from "./ISpline";
-export interface ISplineLineRenderableSeriesOptions extends IBaseRenderableSeriesOptions {
+export interface ISplineLineRenderableSeriesOptions extends IBaseLineRenderableSeriesOptions {
     /**
      * A number of interpolation points being used for the Spline,
      * where value 0 means no interpolation.

package/Charting/Visuals/RenderableSeries/SplineLineRenderableSeries.js

@@ -52,8 +52,9 @@ var SplineLineRenderableSeries = /** @class */ (function (_super) {
      * @param options optional parameters of type {@link ISplineLineRenderableSeriesOptions} applied when constructing the series type
      */
     function SplineLineRenderableSeries(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.SplineLineSeries;
         _this.warnOnSplineFailure = true;
         _this.isSplineProperty = true;

package/Charting/Visuals/RenderableSeries/SplineMountainRenderableSeries.js

@@ -52,8 +52,9 @@ var SplineMountainRenderableSeries = /** @class */ (function (_super) {
      * @param options optional parameters of type {@link ISplineMountainRenderableSeriesOptions} applied when constructing the series type
      */
     function SplineMountainRenderableSeries(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.SplineMountainSeries;
         _this.warnOnSplineFailure = true;
         _this.isSplineProperty = true;

package/Charting/Visuals/RenderableSeries/StackedColumnCollection.js

@@ -70,8 +70,9 @@ var StackedColumnCollection = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link IStackedColumnCollectionOptions} to configure the series
      */
     function StackedColumnCollection(webAssemblyContext, options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, webAssemblyContext, options) || this;
+        _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = SeriesType_1.ESeriesType.StackedColumnCollection;
         _this.seriesGroups = {};
         _this.dataPointWidthProperty = 0.5;

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

@@ -1,6 +1,7 @@
 import { ESeriesType } from "../../../types/SeriesType";
 import { TSciChart } from "../../../types/TSciChart";
 import { CoordinateCalculatorBase } from "../../Numerics/CoordinateCalculators/CoordinateCalculatorBase";
+import { IThemeProvider } from "../../Themes/IThemeProvider";
 import { SciChartSurface } from "../SciChartSurface";
 import { TDpiChangedEventArgs } from "../TextureManager/DpiHelper";
 import { BaseStackedCollection } from "./BaseStackedCollection";
@@ -189,5 +190,7 @@ export declare class StackedColumnRenderableSeries extends BaseStackedRenderable
     set stackedGroupId(value: string);
     toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;
     /** @inheritDoc */
+    resolveAutoColors(index: number, maxSeries: number, theme: IThemeProvider): void;
+    /** @inheritDoc */
     protected newHitTestProvider(): IHitTestProvider;
 }

package/Charting/Visuals/RenderableSeries/StackedColumnRenderableSeries.js

@@ -20,6 +20,7 @@ var Deleter_1 = require("../../../Core/Deleter");
 var SeriesType_1 = require("../../../types/SeriesType");
 var BrushCache_1 = require("../../Drawing/BrushCache");
 var Pen2DCache_1 = require("../../Drawing/Pen2DCache");
+var IThemeProvider_1 = require("../../Themes/IThemeProvider");
 var SciChartSurfaceBase_1 = require("../SciChartSurfaceBase");
 var BaseStackedRenderableSeries_1 = require("./BaseStackedRenderableSeries");
 var constants_1 = require("./constants");
@@ -71,8 +72,9 @@ var StackedColumnRenderableSeries = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link IStackedColumnRenderableSeriesOptions} to configure the series
      */
     function StackedColumnRenderableSeries(webAssemblyContext, options) {
+        var _this = this;
         var _a, _b, _c, _d, _e;
-        var _this = _super.call(this, webAssemblyContext, options) || this;
+        _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = SeriesType_1.ESeriesType.StackedColumnSeries;
         _this.fillProperty = "#7e8486";
         _this.spacingProperty = 0;
@@ -112,6 +114,7 @@ var StackedColumnRenderableSeries = /** @class */ (function (_super) {
         this.parentCollection = parentCollection;
         this.getParentSurfaceFn = getParentSurfaceFn;
         this.notifyParentPropertyChangedFn = notifyPropertyChangedFn;
+        //this.invalidateParentCallback = () => parentCollection.invalidateParentCallback();
         this.getColumnWidthFn = getColumnWidthFn;
         var _a = this, stroke = _a.stroke, strokeThickness = _a.strokeThickness, fill = _a.fill, opacity = _a.opacity;
         (0, Pen2DCache_1.createPenInCache)(this.strokePenCache, stroke, strokeThickness, opacity);
@@ -177,7 +180,7 @@ var StackedColumnRenderableSeries = /** @class */ (function (_super) {
          * Gets or sets the Fill of the column chart as an HTML color code
          */
         get: function () {
-            return this.fillProperty;
+            return (0, IThemeProvider_1.stripAutoColor)(this.fillProperty);
         },
         /**
          * Gets or sets the Fill of the column chart as an HTML color code
@@ -292,6 +295,14 @@ var StackedColumnRenderableSeries = /** @class */ (function (_super) {
         Object.assign(json.options, options);
         return json;
     };
+    /** @inheritDoc */
+    StackedColumnRenderableSeries.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);
+        }
+    };
     // PROTECTED
     /** @inheritDoc */
     StackedColumnRenderableSeries.prototype.newHitTestProvider = function () {

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;