scichart 2.2.2417 → 3.0.0-beta.230

package/Charting/Visuals/RenderableSeries/BaseRenderableSeries.js

@@ -23,6 +23,7 @@ var XyPointSeriesResampled_1 = require("../../Model/PointSeries/XyPointSeriesRes
 var XyPointSeriesWrapped_1 = require("../../Model/PointSeries/XyPointSeriesWrapped");
 var ExtremeResamplerHelper_1 = require("../../Numerics/Resamplers/ExtremeResamplerHelper");
 var ResamplingMode_1 = require("../../Numerics/Resamplers/ResamplingMode");
+var IThemeProvider_1 = require("../../Themes/IThemeProvider");
 var AxisCore_1 = require("../Axis/AxisCore");
 var SciChartDefaults_1 = require("../SciChartDefaults");
 var SciChartSurfaceBase_1 = require("../SciChartSurfaceBase");
@@ -33,6 +34,7 @@ var RolloverModifierRenderableSeriesProps_1 = require("./RolloverModifier/Rollov
 var SeriesHoveredArgs_1 = require("./SeriesHoveredArgs");
 var SeriesSelectedArgs_1 = require("./SeriesSelectedArgs");
 var SeriesVisibleChangedArgs_1 = require("./SeriesVisibleChangedArgs");
+var DataLabelProviderType_1 = require("../../../types/DataLabelProviderType");
 /**
  * @summary Defines the base class to a Render Series (or Chart Type) in SciChart's High Performance Real-time
  * {@link https://www.scichart.com/javascript-chart-features | JavaScript Charts}
@@ -186,6 +188,20 @@ var BaseRenderableSeries = /** @class */ (function () {
         }
         this.onDpiChanged = this.onDpiChanged.bind(this);
         this.resamplerHelper = new ExtremeResamplerHelper_1.ExtremeResamplerHelper(webAssemblyContext);
+        if (options === null || options === void 0 ? void 0 : options.dataLabelProvider) {
+            if (!("draw" in options.dataLabelProvider)) {
+                if (options.dataLabelProvider.type === DataLabelProviderType_1.EDataLabelProviderType.Custom) {
+                    options.dataLabelProvider = (0, classFactory_1.createType)(BaseType_1.EBaseType.DataLabelProvider, options.dataLabelProvider.customType, webAssemblyContext, options.dataLabelProvider.options);
+                }
+                else {
+                    options.dataLabelProvider = (0, classFactory_1.createType)(BaseType_1.EBaseType.DataLabelProvider, options.dataLabelProvider.type, webAssemblyContext, options.dataLabelProvider.options);
+                }
+            }
+        }
+        this.dataLabelProviderProperty = options === null || options === void 0 ? void 0 : options.dataLabelProvider;
+        if (this.dataLabelProviderProperty) {
+            this.dataLabelProviderProperty.onAttach(webAssemblyContext, this);
+        }
     }
     /** @inheritDoc */
     BaseRenderableSeries.prototype.applyTheme = function (themeProvider) {
@@ -358,12 +374,14 @@ var BaseRenderableSeries = /** @class */ (function () {
     Object.defineProperty(BaseRenderableSeries.prototype, "stroke", {
         /** @inheritDoc */
         get: function () {
-            return this.strokeProperty;
+            return (0, IThemeProvider_1.stripAutoColor)(this.strokeProperty);
         },
         /** @inheritDoc */
         set: function (htmlColorCode) {
-            this.strokeProperty = htmlColorCode;
-            this.notifyPropertyChanged(constants_1.PROPERTY.STROKE);
+            if (this.strokeProperty !== htmlColorCode) {
+                this.strokeProperty = htmlColorCode;
+                this.notifyPropertyChanged(constants_1.PROPERTY.STROKE);
+            }
         },
         enumerable: false,
         configurable: true
@@ -375,8 +393,10 @@ var BaseRenderableSeries = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (value) {
-            this.strokeThicknessProperty = value;
-            this.notifyPropertyChanged(constants_1.PROPERTY.STROKE_THICKNESS);
+            if (this.strokeThicknessProperty !== value) {
+                this.strokeThicknessProperty = value;
+                this.notifyPropertyChanged(constants_1.PROPERTY.STROKE_THICKNESS);
+            }
         },
         enumerable: false,
         configurable: true
@@ -388,8 +408,10 @@ var BaseRenderableSeries = /** @class */ (function () {
         },
         /** @inheritDoc */
         set: function (value) {
-            this.opacityProperty = value;
-            this.notifyPropertyChanged(constants_1.PROPERTY.OPACITY);
+            if (this.opacityProperty !== value) {
+                this.opacityProperty = value;
+                this.notifyPropertyChanged(constants_1.PROPERTY.OPACITY);
+            }
         },
         enumerable: false,
         configurable: true
@@ -539,6 +561,10 @@ var BaseRenderableSeries = /** @class */ (function () {
             finally {
                 renderContext.popShaderEffect();
             }
+            if (this.dataLabelProvider) {
+                this.dataLabelProvider.generateDataLabels(renderContext, renderPassData);
+                // Don't draw Text here. Renderer will call draw once all text has been created to allow for global layout adjustments
+            }
         }
     };
     /** @inheritDoc */
@@ -550,6 +576,7 @@ var BaseRenderableSeries = /** @class */ (function () {
         this.effect = (0, Deleter_1.deleteSafe)(this.effect);
         (_a = this.pointMarker) === null || _a === void 0 ? void 0 : _a.delete();
         this.resamplerHelper = (0, Deleter_1.deleteSafe)(this.resamplerHelper);
+        this.pointSeries = (0, Deleter_1.deleteSafe)(this.pointSeries);
     };
     /** @inheritDoc */
     BaseRenderableSeries.prototype.getXRange = function () {
@@ -679,7 +706,7 @@ var BaseRenderableSeries = /** @class */ (function () {
     };
     /** @inheritDoc */
     BaseRenderableSeries.prototype.toJSON = function (excludeData) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (excludeData === void 0) { excludeData = false; }
         var paletteProvider;
         if (this.paletteProvider) {
@@ -707,25 +734,33 @@ var BaseRenderableSeries = /** @class */ (function () {
             yAxisId: this.yAxisId,
             animation: this.animation,
             resamplingMode: this.resamplingMode,
-            resamplingPrecision: this.resamplingPrecision
+            resamplingPrecision: this.resamplingPrecision,
+            // @ts-ignore
+            dataLabelProvider: (_c = this.dataLabelProvider) === null || _c === void 0 ? void 0 : _c.toJSON()
             // onSelectedChanged: this.onSelectedChanged
         };
-        if (((_c = this.dataSeries) === null || _c === void 0 ? void 0 : _c.type) === IDataSeries_1.EDataSeriesType.Xy) {
+        if (((_d = this.dataSeries) === null || _d === void 0 ? void 0 : _d.type) === IDataSeries_1.EDataSeriesType.Xy) {
             return { type: this.type, options: options, xyData: this.dataSeries.toJSON(excludeData) };
         }
-        else if (((_d = this.dataSeries) === null || _d === void 0 ? void 0 : _d.type) === IDataSeries_1.EDataSeriesType.Xyy) {
+        else if (((_e = this.dataSeries) === null || _e === void 0 ? void 0 : _e.type) === IDataSeries_1.EDataSeriesType.Xyy) {
             return { type: this.type, options: options, xyyData: this.dataSeries.toJSON(excludeData) };
         }
-        else if (((_e = this.dataSeries) === null || _e === void 0 ? void 0 : _e.type) === IDataSeries_1.EDataSeriesType.Xyz) {
+        else if (((_f = this.dataSeries) === null || _f === void 0 ? void 0 : _f.type) === IDataSeries_1.EDataSeriesType.Xyz) {
             return { type: this.type, options: options, xyzData: this.dataSeries.toJSON(excludeData) };
         }
-        else if (((_f = this.dataSeries) === null || _f === void 0 ? void 0 : _f.type) === IDataSeries_1.EDataSeriesType.Ohlc) {
+        else if (((_g = this.dataSeries) === null || _g === void 0 ? void 0 : _g.type) === IDataSeries_1.EDataSeriesType.Ohlc) {
             return { type: this.type, options: options, ohlcData: this.dataSeries.toJSON(excludeData) };
         }
-        else if (((_g = this.dataSeries) === null || _g === void 0 ? void 0 : _g.type) === IDataSeries_1.EDataSeriesType.Hlc) {
+        else if (((_h = this.dataSeries) === null || _h === void 0 ? void 0 : _h.type) === IDataSeries_1.EDataSeriesType.Hlc) {
             return { type: this.type, options: options, hlcData: this.dataSeries.toJSON(excludeData) };
         }
-        else if (((_h = this.dataSeries) === null || _h === void 0 ? void 0 : _h.type) === IDataSeries_1.EDataSeriesType.HeatmapUniform) {
+        else if (((_j = this.dataSeries) === null || _j === void 0 ? void 0 : _j.type) === IDataSeries_1.EDataSeriesType.XyText) {
+            return { type: this.type, options: options, xyTextData: this.dataSeries.toJSON(excludeData) };
+        }
+        else if (((_k = this.dataSeries) === null || _k === void 0 ? void 0 : _k.type) === IDataSeries_1.EDataSeriesType.HeatmapUniform) {
+            return { type: this.type, options: options, heatmapData: this.dataSeries.toJSON(excludeData) };
+        }
+        else if (((_l = this.dataSeries) === null || _l === void 0 ? void 0 : _l.type) === IDataSeries_1.EDataSeriesType.HeatmapNonUniform) {
             return { type: this.type, options: options, heatmapData: this.dataSeries.toJSON(excludeData) };
         }
         else {
@@ -803,6 +838,7 @@ var BaseRenderableSeries = /** @class */ (function () {
                 this.pointSeries.xRange = rp.xVisibleRange;
             }
             this.resamplerHelper.resampleIntoPointSeries(this.webAssemblyContext, rp, this.dataSeries.getNativeXValues(), this.dataSeries.getNativeYValues(), this.pointSeries.intIndexes, this.pointSeries.xValues, this.pointSeries.yValues, false);
+            // Always update Indexes as we need them in order to get metadata for resampled series
             this.pointSeries.updateIndexes();
             this.pointSeries.clearIntIndexes();
             // this.pointSeries.debugOutputForUnitTests();
@@ -828,6 +864,7 @@ var BaseRenderableSeries = /** @class */ (function () {
             var seriesTypeSupportsResampling = ![
                 SeriesType_1.ESeriesType.UniformContoursSeries,
                 SeriesType_1.ESeriesType.UniformHeatmapSeries,
+                SeriesType_1.ESeriesType.NonUniformHeatmapSeries,
                 SeriesType_1.ESeriesType.ScatterSeries,
                 SeriesType_1.ESeriesType.ErrorBarsSeries
             ].includes(this.type);
@@ -849,6 +886,37 @@ var BaseRenderableSeries = /** @class */ (function () {
     BaseRenderableSeries.prototype.needsResampling = function (rp) {
         return this.resamplerHelper.needsResampling(rp, this.getNativeXValues());
     };
+    Object.defineProperty(BaseRenderableSeries.prototype, "dataLabelProvider", {
+        /** @inheritDoc */
+        get: function () {
+            return this.dataLabelProviderProperty;
+        },
+        /** @inheritDoc */
+        set: function (provider) {
+            this.dataLabelProviderProperty = provider;
+            provider.onAttach(this.webAssemblyContext, this);
+            this.notifyPropertyChanged(constants_1.PROPERTY.SERIES_TEXT_PROVIDER);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    /** @inheritDoc */
+    BaseRenderableSeries.prototype.resolveAutoColors = function (index, maxSeries, theme) {
+        if (this.strokeProperty.startsWith(IThemeProvider_1.AUTO_COLOR)) {
+            var color = this.parentSurface.themeProvider.getStrokeColor(index, maxSeries, this.webAssemblyContext);
+            this.stroke = IThemeProvider_1.AUTO_COLOR + this.adjustAutoColor("stroke", color);
+        }
+        if (this.pointMarker) {
+            this.pointMarker.resolveAutoColors(index, maxSeries, theme);
+        }
+        if (this.dataLabelProvider) {
+            this.dataLabelProvider.resolveAutoColors(index, maxSeries, theme);
+        }
+    };
+    /** @inheritDoc */
+    BaseRenderableSeries.prototype.adjustAutoColor = function (propertyName, color) {
+        return color;
+    };
     /**
      * Sets initial and end animation vectors
      * @param animation
@@ -901,6 +969,8 @@ var BaseRenderableSeries = /** @class */ (function () {
         var dataSeries = this.dataSeries;
         if (dataSeries) {
             dataSeries.updateAnimationProperties(progress, animation);
+            // force pointseries to be recreated otherwise animations will not work for resampled data
+            this.currentRenderPassData = undefined;
         }
         if (this.invalidateParentCallback) {
             this.invalidateParentCallback();
@@ -984,17 +1054,23 @@ var getDataPointWidth = function (xValues, xCoordCalc, seriesViewRectWidth, widt
         dataPointWidth = Math.min(dataPointWidth, xCoordCalc.getCoordinate(xValues.get(0)) * 2);
     }
     var candleWidth = Math.floor(dataPointWidth * widthFraction);
-    if (candleWidth <= 1 || candleWidth % 2 !== 0) {
+    if (candleWidth % 2 !== 0) {
         candleWidth -= 1;
     }
+    if (candleWidth <= 1) {
+        candleWidth = 1;
+    }
     return candleWidth;
 };
 exports.getDataPointWidth = getDataPointWidth;
 /** @ignore */
 var getDelta = function (_a) {
     var pointSize = _a.pointSize, areaSize = _a.areaSize, range = _a.range;
+    if (areaSize === 0) {
+        return 0;
+    }
     var pointScaled = pointSize * DpiHelper_1.DpiHelper.PIXEL_RATIO;
     var k = areaSize / (areaSize - pointScaled);
-    return (Math.abs(range.max - range.min) * (k - 1)) / 2;
+    return (Math.abs(range.diff) * (k - 1)) / 2;
 };
 exports.getDelta = getDelta;

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

@@ -20,6 +20,7 @@ import { SciChartSurface } from "../SciChartSurface";
 import { TDpiChangedEventArgs } from "../TextureManager/DpiHelper";
 import { SeriesAnimation } from "./Animations/SeriesAnimation";
 import { BaseStackedRenderableSeries } from "./BaseStackedRenderableSeries";
+import { BaseDataLabelProvider } from "./DataLabels/BaseDataLabelProvider";
 import { TPalettingState } from "./DrawingProviders/BaseSeriesDrawingProvider";
 import { ISeriesDrawingProvider } from "./DrawingProviders/ISeriesDrawingProvider";
 import { HitTestInfo } from "./HitTest/HitTestInfo";
@@ -28,8 +29,8 @@ import { IRenderableSeries } from "./IRenderableSeries";
 import { RolloverModifierRenderableSeriesProps } from "./RolloverModifier/RolloverModifierRenderableSeriesProps";
 import { SeriesHoveredArgs } from "./SeriesHoveredArgs";
 import { SeriesSelectedArgs } from "./SeriesSelectedArgs";
-import { ShaderEffect } from "./ShaderEffect";
 import { SeriesVisibleChangedArgs } from "./SeriesVisibleChangedArgs";
+import { ShaderEffect } from "./ShaderEffect";
 /**
  * Options to pass to the {@link BaseStackedCollection} constructor
  */
@@ -325,7 +326,13 @@ export declare abstract class BaseStackedCollection<T extends BaseStackedRendera
      */
     getCurrentRenderPassData(): RenderPassData;
     /** @inheritDoc */
+    get dataLabelProvider(): BaseDataLabelProvider;
+    /** @inheritDoc */
     toJSON(excludeData?: boolean): TSeriesDefinition;
+    /** @inheritDoc */
+    resolveAutoColors(index: number, maxSeries: number, theme: IThemeProvider): void;
+    /** @inheritDoc */
+    adjustAutoColor(propertyName: string, color: string): string;
     protected isAllDataSeriesSet(): boolean;
     /**
      * notifies listeners to {@link invalidateParentCallback} and redraws the {@link SciChartSurface}

package/Charting/Visuals/RenderableSeries/BaseStackedCollection.js

@@ -38,8 +38,9 @@ var BaseStackedCollection = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link IBaseStackedCollectionOptions} to configure the series
      */
     function BaseStackedCollection(webAssemblyContext, options) {
+        var _this = this;
         var _a, _b, _c, _d;
-        var _this = _super.call(this) || this;
+        _this = _super.call(this) || this;
         /** @inheritDoc */
         _this.id = (0, guid_1.generateGuid)();
         /** @inheritDoc */
@@ -617,6 +618,14 @@ var BaseStackedCollection = /** @class */ (function (_super) {
     BaseStackedCollection.prototype.getCurrentRenderPassData = function () {
         throw Error("getCurrentRenderPassData method is not supported for BaseStackedCollection");
     };
+    Object.defineProperty(BaseStackedCollection.prototype, "dataLabelProvider", {
+        /** @inheritDoc */
+        get: function () {
+            return undefined;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /** @inheritDoc */
     BaseStackedCollection.prototype.toJSON = function (excludeData) {
         if (excludeData === void 0) { excludeData = false; }
@@ -634,6 +643,17 @@ var BaseStackedCollection = /** @class */ (function (_super) {
         // @ts-ignore
         return { type: this.type, series: series, options: options };
     };
+    /** @inheritDoc */
+    BaseStackedCollection.prototype.resolveAutoColors = function (index, maxSeries, theme) {
+        for (var i = 0; i < this.size(); i++) {
+            var rs = this.get(i);
+            rs.resolveAutoColors(index + i, maxSeries, theme);
+        }
+    };
+    /** @inheritDoc */
+    BaseStackedCollection.prototype.adjustAutoColor = function (propertyName, color) {
+        return color;
+    };
     BaseStackedCollection.prototype.isAllDataSeriesSet = function () {
         var isDataSeriesSet = true;
         this.asArray().forEach(function (el) {

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

@@ -78,6 +78,7 @@ export declare abstract class BaseStackedRenderableSeries extends BaseRenderable
      * native methods and access to our WebGL2 WebAssembly Drawing Engine
      */
     protected constructor(webAssemblyContext: TSciChart, options?: IBasedStackedRenderableSeriesOptions);
+    protected dataSeriesDataChanged(): void;
     /**
      * @inheritDoc
      */

package/Charting/Visuals/RenderableSeries/BaseStackedRenderableSeries.js

@@ -22,6 +22,7 @@ var StackedXySeriesInfo_1 = require("../../Model/ChartData/StackedXySeriesInfo")
 var IDataSeries_1 = require("../../Model/IDataSeries");
 var ResamplingMode_1 = require("../../Numerics/Resamplers/ResamplingMode");
 var BaseRenderableSeries_1 = require("./BaseRenderableSeries");
+var constants_1 = require("./constants");
 var RolloverModifierRenderableSeriesProps_1 = require("./RolloverModifier/RolloverModifierRenderableSeriesProps");
 /**
  * Base class for stacked mountain, column series in SciChart's High Performance Real-time
@@ -52,6 +53,9 @@ var BaseStackedRenderableSeries = /** @class */ (function (_super) {
         _this.accumulatedFinalAnimationValues = new webAssemblyContext.SCRTDoubleVector();
         return _this;
     }
+    BaseStackedRenderableSeries.prototype.dataSeriesDataChanged = function () {
+        this.notifyPropertyChanged(constants_1.PROPERTY.DATA_SERIES);
+    };
     // PUBLIC
     /**
      * @inheritDoc

package/Charting/Visuals/RenderableSeries/DataLabels/BandSeriesDataLabelProvider.d.ts

@@ -0,0 +1,43 @@
+import { Point } from "../../../../Core/Point";
+import { EDataLabelProviderType } from "../../../../types/DataLabelProviderType";
+import { TSRTextBounds } from "../../../../types/TSciChart";
+import { WebGlRenderContext2D } from "../../../Drawing/WebGlRenderContext2D";
+import { RenderPassData } from "../../../Services/RenderPassData";
+import { DataLabelState } from "./DataLabelState";
+import { ILineSeriesDataLabelProviderOptions, LineSeriesDataLabelProvider } from "./LineSeriesDataLabelProvider";
+export interface IBandSeriesDataLabelProviderOptions extends ILineSeriesDataLabelProviderOptions {
+    /**
+     * Sets whether to render a single label with both y and y1 values, in the center of the band, or separate labels for each line.
+     * Default false.
+     */
+    singleLabel?: boolean;
+}
+export declare class BandSeriesDataLabelProvider extends LineSeriesDataLabelProvider {
+    readonly type: EDataLabelProviderType;
+    protected state1: DataLabelState;
+    private singleLabelProperty;
+    constructor(options?: IBandSeriesDataLabelProviderOptions);
+    /**
+     * Gets or Sets whether to render a single label with both y and y1 values, in the center of the band, or separate labels for each line.
+     * Default false.
+     */
+    get singleLabel(): boolean;
+    set singleLabel(value: boolean);
+    getText(state: DataLabelState): string;
+    getSingleLabelText(xVal: number, yVal: number, y1Val: number): string;
+    getPosition(state: DataLabelState, textBounds: TSRTextBounds): Point;
+    /**
+     * When doing separate labels for each line (ie singleLabel = false) this is used to create a provider to generate the labels for the y1 series.
+     * By default this creates a LineSeriesDataLabelProvider using the same options as on the current provider.
+     */
+    getY1Provider(yProvider: BandSeriesDataLabelProvider): LineSeriesDataLabelProvider;
+    /** Generates labels using getText, getPosition, getColor.  Overrides manually set labels. */
+    generateDataLabels(renderContext: WebGlRenderContext2D, renderPassData: RenderPassData): void;
+    toJSON(): {
+        type: EDataLabelProviderType;
+        options: {
+            style: import("../../../../types/TDataLabelStyle").TDataLabelStyle;
+            color: string;
+        };
+    };
+}

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

@@ -0,0 +1,142 @@
+"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.BandSeriesDataLabelProvider = void 0;
+var Point_1 = require("../../../../Core/Point");
+var DataLabelProviderType_1 = require("../../../../types/DataLabelProviderType");
+var NumericFormat_1 = require("../../../../types/NumericFormat");
+var TextPosition_1 = require("../../../../types/TextPosition");
+var number_1 = require("../../../../utils/number");
+var DataLabelState_1 = require("./DataLabelState");
+var LineSeriesDataLabelProvider_1 = require("./LineSeriesDataLabelProvider");
+var BandSeriesDataLabelProvider = /** @class */ (function (_super) {
+    __extends(BandSeriesDataLabelProvider, _super);
+    function BandSeriesDataLabelProvider(options) {
+        var _this = this;
+        var _a;
+        _this = _super.call(this, options) || this;
+        _this.type = DataLabelProviderType_1.EDataLabelProviderType.Band;
+        _this.singleLabelProperty = false;
+        _this.singleLabelProperty = (_a = options === null || options === void 0 ? void 0 : options.singleLabel) !== null && _a !== void 0 ? _a : _this.singleLabelProperty;
+        return _this;
+    }
+    Object.defineProperty(BandSeriesDataLabelProvider.prototype, "singleLabel", {
+        /**
+         * Gets or Sets whether to render a single label with both y and y1 values, in the center of the band, or separate labels for each line.
+         * Default false.
+         */
+        get: function () {
+            return this.singleLabelProperty;
+        },
+        set: function (value) {
+            this.singleLabelProperty = value;
+            this.invalidateParent();
+        },
+        enumerable: false,
+        configurable: true
+    });
+    BandSeriesDataLabelProvider.prototype.getText = function (state) {
+        if (this.singleLabel) {
+            if (this.metaDataSelector) {
+                var index = state.renderPassData.pointSeries.indexes.get(state.index);
+                return this.metaDataSelector(state.parentSeries.dataSeries.getMetadataAt(index));
+            }
+            var usefinal = !this.updateTextInAnimation && state.parentSeries.isRunningAnimation;
+            var yval = usefinal ? state.yValAfterAnimation() : state.yVal();
+            this.state1.index = state.index;
+            var y1val = usefinal ? this.state1.yValAfterAnimation() : this.state1.yVal();
+            return this.getSingleLabelText(state.xVal(), yval, y1val);
+        }
+        else {
+            return _super.prototype.getText.call(this, state);
+        }
+    };
+    BandSeriesDataLabelProvider.prototype.getSingleLabelText = function (xVal, yVal, y1Val) {
+        var _a, _b, _c, _d;
+        if (yVal === yVal || y1Val === y1Val) {
+            var text = "";
+            if (yVal === yVal)
+                text = (0, number_1.formatNumber)(yVal, (_a = this.numericFormat) !== null && _a !== void 0 ? _a : NumericFormat_1.ENumericFormat.Decimal, (_b = this.precision) !== null && _b !== void 0 ? _b : 1);
+            if (yVal === yVal && y1Val === y1Val)
+                text += "\n";
+            if (y1Val === y1Val)
+                text += (0, number_1.formatNumber)(y1Val, (_c = this.numericFormat) !== null && _c !== void 0 ? _c : NumericFormat_1.ENumericFormat.Decimal, (_d = this.precision) !== null && _d !== void 0 ? _d : 1);
+            return text;
+        }
+        else {
+            return undefined;
+        }
+    };
+    BandSeriesDataLabelProvider.prototype.getPosition = function (state, textBounds) {
+        var _a, _b, _c, _d;
+        if (this.singleLabel) {
+            var x = state.xCoord();
+            if (this.horizontalTextPosition === TextPosition_1.EHorizontalTextPosition.Center) {
+                x -= textBounds.m_fWidth / 2;
+            }
+            else if (this.horizontalTextPosition === TextPosition_1.EHorizontalTextPosition.Left) {
+                x -= textBounds.m_fWidth + ((_b = (_a = this.style.padding) === null || _a === void 0 ? void 0 : _a.right) !== null && _b !== void 0 ? _b : 0);
+            }
+            else {
+                x += (_d = (_c = this.style.padding) === null || _c === void 0 ? void 0 : _c.right) !== null && _d !== void 0 ? _d : 0;
+            }
+            // Handle multiline
+            var yOffset = textBounds.m_fHeight - textBounds.GetLineBounds(0).m_fHeight;
+            var y = state.yCoord();
+            var y1 = this.state1.yCoord();
+            var yFinal = (y + y1 - yOffset) / 2;
+            return new Point_1.Point(x, yFinal);
+        }
+        else {
+            return _super.prototype.getPosition.call(this, state, textBounds);
+        }
+    };
+    /**
+     * When doing separate labels for each line (ie singleLabel = false) this is used to create a provider to generate the labels for the y1 series.
+     * By default this creates a LineSeriesDataLabelProvider using the same options as on the current provider.
+     */
+    BandSeriesDataLabelProvider.prototype.getY1Provider = function (yProvider) {
+        return new LineSeriesDataLabelProvider_1.LineSeriesDataLabelProvider(yProvider.toJSON().options);
+    };
+    /** Generates labels using getText, getPosition, getColor.  Overrides manually set labels. */
+    BandSeriesDataLabelProvider.prototype.generateDataLabels = function (renderContext, renderPassData) {
+        var _a;
+        if (!this.singleLabel) {
+            _super.prototype.generateDataLabels.call(this, renderContext, renderPassData);
+            var y1Provider = this.getY1Provider(this);
+            y1Provider.ySelector = function (ps) { return ps.y1Values; };
+            y1Provider.onAttach(this.webAssemblyContext, this.parentSeries);
+            y1Provider.generateDataLabels(renderContext, renderPassData);
+            (_a = this.dataLabels).push.apply(_a, y1Provider.dataLabels);
+        }
+        else {
+            var y1Values = renderPassData.pointSeries.y1Values;
+            this.state1 = new DataLabelState_1.DataLabelState(renderContext, renderPassData, this.style, this.color, y1Values, this.parentSeries);
+            _super.prototype.generateDataLabels.call(this, renderContext, renderPassData);
+        }
+    };
+    BandSeriesDataLabelProvider.prototype.toJSON = function () {
+        var json = _super.prototype.toJSON.call(this);
+        var options = {
+            singleLabel: this.singleLabel
+        };
+        Object.assign(json.options, options);
+        return json;
+    };
+    return BandSeriesDataLabelProvider;
+}(LineSeriesDataLabelProvider_1.LineSeriesDataLabelProvider));
+exports.BandSeriesDataLabelProvider = BandSeriesDataLabelProvider;

package/Charting/Visuals/RenderableSeries/DataLabels/BaseDataLabelProvider.d.ts

@@ -0,0 +1,92 @@
+import { Point } from "../../../../Core/Point";
+import { Rect } from "../../../../Core/Rect";
+import { EDataLabelProviderType } from "../../../../types/DataLabelProviderType";
+import { TDataLabelStyle } from "../../../../types/TDataLabelStyle";
+import { TSciChart } from "../../../../types/TSciChart";
+import { WebGlRenderContext2D } from "../../../Drawing/WebGlRenderContext2D";
+import { RenderPassData } from "../../../Services/RenderPassData";
+import { IThemeProvider } from "../../../Themes/IThemeProvider";
+import { IRenderableSeries } from "../IRenderableSeries";
+export declare type TDataLabel = {
+    text: string;
+    /** The start point for text drawing.
+     *  This is not the top left of the text rectangle, since the y value for text is on the alphabetic baseline
+     *  Difference is bounds.GetLineBounds(0).m_fHeight
+     */
+    position: Point;
+    /** The Rectangle that contains the label, relative to the seriesViewRect */
+    rect: Rect;
+    color?: number;
+    dataX: number;
+    dataY: number;
+};
+export interface IBaseDataLabelProviderOptions {
+    /**
+     * Sets the text style used for data labels. The style must be set, with fontFamily and fontSize set, in order for text to be drawn.
+     */
+    style?: TDataLabelStyle;
+    /**
+     * Sets the color for data labels.  Defaults to axis label color
+     */
+    color?: string;
+}
+export declare abstract class BaseDataLabelProvider {
+    readonly type: EDataLabelProviderType;
+    /**
+     * The text to draw, along with the sizes and positions.  Usually generated, but can be updated before final drawing
+     */
+    dataLabels: TDataLabel[];
+    /**
+     * The {@link TSciChart | SciChart 2D WebAssembly Context} containing native methods and
+     * access to our WebGL2 Engine and WebAssembly numerical methods
+     */
+    protected webAssemblyContext: TSciChart;
+    /**
+     * The Parent {@link IRenderableSeries | RenderableSeries}
+     */
+    protected parentSeries: IRenderableSeries;
+    protected styleProperty: TDataLabelStyle;
+    protected colorProperty: string;
+    /**
+     * Creates an instance of the {@link DataLabelProvider}
+     */
+    constructor(options?: IBaseDataLabelProviderOptions);
+    /**
+     * Called when a DataLabelProvider is attached to a parent {@link IRenderableSeries | RenderableSeries}
+     * @param webAssemblyContext
+     * @param parentSeries
+     */
+    onAttach(webAssemblyContext: TSciChart, parentSeries: IRenderableSeries): void;
+    /**
+     * Gets or sets the text style used for data labels. The style must be set, with fontFamily and fontSize set, in order for text to be drawn.
+     */
+    get style(): TDataLabelStyle;
+    /**
+     * Gets or sets the text style used for data labels. The style must be set, with fontFamily and fontSize set, in order for text to be drawn.
+     */
+    set style(value: TDataLabelStyle);
+    /**
+     * Gets or sets the color for data labels.  Defaults to axis label color
+     */
+    get color(): string;
+    /**
+     * Gets or sets the color for data labels.  Defaults to axis label color
+     */
+    set color(value: string);
+    /** Update the style.  Only the properties passed will be updated */
+    updateStyle(value: TDataLabelStyle): void;
+    /**
+     * Base behaviour is to do nothing.  Labels will only be drawn if they have been manually set
+     */
+    generateDataLabels(renderContext: WebGlRenderContext2D, renderPassData: RenderPassData): void;
+    draw(renderContext: WebGlRenderContext2D): void;
+    resolveAutoColors(index: number, maxSeries: number, theme: IThemeProvider): void;
+    toJSON(): {
+        type: EDataLabelProviderType;
+        options: {
+            style: TDataLabelStyle;
+            color: string;
+        };
+    };
+    protected invalidateParent(): void;
+}