scichart 2.2.2417 → 3.0.0-beta.224

package/Charting3D/Visuals/RenderableSeries/SurfaceMesh/SurfaceMeshRenderableSeries3D.d.ts

@@ -101,11 +101,6 @@ export interface ISurfaceMeshRenderableSeries3DOptions extends IBaseRenderableSe
      * @remarks Defaults to 0.05
      */
     highlight?: number;
-    /**
-     * Gets or sets the opacity of the {@link SurfaceMeshRenderableSeries3D}
-     * @remarks Value range 0.0 to 1.0. Default = 1.
-     */
-    opacity?: number;
 }
 /**
  * Enumeration constants which define how a {@link SurfaceMeshRenderableSeries3D | Surface Mesh Plot} is drawn

package/Charting3D/Visuals/RenderableSeries/SurfaceMesh/SurfaceMeshRenderableSeries3D.js

@@ -160,23 +160,24 @@ var SurfaceMeshRenderableSeries3D = /** @class */ (function (_super) {
     function SurfaceMeshRenderableSeries3D(webAssemblyContext, options) {
         var _this = _super.call(this, webAssemblyContext, options) || this;
         _this.drawMeshAsProperty = (options === null || options === void 0 ? void 0 : options.drawMeshAs) || EDrawMeshAs.SOLID_WIREFRAME;
-        _this.strokeThicknessProperty = (options === null || options === void 0 ? void 0 : options.strokeThickness) || 1;
+        _this.strokeThicknessProperty = (options === null || options === void 0 ? void 0 : options.strokeThickness) !== undefined ? options === null || options === void 0 ? void 0 : options.strokeThickness : 1;
         _this.drawSkirtProperty = (options === null || options === void 0 ? void 0 : options.drawSkirt) !== undefined ? options === null || options === void 0 ? void 0 : options.drawSkirt : true;
         _this.meshColorPaletteProperty = options === null || options === void 0 ? void 0 : options.meshColorPalette;
-        _this.minimumProperty = (options === null || options === void 0 ? void 0 : options.minimum) || 0;
-        _this.maximumProperty = (options === null || options === void 0 ? void 0 : options.maximum) || 1;
+        _this.minimumProperty = (options === null || options === void 0 ? void 0 : options.minimum) !== undefined ? options === null || options === void 0 ? void 0 : options.minimum : 0;
+        _this.maximumProperty = (options === null || options === void 0 ? void 0 : options.maximum) !== undefined ? options === null || options === void 0 ? void 0 : options.maximum : 1;
         _this.meshPaletteModeProperty = (options === null || options === void 0 ? void 0 : options.meshPaletteMode) || EMeshPaletteMode.HEIGHT_MAP_INTERPOLATED;
         _this.colorMapTextureSizeProperty = (options === null || options === void 0 ? void 0 : options.colorMapTextureSize) || new Size_1.Size(1024, 1);
-        _this.heightScaleFactorProperty = (options === null || options === void 0 ? void 0 : options.heightScaleFactor) || 1;
+        _this.heightScaleFactorProperty = (options === null || options === void 0 ? void 0 : options.heightScaleFactor) !== undefined ? options === null || options === void 0 ? void 0 : options.heightScaleFactor : 1;
         _this.meshResolutionProperty = (options === null || options === void 0 ? void 0 : options.meshResolution) || EMeshResolution.MESH_RESOLUTION_X1;
-        _this.yOffsetProperty = (options === null || options === void 0 ? void 0 : options.yOffset) || 0;
-        _this.cellHardnessFactorProperty = (options === null || options === void 0 ? void 0 : options.cellHardnessFactor) || 1;
-        _this.lightingFactorProperty = (options === null || options === void 0 ? void 0 : options.lightingFactor) || 0.8;
-        _this.contourStrokeThicknessProperty = (options === null || options === void 0 ? void 0 : options.contourStrokeThickness) || 2;
-        _this.contourIntervalProperty = (options === null || options === void 0 ? void 0 : options.contourInterval) || 20.0;
-        _this.contourOffsetProperty = (options === null || options === void 0 ? void 0 : options.contourOffset) || 0.1;
+        _this.yOffsetProperty = (options === null || options === void 0 ? void 0 : options.yOffset) !== undefined ? options === null || options === void 0 ? void 0 : options.yOffset : 0;
+        _this.cellHardnessFactorProperty = (options === null || options === void 0 ? void 0 : options.cellHardnessFactor) !== undefined ? options === null || options === void 0 ? void 0 : options.cellHardnessFactor : 1;
+        _this.lightingFactorProperty = (options === null || options === void 0 ? void 0 : options.lightingFactor) !== undefined ? options === null || options === void 0 ? void 0 : options.lightingFactor : 0.8;
+        _this.contourStrokeThicknessProperty =
+            (options === null || options === void 0 ? void 0 : options.contourStrokeThickness) !== undefined ? options === null || options === void 0 ? void 0 : options.contourStrokeThickness : 2;
+        _this.contourIntervalProperty = (options === null || options === void 0 ? void 0 : options.contourInterval) !== undefined ? options === null || options === void 0 ? void 0 : options.contourInterval : 20.0;
+        _this.contourOffsetProperty = (options === null || options === void 0 ? void 0 : options.contourOffset) !== undefined ? options.contourOffset : 0.1;
         _this.contourStrokeProperty = (options === null || options === void 0 ? void 0 : options.contourStroke) || "#FFFFFF";
-        _this.highlightProperty = (options === null || options === void 0 ? void 0 : options.highlight) || 0.05;
+        _this.highlightProperty = (options === null || options === void 0 ? void 0 : options.highlight) !== undefined ? options === null || options === void 0 ? void 0 : options.highlight : 0.05;
         _this.setSceneEntity(new SurfaceMeshSceneEntity_1.SurfaceMeshSceneEntity(webAssemblyContext, _this));
         return _this;
     }

package/Charting3D/Visuals/SciChart3DSurface.d.ts

@@ -268,7 +268,7 @@ export declare class SciChart3DSurface extends SciChartSurfaceBase {
      * Multiple animations will be run in parallel, so if you want to run one after another, use the onCompleted callback
      * to add another animation after the first completes
      */
-    addAnimation(animation: IGenericAnimation): void;
+    addAnimation(...animations: IGenericAnimation[]): void;
     /**
      * Returns true if an animation is running
      */
@@ -289,7 +289,7 @@ export declare class SciChart3DSurface extends SciChartSurfaceBase {
     /**
      * @inheritDoc
      */
-    protected applySciChartBackground(htmlColor: string): void;
+    protected applySciChartBackground(background: string, alphaEnabled?: boolean): void;
     private detachSeries;
     private attachSeries;
     private detachAxis;

package/Charting3D/Visuals/SciChart3DSurface.js

@@ -58,8 +58,9 @@ var SciChart3DSurface = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link ISciChart3DSurfaceOptions} to configure the chart
      */
     function SciChart3DSurface(webAssemblyContext, options) {
+        var _this = this;
         var _a, _b, _c, _d;
-        var _this = _super.call(this, webAssemblyContext, options === null || options === void 0 ? void 0 : options.canvases) || this;
+        _this = _super.call(this, webAssemblyContext, options === null || options === void 0 ? void 0 : options.canvases) || this;
         _this.animationList = [];
         _this.isAxisCubeRenderedProperty = false;
         var canvasWidth = (_b = (_a = _this.domCanvas2D) === null || _a === void 0 ? void 0 : _a.width) !== null && _b !== void 0 ? _b : app_1.DEFAULT_WIDTH;
@@ -104,12 +105,11 @@ var SciChart3DSurface = /** @class */ (function (_super) {
         // Watermark
         if (!app_1.IS_TEST_ENV) {
             _this.watermarkProperties = new webAssemblyContext.SCRTWaterMarkProperties();
-            _this.watermarkPropertyPosition = new webAssemblyContext.TSRVector2(6, 6);
+            _this.watermarkPropertyPosition = new webAssemblyContext.TSRVector2(0, 0);
             _this.watermarkProperties.SetPosition(_this.watermarkPropertyPosition);
             _this.watermarkProperties.SetOpacity(0.5);
             webAssemblyContext.SCRT3DSetWaterMarkProperties(_this.watermarkProperties);
         }
-        _this.applySciChartBackground(SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME.sciChartBackground);
         return _this;
     }
     /**
@@ -414,9 +414,6 @@ var SciChart3DSurface = /** @class */ (function (_super) {
         else {
             this.changeWebGLCanvasViewportSize(this.webAssemblyContext3D, pixelWidth, pixelHeight);
         }
-        if (this.domDivContainer) {
-            this.domDivContainer.style.height = "".concat(pixelHeight, "px");
-        }
         this.invalidateElement();
     };
     /**
@@ -431,10 +428,15 @@ var SciChart3DSurface = /** @class */ (function (_super) {
      * Multiple animations will be run in parallel, so if you want to run one after another, use the onCompleted callback
      * to add another animation after the first completes
      */
-    SciChart3DSurface.prototype.addAnimation = function (animation) {
-        if (!animation)
+    SciChart3DSurface.prototype.addAnimation = function () {
+        var _this = this;
+        var animations = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            animations[_i] = arguments[_i];
+        }
+        if (animations === undefined)
             return;
-        this.animationList.push(animation);
+        animations.forEach(function (a) { return _this.animationList.push(a); });
         this.invalidateElement();
     };
     Object.defineProperty(SciChart3DSurface.prototype, "isRunningAnimation", {
@@ -473,10 +475,13 @@ var SciChart3DSurface = /** @class */ (function (_super) {
      * @inheritDoc
      */
     SciChart3DSurface.prototype.updateWatermark = function (left, bottom) {
+        var _a;
         if (!app_1.IS_TEST_ENV) {
             this.watermarkPropertyPosition.x = left;
             this.watermarkPropertyPosition.y = bottom;
             this.watermarkProperties.SetPosition(this.watermarkPropertyPosition);
+            var isLightBackground = (_a = this.themeProvider) === null || _a === void 0 ? void 0 : _a.isLightBackground;
+            this.watermarkProperties.m_bIsDarkBackground = isLightBackground !== undefined ? !isLightBackground : false;
             this.webAssemblyContext3D.SCRT3DSetWaterMarkProperties(this.watermarkProperties);
         }
     };
@@ -493,9 +498,11 @@ var SciChart3DSurface = /** @class */ (function (_super) {
     /**
      * @inheritDoc
      */
-    SciChart3DSurface.prototype.applySciChartBackground = function (htmlColor) {
+    SciChart3DSurface.prototype.applySciChartBackground = function (background, alphaEnabled) {
+        if (alphaEnabled === void 0) { alphaEnabled = true; }
+        this.backgroundProperty = background;
         if (this.domChartRoot) {
-            this.domChartRoot.style.background = htmlColor;
+            this.domChartRoot.style.background = background;
         }
         this.webAssemblyContext3D.SCRT3DSetClearColor(0, 0, 0, 0);
     };

package/Charting3D/Visuals/createMaster3d.js

@@ -161,21 +161,6 @@ var createMaster = function () {
                     if (dest) {
                         dest.sciChartSurface.doDrawingLoop();
                     }
-                    // sciChartDestinations.forEach(dest => {
-                    //     const { canvasElementId, sciChartSurface } = dest;
-                    //     const chart = wasmContext.SCRTGetGlobalSampleChartInterface3D();
-                    //     // TODO
-                    //     if (chart.GetCurrentDestination()) {
-                    //         const currDestID = chart.GetCurrentDestination().GetID();
-                    //         if (
-                    //             currDestID === canvasElementId &&
-                    //             sciChartSurface.isInitialized &&
-                    //             !sciChartSurface.isDeleted
-                    //         ) {
-                    //             (sciChartSurface as SciChart3DSurface).doDrawingLoop();
-                    //         }
-                    //     }
-                    // });
                 },
                 Update: function (deltaTime) {
                     // console.log("Update");
@@ -184,20 +169,27 @@ var createMaster = function () {
                     // console.log("ShutDownChart");
                 }
             };
-            var chartInitObj = wasmContext.SCRTSampleChartInterface3D.implement(chartInitializer);
+            var chartInitObj = wasmContext.SCRTSampleChartInterface.implement(chartInitializer);
+            var frameRenderer3D = new wasmContext.SCRTFrameRenderer3D();
+            chartInitObj.SetFrameRenderer(frameRenderer3D);
             chartInitObj.SetFPSCounterEnabled(false);
-            wasmContext.SCRTSetGlobalSampleChartInterface3D(chartInitObj);
+            wasmContext.SCRTSetGlobalSampleChartInterface(chartInitObj);
             // create an object that native side can trigger the copy to from...
             var canvasCopyObj = wasmContext.SCRTCopyToDestinationInterface.implement({
                 CopyToDestination: (0, SciChartSurfaceBase_1.copyToCanvas)(SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas, getDestinationById)
             });
             wasmContext.SCRTSetGlobalCopyToDestinationInterface(canvasCopyObj);
             wasmContext.TSRSetDrawRequestsEnabled(true);
+            // SCJS-1321 fixes cutting 3d chart issue. 3D wasm and vice versa doesn't know about domMasterCanvas width/height
+            // when creating one 3d chart and one 2d chart on the same screen. So we tell the other wasm about existing master canvas size
+            if (SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas) {
+                wasmContext.TSRSetMainWindowSize(SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas.width, SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas.height);
+            }
             // @ts-ignore
             wasmContext.callMain();
         })
             .catch(function () {
-            reject("Could not load SciChart WebAssembly module.\n            Check your build process and ensure that your scichart2d.wasm, scichart2d.data and scichart2d.js files are from the same version");
+            reject("Could not load SciChart WebAssembly module.\n            Check your build process and ensure that your scichart3d.wasm, scichart3d.data and scichart3d.js files are from the same version");
         });
     });
 };

package/Charting3D/Visuals/createSingle3d.js

@@ -32,8 +32,9 @@ var createSingle3dInternal = function (divElement, options) {
                 initDrawEngineSingleChart(wasmContext, canvases, resolve, (_a = options === null || options === void 0 ? void 0 : options.theme) !== null && _a !== void 0 ? _a : SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME);
                 (0, BuildStamp_1.checkBuildStamp)(wasmContext);
             })
-                .catch(function () {
+                .catch(function (ex) {
                 loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
+                throw ex;
                 reject("Could not load SciChart WebAssembly module.\n                Check your build process and ensure that your scichart3d.wasm, scichart3d.data and scichart3d.js files are from the same version");
             });
         }
@@ -50,21 +51,20 @@ var initDrawEngineSingleChart = function (wasmContext, canvases, resolve, theme)
     var height = canvases.domCanvas2D.height;
     // @ts-ignore
     wasmContext.preRun.push(function () { return (ENV.SDL_EMSCRIPTEN_KEYBOARD_ELEMENT = "#chart_WebGL"); });
-    wasmContext.TSRSetMainWindowSize(width, height);
     var scs;
     wasmContext.canvas = canvases.domCanvasWebGL;
     var chartInitializer = {
         InitializeChart: function () {
             scs = new SciChart3DSurface_1.SciChart3DSurface(wasmContext, { canvases: canvases });
             scs.applyTheme(theme);
-            var unsub = sciChartInitCommon_1.default.subscribeToResize(canvases.domChartRoot, canvases.aspect, scs);
-            scs.addDeletable(unsub);
-            (0, licenseManager3D_1.applyLicense3D)(wasmContext, scs, true);
-            scs.setIsInitialized();
             setTimeout(function () {
-                setTimeout(scs.invalidateElement, 0);
+                scs.invalidateElement();
+                (0, licenseManager3D_1.applyLicense3D)(wasmContext, scs, true);
+                var unsub = sciChartInitCommon_1.default.subscribeToResize(canvases.domChartRoot, canvases.aspect, scs);
+                scs.addDeletable(unsub);
+                scs.setIsInitialized();
+                resolve({ wasmContext: wasmContext, sciChart3DSurface: scs });
             }, 0);
-            resolve({ wasmContext: wasmContext, sciChart3DSurface: scs });
         },
         Draw: function (canvasId) {
             if (scs.isInitialized) {
@@ -78,9 +78,11 @@ var initDrawEngineSingleChart = function (wasmContext, canvases, resolve, theme)
             //Logger.log("SciChart3DSurface.ts ShutDownChart");
         }
     };
-    var chartInitObj = wasmContext.SCRTSampleChartInterface3D.implement(chartInitializer);
+    var chartInitObj = wasmContext.SCRTSampleChartInterface.implement(chartInitializer);
+    var frameRenderer3D = new wasmContext.SCRTFrameRenderer3D();
+    chartInitObj.SetFrameRenderer(frameRenderer3D);
     chartInitObj.SetFPSCounterEnabled(false);
-    wasmContext.SCRTSetGlobalSampleChartInterface3D(chartInitObj);
+    wasmContext.SCRTSetGlobalSampleChartInterface(chartInitObj);
     // @ts-ignore
     wasmContext.callMain();
 };

package/Core/Animations/GenericAnimation.d.ts

@@ -20,6 +20,8 @@ export interface IGenericAnimationOptions<T> {
      * A function that is called each frame.  Update the target of the animation here. progress is between 0 and 1.
      */
     onAnimate: (from: T, to: T, progress: number) => void;
+    /** When true, onAnimate is called immediately with progress=0 to set the initial value */
+    setInitialValueImmediately?: boolean;
     /**
      * A function that is called after the animation has finished.
      */

package/Core/Animations/GenericAnimation.js

@@ -37,6 +37,9 @@ var GenericAnimation = /** @class */ (function () {
         this.onAnimate = options.onAnimate;
         this.onCompleted = options === null || options === void 0 ? void 0 : options.onCompleted;
         this.animationFSM = new AnimationFiniteStateMachine_1.AnimationFiniteStateMachine(this);
+        // Set initial progress now
+        if (options === null || options === void 0 ? void 0 : options.setInitialValueImmediately)
+            this.onAnimate(this.from, this.to, 0);
     }
     Object.defineProperty(GenericAnimation.prototype, "isComplete", {
         get: function () {

package/Core/Animations/NumberRangeAnimator.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NumberRangeAnimator = void 0;
+var Guard_1 = require("../Guard");
 var NumberRange_1 = require("../NumberRange");
 var EasingFunctions_1 = require("./EasingFunctions");
 var GenericAnimation_1 = require("./GenericAnimation");
@@ -27,9 +28,9 @@ var NumberRangeAnimator = /** @class */ (function () {
             from: from,
             to: to,
             duration: durationMs,
-            onAnimate: function (from, to, progress) {
+            onAnimate: function (start, end, progress) {
                 var interpolate = isLog ? NumberRangeAnimator.interpolateLog : NumberRangeAnimator.interpolate;
-                var intermediate = interpolate(from, to, progress);
+                var intermediate = interpolate(start, end, progress);
                 onAnimate(intermediate);
             },
             delay: 0,
@@ -39,12 +40,16 @@ var NumberRangeAnimator = /** @class */ (function () {
         return animation;
     };
     NumberRangeAnimator.interpolate = function (from, to, interpolationFactor) {
+        Guard_1.Guard.notNull(from, "from");
+        Guard_1.Guard.notNull(to, "to");
         var newMin = (to.min - from.min) * interpolationFactor + from.min;
         var newMax = (to.max - from.max) * interpolationFactor + from.max;
         var result = new NumberRange_1.NumberRange(newMin, newMax);
         return result;
     };
     NumberRangeAnimator.interpolateLog = function (from, to, interpolationFactor) {
+        Guard_1.Guard.notNull(from, "from");
+        Guard_1.Guard.notNull(to, "to");
         var newMin = Math.pow(to.min / from.min, interpolationFactor) * from.min;
         var newMax = Math.pow(to.max / from.max, interpolationFactor) * from.max;
         var result = new NumberRange_1.NumberRange(newMin, newMax);

package/Core/BuildStamp.d.ts

@@ -1,4 +1,4 @@
 import { TSciChart } from "../types/TSciChart";
 import { TSciChart3D } from "../types/TSciChart3D";
-export declare const libraryVersion = "2.2.2417";
+export declare const libraryVersion = "3.0.0-beta.224";
 export declare const checkBuildStamp: (wasmContext: TSciChart | TSciChart3D) => boolean;

package/Core/BuildStamp.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkBuildStamp = exports.libraryVersion = void 0;
-var buildStamp = "2022-12-02T00:00:00";
+var buildStamp = "2022-12-10T00:00:00";
 var result;
 // tslint:disable-next-line:no-var-requires
-exports.libraryVersion = "2.2.2417";
+exports.libraryVersion = "3.0.0-beta.224";
 var checkBuildStamp = function (wasmContext) {
     if (result !== undefined)
         return result;

package/Core/Mouse/MouseManager.d.ts

@@ -13,6 +13,10 @@ export declare class MouseManager {
      */
     sciChartSurface: SciChartSurfaceBase;
     private canvas;
+    /**
+     * For subCharts - to track if the mousepointer is over the subChart, so we can fake Enter and Leave events
+     */
+    isOver: boolean;
     /**
      * Creates an instance of the {@link MouseManager}
      * @param target The target {@link SciChartSurfaceBase} that we are listening to events on
@@ -68,6 +72,7 @@ export declare class MouseManager {
      * @param event The {@link PointerEvent}
      */
     onContextMenu(event: MouseEvent): void;
+    onDrop(event: MouseEvent): void;
     modifierPointerCancel(args: ModifierMouseArgs): void;
     /**
      * Internal function called to route a mouse move event to all {@link sciChartSurface.chartModifiers}
@@ -118,6 +123,21 @@ export declare class MouseManager {
      * the user must set {@link ChartModifierBase.receiveHandledEvents} = true.
      */
     modifierMouseEnter(args: ModifierMouseArgs): void;
+    /**
+     * Internal function called to route a drop event to all {@link sciChartSurface.chartModifiers}
+     * @param args The {@link ModifierMouseArgs} to route
+     * @remarks Event routing stops if any event marks {@link ModifierMouseArgs.handled} as true. To override this,
+     * the user must set {@link ChartModifierBase.receiveHandledEvents} = true.
+     */
+    modifierDrop(args: ModifierMouseArgs): void;
+    /**
+     * Get data from the master surface which will be passed to other surfaces when modifierGroups are used.
+     * Use this if you want to use the data value from the master surface in the modifier on the other surfaces
+     */
+    getMasterData(sciChartSurface: SciChartSurfaceBase, args: ModifierMouseArgs): any;
     private get chartModifiers();
     private get chartModifierGroups();
+    private updateSubCharts;
+    private processSubChartEvent;
+    private callEvent;
 }