scichart 2.1.2301 → 2.2.2351

package/Charting/Visuals/RenderableSeries/StackedMountainCollection.js

@@ -16,10 +16,10 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StackedMountainCollection = void 0;
-var Deleter_1 = require("../../../Core/Deleter");
 var NumberRange_1 = require("../../../Core/NumberRange");
 var SeriesType_1 = require("../../../types/SeriesType");
-var Pen2DCache_1 = require("../../Drawing/Pen2DCache");
+var XyyPointSeriesWrapped_1 = require("../../Model/PointSeries/XyyPointSeriesWrapped");
+var RenderPassData_1 = require("../../Services/RenderPassData");
 var BaseStackedCollection_1 = require("./BaseStackedCollection");
 var constants_1 = require("./constants");
 /**
@@ -64,13 +64,10 @@ var StackedMountainCollection = /** @class */ (function (_super) {
             (_a = arg.getOldItems()) === null || _a === void 0 ? void 0 : _a.forEach(_this.detachChildSeries);
             (_b = arg.getNewItems()) === null || _b === void 0 ? void 0 : _b.forEach(_this.attachChildSeries);
         });
-        _this.transparentPenCache = new Pen2DCache_1.Pen2DCache(webAssemblyContext);
         return _this;
     }
     /** @inheritDoc */
     StackedMountainCollection.prototype.delete = function () {
-        this.nativeDrawingProvider = (0, Deleter_1.deleteSafe)(this.nativeDrawingProvider);
-        this.transparentPenCache = (0, Deleter_1.deleteSafe)(this.transparentPenCache);
         _super.prototype.delete.call(this);
     };
     /** @inheritDoc */
@@ -114,23 +111,20 @@ var StackedMountainCollection = /** @class */ (function (_super) {
                 return;
             }
             this.updateAccumulatedVectors();
-            var isCategoryAxis = renderPassData.xCoordinateCalculator.isCategoryCoordinateCalculator;
-            var firstDataSeries = this.get(0).dataSeries;
-            var viewRect_1 = this.parentSurface.seriesViewRect;
-            var xValues_1 = isCategoryAxis ? firstDataSeries.getNativeIndexes() : firstDataSeries.getNativeXValues();
-            this.getVisibleSeries().forEach(function (el, index) {
-                var currAccumVec = el.accumulatedValues;
-                if (index === 0) {
-                    var accumulatedVector0 = _this.accumulatedValues0;
-                    var transparentPen = (0, Pen2DCache_1.getScrtPenFromCache)(_this.transparentPenCache);
-                    drawBand(_this.webAssemblyContext, renderContext, renderPassData, _this.nativeDrawingProvider, xValues_1, accumulatedVector0, currAccumVec, el.getFillBrush(), transparentPen, el.getStrokePen(), viewRect_1, el.isDigitalLine);
-                }
-                else {
-                    var previousEl = _this.getVisibleSeries()[index - 1];
-                    var prevAccumVec = previousEl.accumulatedValues;
-                    drawBand(_this.webAssemblyContext, renderContext, renderPassData, _this.nativeDrawingProvider, xValues_1, prevAccumVec, currAccumVec, el.getFillBrush(), previousEl.getStrokePen(), el.getStrokePen(), viewRect_1, el.isDigitalLine);
-                }
-            });
+            var xAxis_1 = this.parentSurface.getXAxisById(this.xAxisId);
+            var visibleSeries = this.getVisibleSeries();
+            // draw Stacked Series in reverse order to prevent overlapping with Point Markers
+            visibleSeries.reduceRight(function (nextSeries, series, index, collection) {
+                var currAccumVec = series.accumulatedValues;
+                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);
+                series.strokeY1 = index === 0 ? "transparent" : collection[index - 1].stroke;
+                series.strokeY1DashArray = index === 0 ? [] : collection[index - 1].strokeDashArray;
+                series.draw(renderContext, renderData);
+                return series;
+            }, undefined);
         }
     };
     /** @inheritDoc */
@@ -143,8 +137,16 @@ var StackedMountainCollection = /** @class */ (function (_super) {
     /** @inheritDoc */
     StackedMountainCollection.prototype.onAttach = function (scs) {
         _super.prototype.onAttach.call(this, scs);
-        this.nativeDrawingProvider = new this.webAssemblyContext.SCRTBandSeriesDrawingProvider();
-        (0, Pen2DCache_1.createPenInCache)(this.transparentPenCache, "transparent", 2, 0);
+        this.getVisibleSeries().forEach(function (series) {
+            series.onAttach(scs);
+        });
+    };
+    /** @inheritDoc */
+    StackedMountainCollection.prototype.onDetach = function () {
+        this.getVisibleSeries().forEach(function (series) {
+            series.onDetach();
+        });
+        _super.prototype.onDetach.call(this);
     };
     /** @inheritDoc */
     StackedMountainCollection.prototype.notifyPropertyChanged = function (propertyName) {
@@ -195,24 +197,3 @@ var StackedMountainCollection = /** @class */ (function (_super) {
     return StackedMountainCollection;
 }(BaseStackedCollection_1.BaseStackedCollection));
 exports.StackedMountainCollection = StackedMountainCollection;
-/** @ignore */
-var drawBand = function (wasmContext, renderContext, renderPassData, nativeDrawingProvider, xValues, yValues, y1Values, fillBrush, strokePen, strokePenY1, viewRect, isDigitalLine) {
-    var args = new wasmContext.SCRTBandDrawingParams();
-    args.forceShaderMethod = true;
-    args.verticalChart = renderPassData.isVerticalChart;
-    args.count = xValues.size();
-    args.isDigitalLine = isDigitalLine;
-    if (fillBrush) {
-        args.SetFillBrush(fillBrush);
-        args.SetFillBrush1(fillBrush);
-    }
-    if (strokePen) {
-        args.SetLinesPen(strokePen);
-    }
-    if (strokePenY1) {
-        args.SetLinesPen1(strokePenY1);
-    }
-    var nativeContext = renderContext.getNativeContext();
-    nativeDrawingProvider.DrawPointsVec(nativeContext, xValues, yValues, y1Values, renderPassData.xCoordinateCalculator.nativeCalculator, renderPassData.yCoordinateCalculator.nativeCalculator, args);
-    args.delete();
-};

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

@@ -1,5 +1,11 @@
+import { TPaletteProviderDefinition } from "../../../Builder/buildSeries";
 import { ESeriesType } from "../../../types/SeriesType";
 import { TSciChart } from "../../../types/TSciChart";
+import { WebGlRenderContext2D } from "../../Drawing/WebGlRenderContext2D";
+import { IPaletteProvider } from "../../Model/IPaletteProvider";
+import { IPointSeries } from "../../Model/PointSeries/IPointSeries";
+import { ResamplingParams } from "../../Numerics/Resamplers/ResamplingParams";
+import { RenderPassData } from "../../Services/RenderPassData";
 import { SciChartSurface } from "../SciChartSurface";
 import { TDpiChangedEventArgs } from "../TextureManager/DpiHelper";
 import { BaseStackedCollection } from "./BaseStackedCollection";
@@ -21,6 +27,18 @@ export interface IStackedMountainRenderableSeriesOptions extends IBasedStackedRe
      * The column strokeThickness
      */
     strokeThickness?: number;
+    /**
+     * The StrokeDashArray defines the stroke or dash pattern for the Y0 line.
+     * Accepts an array of values, e.g. [2,2] will have a line of length 2 and a gap of length 2.
+     */
+    strokeDashArray?: number[];
+    /**
+     * An optional {@link IPaletteProvider} which is used to provide per data-point coloring or paletting.
+     * @remarks See {@link IStrokePaletteProvider} for per data-point coloring of lines or strokes, {@link IFillPaletteProvider} for
+     * per data-point coloring of fills or series bodies, and {@link IPointMarkerPaletteProvider} for per data-point coloring of
+     * point-markers
+     */
+    paletteProvider?: IPaletteProvider | TPaletteProviderDefinition;
 }
 /**
  * @summary The {@link StackedMountainRenderableSeries} allows creating JavaScript Stacked Mountain charts
@@ -49,8 +67,9 @@ export interface IStackedMountainRenderableSeriesOptions extends IBasedStackedRe
 export declare class StackedMountainRenderableSeries extends BaseStackedRenderableSeries {
     readonly type = ESeriesType.StackedMountainSeries;
     private fillProperty;
-    private strokePenCache;
-    private fillBrushCache;
+    private strokeY1Property;
+    private strokeDashArrayProperty;
+    private strokeY1DashArrayProperty;
     /**
      * Creates an instance of the {@link StackedMountainRenderableSeries}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
@@ -58,10 +77,6 @@ export declare class StackedMountainRenderableSeries extends BaseStackedRenderab
      * @param options Optional parameters of type {@link IStackedMountainRenderableSeriesOptions} to configure the series
      */
     constructor(webAssemblyContext: TSciChart, options?: IStackedMountainRenderableSeriesOptions);
-    /**
-     * @inheritDoc
-     */
-    delete(): void;
     /**
      * Called internally when the {@link StackedMountainRenderableSeries} is attached to a parent {@link StackedMountainCollection}
      * @param parentCollection the parent {@link BaseStackedCollection}
@@ -69,22 +84,16 @@ export declare class StackedMountainRenderableSeries extends BaseStackedRenderab
      * @param notifyPropertyChangedFn function to notify property has changed
      */
     onAttachToParentCollection(parentCollection: BaseStackedCollection<BaseStackedRenderableSeries>, getParentSurfaceFn: () => SciChartSurface, notifyPropertyChangedFn: (propertyName: string) => void): void;
-    /**
-     * Gets the fill brush of the mountain as an HTML color code
-     */
-    getFillBrush(): import("../../../types/TSciChart").SCRTBrush;
-    /**
-     * Gets the stroke of the mountain as an HTML color code
-     */
-    getStrokePen(): import("../../../types/TSciChart").SCRTPen;
+    /** @inheritDoc */
+    onAttach(scs: SciChartSurface): void;
+    /** @inheritDoc */
+    onDetach(): void;
+    /** @inheritDoc */
+    draw(renderContext: WebGlRenderContext2D, renderPassData: RenderPassData): void;
     /**
      * @inheritDoc
      */
     onDpiChanged(args: TDpiChangedEventArgs): void;
-    /**
-     * @inheritDoc
-     */
-    notifyPropertyChanged(propertyName: string): void;
     /**
      * Gets or sets the fill brush of the mountain as an HTML color code
      */
@@ -93,7 +102,57 @@ export declare class StackedMountainRenderableSeries extends BaseStackedRenderab
      * Gets or sets the fill brush of the mountain as an HTML color code
      */
     set fill(fill: string);
+    /**
+     * Gets or sets the stroke color the Y1 values in the data-series.
+     * See associated {@link XyyDataSeries} for further information
+     *  @remarks This property is set internally to the value of a previous StackedMountainSeries.
+     */
+    get strokeY1(): string;
+    /**
+     * Gets or sets the stroke color the Y1 values in the data-series.
+     * See associated {@link XyyDataSeries} for further information
+     *  @remarks This property is set internally to the value of a previous StackedMountainSeries.
+     */
+    set strokeY1(strokeY1: string);
+    /**
+     * Gets or sets the fill color for when Y1 is less than Y as an HTML Color code
+     */
+    get fillY1(): string;
+    /**
+     * Gets or sets the fill color for when Y1 is less than Y as an HTML Color code
+     */
+    set fillY1(fillY1: string);
+    /**
+     * The StrokeDashArray defines the stroke or dash pattern for the Y0 line.
+     * Accepts an array of values, e.g. [2,2] will have a line of length 2 and a gap of length 2.
+     */
+    get strokeDashArray(): number[];
+    /**
+     * The StrokeDashArray defines the stroke or dash pattern for the Y0 line.
+     * Accepts an array of values, e.g. [2,2] will have a line of length 2 and a gap of length 2.
+     */
+    set strokeDashArray(strokeDashArray: number[]);
+    /**
+     * The strokeY1DashArray defines the stroke or dash pattern for the Y1 line.
+     * Accepts an array of values, e.g. [2,2] will have a line of length 2 and a gap of length 2.
+     * @remarks This property is set internally to the value of a previous StackedMountainSeries.
+     */
+    get strokeY1DashArray(): number[];
+    /**
+     * The strokeY1DashArray defines the stroke or dash pattern for the Y1 line.
+     * Accepts an array of values, e.g. [2,2] will have a line of length 2 and a gap of length 2.
+     * @remarks This property is set internally to the value of a previous StackedMountainSeries.
+     */
+    set strokeY1DashArray(strokeY1DashArray: number[]);
     toJSON(excludeData?: boolean): import("../../../Builder/buildSeries").TSeriesDefinition;
     /** @inheritDoc */
+    toPointSeries(resamplingParams?: ResamplingParams): IPointSeries;
+    /** @inheritDoc */
+    hasStrokePaletteProvider(): boolean;
+    /** @inheritDoc */
+    hasFillPaletteProvider(): boolean;
+    /** @inheritDoc */
+    hasPointMarkerPaletteProvider(): boolean;
+    /** @inheritDoc */
     protected newHitTestProvider(): IHitTestProvider;
 }

package/Charting/Visuals/RenderableSeries/StackedMountainRenderableSeries.js

@@ -16,13 +16,13 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StackedMountainRenderableSeries = void 0;
-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 XyPointSeriesWrapped_1 = require("../../Model/PointSeries/XyPointSeriesWrapped");
 var SciChartSurfaceBase_1 = require("../SciChartSurfaceBase");
 var BaseStackedRenderableSeries_1 = require("./BaseStackedRenderableSeries");
 var constants_1 = require("./constants");
+var BandSeriesDrawingProvider_1 = require("./DrawingProviders/BandSeriesDrawingProvider");
+var PointMarkerDrawingProvider_1 = require("./DrawingProviders/PointMarkerDrawingProvider");
 var StackedMountainSeriesHitTestProvider_1 = require("./HitTest/StackedMountainSeriesHitTestProvider");
 /**
  * @summary The {@link StackedMountainRenderableSeries} allows creating JavaScript Stacked Mountain charts
@@ -61,22 +61,20 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
         var _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = SeriesType_1.ESeriesType.StackedMountainSeries;
         _this.fillProperty = "#7e8486";
-        _this.strokePenCache = new Pen2DCache_1.Pen2DCache(webAssemblyContext);
-        _this.fillBrushCache = new BrushCache_1.BrushCache(webAssemblyContext);
+        _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.stroke = (_b = options === null || options === void 0 ? void 0 : options.stroke) !== null && _b !== void 0 ? _b : SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.mountainLineColor;
-        _this.strokeThickness = (_c = options === null || options === void 0 ? void 0 : options.strokeThickness) !== null && _c !== void 0 ? _c : 2;
+        _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, 
+        // TODO find more elegant way to pass this. In scope of https://abtsoftware.myjetbrains.com/youtrack/issue/SCJS-1109
+        _this, 
+        // StackedMountainRenderableSeries have reverse order of yValues and y1Values compared to FastBandRenderableSeries
+        function (ps) { return ps.y1Values; }, function (ps) { return ps.yValues; }), new PointMarkerDrawingProvider_1.PointMarkerDrawingProvider(webAssemblyContext, _this, function (ps) { return ps.y1Values; }));
         return _this;
     }
     // PUBLIC
-    /**
-     * @inheritDoc
-     */
-    StackedMountainRenderableSeries.prototype.delete = function () {
-        this.strokePenCache = (0, Deleter_1.deleteSafe)(this.strokePenCache);
-        this.fillBrushCache = (0, Deleter_1.deleteSafe)(this.fillBrushCache);
-        _super.prototype.delete.call(this);
-    };
     /**
      * Called internally when the {@link StackedMountainRenderableSeries} is attached to a parent {@link StackedMountainCollection}
      * @param parentCollection the parent {@link BaseStackedCollection}
@@ -90,21 +88,34 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
         this.parentCollection = parentCollection;
         this.getParentSurfaceFn = getParentSurfaceFn;
         this.notifyParentPropertyChangedFn = notifyPropertyChangedFn;
-        var _a = this, stroke = _a.stroke, strokeThickness = _a.strokeThickness, fill = _a.fill, opacity = _a.opacity;
-        (0, Pen2DCache_1.createPenInCache)(this.strokePenCache, stroke, strokeThickness, opacity);
-        (0, BrushCache_1.createBrushInCache)(this.fillBrushCache, fill, opacity);
     };
-    /**
-     * Gets the fill brush of the mountain as an HTML color code
-     */
-    StackedMountainRenderableSeries.prototype.getFillBrush = function () {
-        return (0, BrushCache_1.getScrtBrushFromCache)(this.fillBrushCache);
+    /** @inheritDoc */
+    StackedMountainRenderableSeries.prototype.onAttach = function (scs) {
+        if (this.invalidateParentCallback) {
+            throw new Error("Invalid operation in sciChartSurface.attachSeries, this series has already been attached to a SciChartSurface. Please detach it from a SciChartSurface before attaching to another");
+        }
+        this.invalidateParentCallback = scs.invalidateElement;
+        this.drawingProviders.forEach(function (dp) { return dp.onAttachSeries(); });
+        this.rolloverModifierProps.setInvalidateParentCallback(scs.invalidateElement);
     };
-    /**
-     * Gets the stroke of the mountain as an HTML color code
-     */
-    StackedMountainRenderableSeries.prototype.getStrokePen = function () {
-        return (0, Pen2DCache_1.getScrtPenFromCache)(this.strokePenCache);
+    /** @inheritDoc */
+    StackedMountainRenderableSeries.prototype.onDetach = function () {
+        this.invalidateParentCallback = undefined;
+        this.drawingProviders.forEach(function (dp) { return dp.onDetachSeries(); });
+        this.rolloverModifierProps.setInvalidateParentCallback(undefined);
+    };
+    /** @inheritDoc */
+    StackedMountainRenderableSeries.prototype.draw = function (renderContext, renderPassData) {
+        var _a;
+        this.currentRenderPassData = renderPassData;
+        (_a = this.hitTestProvider) === null || _a === void 0 ? void 0 : _a.update(renderPassData);
+        try {
+            renderContext.pushShaderEffect(this.effect);
+            this.drawingProviders.forEach(function (dp) { return dp.draw(renderContext, renderPassData); });
+        }
+        finally {
+            renderContext.popShaderEffect();
+        }
     };
     /**
      * @inheritDoc
@@ -113,20 +124,6 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
         _super.prototype.onDpiChanged.call(this, args);
         this.notifyPropertyChanged(constants_1.PROPERTY.STROKE);
     };
-    /**
-     * @inheritDoc
-     */
-    StackedMountainRenderableSeries.prototype.notifyPropertyChanged = function (propertyName) {
-        _super.prototype.notifyPropertyChanged.call(this, propertyName);
-        if (propertyName === constants_1.PROPERTY.STROKE ||
-            propertyName === constants_1.PROPERTY.STROKE_THICKNESS ||
-            propertyName === constants_1.PROPERTY.OPACITY) {
-            (0, Pen2DCache_1.createPenInCache)(this.strokePenCache, this.stroke, this.strokeThickness, this.opacity);
-        }
-        if (propertyName === constants_1.PROPERTY.FILL || propertyName === constants_1.PROPERTY.OPACITY) {
-            (0, BrushCache_1.createBrushInCache)(this.fillBrushCache, this.fill, this.opacity);
-        }
-    };
     Object.defineProperty(StackedMountainRenderableSeries.prototype, "fill", {
         // PROPERTIES
         /**
@@ -145,6 +142,85 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(StackedMountainRenderableSeries.prototype, "strokeY1", {
+        /**
+         * Gets or sets the stroke color the Y1 values in the data-series.
+         * See associated {@link XyyDataSeries} for further information
+         *  @remarks This property is set internally to the value of a previous StackedMountainSeries.
+         */
+        get: function () {
+            return this.strokeY1Property;
+        },
+        /**
+         * Gets or sets the stroke color the Y1 values in the data-series.
+         * See associated {@link XyyDataSeries} for further information
+         *  @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); });
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(StackedMountainRenderableSeries.prototype, "fillY1", {
+        /**
+         * Gets or sets the fill color for when Y1 is less than Y as an HTML Color code
+         */
+        get: function () {
+            return this.fillProperty;
+        },
+        /**
+         * Gets or sets the fill color for when Y1 is less than Y as an HTML Color code
+         */
+        set: function (fillY1) {
+            throw new Error("Setting fillY1 property is not supported on StackedMountainRenderableSeries");
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(StackedMountainRenderableSeries.prototype, "strokeDashArray", {
+        /**
+         * The StrokeDashArray defines the stroke or dash pattern for the Y0 line.
+         * Accepts an array of values, e.g. [2,2] will have a line of length 2 and a gap of length 2.
+         */
+        get: function () {
+            return this.strokeDashArrayProperty;
+        },
+        /**
+         * The StrokeDashArray defines the stroke or dash pattern for the Y0 line.
+         * Accepts an array of values, e.g. [2,2] will have a line of length 2 and a gap of length 2.
+         */
+        set: function (strokeDashArray) {
+            this.strokeDashArrayProperty = strokeDashArray;
+            this.notifyPropertyChanged(constants_1.PROPERTY.STROKE_DASH_ARRAY);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(StackedMountainRenderableSeries.prototype, "strokeY1DashArray", {
+        /**
+         * The strokeY1DashArray defines the stroke or dash pattern for the Y1 line.
+         * Accepts an array of values, e.g. [2,2] will have a line of length 2 and a gap of length 2.
+         * @remarks This property is set internally to the value of a previous StackedMountainSeries.
+         */
+        get: function () {
+            return this.strokeY1DashArrayProperty;
+        },
+        /**
+         * The strokeY1DashArray defines the stroke or dash pattern for the Y1 line.
+         * Accepts an array of values, e.g. [2,2] will have a line of length 2 and a gap of length 2.
+         * @remarks This property is set internally to the value of a previous StackedMountainSeries.
+         */
+        set: function (strokeY1DashArray) {
+            this.strokeY1DashArrayProperty = strokeY1DashArray;
+            // 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_DASH_ARRAY); });
+        },
+        enumerable: false,
+        configurable: true
+    });
     // PROPERTIES END
     StackedMountainRenderableSeries.prototype.toJSON = function (excludeData) {
         if (excludeData === void 0) { excludeData = false; }
@@ -152,11 +228,32 @@ var StackedMountainRenderableSeries = /** @class */ (function (_super) {
         var options = {
             fill: this.fill,
             stroke: this.stroke,
-            strokeThickness: this.strokeThickness
+            strokeThickness: this.strokeThickness,
+            strokeDashArray: this.strokeDashArray,
+            paletteProvider: this.paletteProvider
         };
         Object.assign(json.options, options);
         return json;
     };
+    /** @inheritDoc */
+    StackedMountainRenderableSeries.prototype.toPointSeries = function (resamplingParams) {
+        return new XyPointSeriesWrapped_1.XyPointSeriesWrapped(this.dataSeries);
+    };
+    /** @inheritDoc */
+    StackedMountainRenderableSeries.prototype.hasStrokePaletteProvider = function () {
+        var strokePalette = this.paletteProvider;
+        return (strokePalette === null || strokePalette === void 0 ? void 0 : strokePalette.overrideStrokeArgb) !== undefined;
+    };
+    /** @inheritDoc */
+    StackedMountainRenderableSeries.prototype.hasFillPaletteProvider = function () {
+        var fillPalette = this.paletteProvider;
+        return (fillPalette === null || fillPalette === void 0 ? void 0 : fillPalette.overrideFillArgb) !== undefined;
+    };
+    /** @inheritDoc */
+    StackedMountainRenderableSeries.prototype.hasPointMarkerPaletteProvider = function () {
+        var pointMarkerPalette = this.paletteProvider;
+        return (pointMarkerPalette === null || pointMarkerPalette === void 0 ? void 0 : pointMarkerPalette.overridePointMarkerArgb) !== undefined;
+    };
     // PROTECTED
     /** @inheritDoc */
     StackedMountainRenderableSeries.prototype.newHitTestProvider = function () {

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

@@ -40,6 +40,7 @@ export interface IXyScatterRenderableSeriesOptions extends IBaseRenderableSeries
  */
 export declare class XyScatterRenderableSeries extends BaseRenderableSeries {
     readonly type = ESeriesType.ScatterSeries;
+    private scatterOpacityProperty;
     /**
      * Creates an instance of the {@link XyScatterRenderableSeries}
      * @param webAssemblyContext The {@link TSciChart | SciChart WebAssembly Context} containing
@@ -51,4 +52,8 @@ export declare class XyScatterRenderableSeries extends BaseRenderableSeries {
     toPointSeries(rp?: ResamplingParams): IPointSeries;
     /** @inheritDoc */
     protected newHitTestProvider(): IHitTestProvider;
+    /** @inheritDoc */
+    get opacity(): number;
+    /** @inheritDoc */
+    set opacity(value: number);
 }

package/Charting/Visuals/RenderableSeries/XyScatterRenderableSeries.js

@@ -20,6 +20,7 @@ var SeriesType_1 = require("../../../types/SeriesType");
 var XyPointSeriesWrapped_1 = require("../../Model/PointSeries/XyPointSeriesWrapped");
 var EllipsePointMarker_1 = require("../PointMarkers/EllipsePointMarker");
 var BaseRenderableSeries_1 = require("./BaseRenderableSeries");
+var constants_1 = require("./constants");
 var PointMarkerDrawingProvider_1 = require("./DrawingProviders/PointMarkerDrawingProvider");
 var ScatterSeriesHitTestProvider_1 = require("./HitTest/ScatterSeriesHitTestProvider");
 /**
@@ -59,9 +60,10 @@ var XyScatterRenderableSeries = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link IBaseRenderableSeriesOptions} to configure the series
      */
     function XyScatterRenderableSeries(webAssemblyContext, options) {
-        var _a, _b;
+        var _a, _b, _c;
         var _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = SeriesType_1.ESeriesType.ScatterSeries;
+        _this.scatterOpacityProperty = 1;
         if (!_this.pointMarker) {
             _this.pointMarker = new EllipsePointMarker_1.EllipsePointMarker(webAssemblyContext, { width: 10, height: 10 });
         }
@@ -74,6 +76,7 @@ var XyScatterRenderableSeries = /** @class */ (function (_super) {
         if ((_a = _this.paletteProvider) === null || _a === void 0 ? void 0 : _a.onAttached) {
             (_b = _this.paletteProvider) === null || _b === void 0 ? void 0 : _b.onAttached(_this);
         }
+        _this.scatterOpacityProperty = (_c = options === null || options === void 0 ? void 0 : options.opacity) !== null && _c !== void 0 ? _c : _this.scatterOpacityProperty;
         return _this;
     }
     /** @inheritDoc */
@@ -84,6 +87,23 @@ var XyScatterRenderableSeries = /** @class */ (function (_super) {
     XyScatterRenderableSeries.prototype.newHitTestProvider = function () {
         return new ScatterSeriesHitTestProvider_1.ScatterSeriesHitTestProvider(this, this.webAssemblyContext);
     };
+    Object.defineProperty(XyScatterRenderableSeries.prototype, "opacity", {
+        /** @inheritDoc */
+        get: function () {
+            return this.scatterOpacityProperty;
+        },
+        /** @inheritDoc */
+        set: function (value) {
+            this.scatterOpacityProperty = value;
+            this.notifyPropertyChanged(constants_1.PROPERTY.OPACITY);
+            if (this.pointMarker) {
+                this.pointMarker.opacity = value;
+                this.notifyPropertyChanged(constants_1.PROPERTY.POINT_MARKER);
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
     return XyScatterRenderableSeries;
 }(BaseRenderableSeries_1.BaseRenderableSeries));
 exports.XyScatterRenderableSeries = XyScatterRenderableSeries;

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

@@ -10,6 +10,7 @@ export declare enum PROPERTY {
     CONTOUR_COLOR_MAP_MODE = "CONTOUR_COLOR_MAP_MODE",
     DATA_POINT_WIDTH = "dataPointWidth",
     DATA_SERIES = "dataSeries",
+    DRAWING_PROVIDERS = "DRAWING_PROVIDERS",
     DRAW_NAN_AS = "drawNaNAs",
     EFFECT = "EFFECT",
     ENABLE_DRAWING_OPTIMISATIONS = "ENABLE_DRAWING_OPTIMISATIONS",
@@ -30,6 +31,7 @@ export declare enum PROPERTY {
     OFFSET = "OFFSET",
     OPACITY = "OPACITY",
     PALETTE_PROVIDER = "PALETTE_PROVIDER",
+    PARENT_SURFACE = "PARENT_SURFACE",
     POINT_MARKER = "pointMarker",
     RANGE = "RANGE",
     RESAMPLING_MODE = "RESAMPLING_MODE",

package/Charting/Visuals/RenderableSeries/constants.js

@@ -14,6 +14,7 @@ var PROPERTY;
     PROPERTY["CONTOUR_COLOR_MAP_MODE"] = "CONTOUR_COLOR_MAP_MODE";
     PROPERTY["DATA_POINT_WIDTH"] = "dataPointWidth";
     PROPERTY["DATA_SERIES"] = "dataSeries";
+    PROPERTY["DRAWING_PROVIDERS"] = "DRAWING_PROVIDERS";
     PROPERTY["DRAW_NAN_AS"] = "drawNaNAs";
     PROPERTY["EFFECT"] = "EFFECT";
     PROPERTY["ENABLE_DRAWING_OPTIMISATIONS"] = "ENABLE_DRAWING_OPTIMISATIONS";
@@ -34,6 +35,7 @@ var PROPERTY;
     PROPERTY["OFFSET"] = "OFFSET";
     PROPERTY["OPACITY"] = "OPACITY";
     PROPERTY["PALETTE_PROVIDER"] = "PALETTE_PROVIDER";
+    PROPERTY["PARENT_SURFACE"] = "PARENT_SURFACE";
     PROPERTY["POINT_MARKER"] = "pointMarker";
     PROPERTY["RANGE"] = "RANGE";
     PROPERTY["RESAMPLING_MODE"] = "RESAMPLING_MODE";

package/Charting/Visuals/SciChartPieSurface/IPieSurfaceOptions.d.ts

@@ -1,5 +1,8 @@
+import { Thickness } from "../../../Core/Thickness";
+import { TBorder } from "../../../types/TBorder";
+import { PieLabelProvider } from "../Axis/LabelProvider/PieLabelProvider";
 import { ISurfaceOptionsBase } from "../SciChartSurfaceBase";
-import { EPieType, ESizingMode } from "./SciChartPieSurface";
+import { EPieType, EPieValueMode, ESizingMode } from "./SciChartPieSurface";
 /**
  * Options passed to a {@link SciChartPieSurface} in the {@link SciChartPieSurface.create} function
  */
@@ -18,8 +21,10 @@ export interface IPieSurfaceOptions extends ISurfaceOptionsBase {
     pieType?: EPieType;
     /** Optional - the radius of the hole for a donut chart. */
     holeRadius?: number;
-    /** Optional - Whether to animate the chart as it is initially drawn.  Default true */
+    /** Optional - Whether to animate the chart as it is drawn.  Default true */
     animate?: boolean;
+    /** Optional - The number of frames for the animation. Default 30.  A frame will be trigged every 20ms. */
+    animationFrames?: number;
     /** Optional - how the hole radius is interpreted, either absolute, or relative to the total radius */
     holeRadiusSizingMode?: ESizingMode;
     /** Optional - whether to show the legend.  Default true */
@@ -30,4 +35,21 @@ export interface IPieSurfaceOptions extends ISurfaceOptionsBase {
     showLegendCheckBoxes?: boolean;
     /** Optional - whether to show series markers on the legend.  Default true */
     showLegendSeriesMarkers?: boolean;
+    /** Optional - adds the spacings / padding around the view area */
+    padding?: Thickness;
+    /** Optional - adds the border to the view area */
+    canvasBorder?: TBorder;
+    /** Optional - addes spacing between the segments */
+    seriesSpacing?: number;
+    /**
+     * Sets a {@link LabelProvider} - a class which is responsible for formatting axis labels and cursor labels from numeric values
+     */
+    labelProvider?: PieLabelProvider;
+    /** Whether to show labels as percentages, or raw values.  Default to percentages */
+    valueMode?: EPieValueMode;
+    /**
+     * Use this to adjust the position of the labels.  1 is the default.  Larger values will shift the labels outwards.
+     * If you want more detailed control you can override calcTitlePosition.
+     */
+    labelRadiusAdjustment?: number;
 }

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

@@ -5,12 +5,15 @@ export interface IPieSegment {
     readonly id: string;
     text: string;
     value: number;
+    oldValue: number;
     color: string;
     colorLinearGradient: GradientParams;
     isSelected: boolean;
     delta: number;
+    shift: number;
     onAttach(scs: SciChartPieSurface): void;
     onDetach(): void;
-    getPercentage(total: number): string;
     toJSON(): IPieSegmentOptions;
+    getPercentage(total: number): number;
+    getLabelText(total: number): string;
 }