scichart 2.2.2393 → 2.2.2396

package/Charting/Services/SciChartRenderer.js

@@ -102,6 +102,7 @@ var SciChartRenderer = /** @class */ (function () {
         if (this.sciChartSurface.isDeleted) {
             return;
         }
+        // console.log("render");
         var nativeContext = renderContext.getNativeContext();
         var wasmContext = this.sciChartSurface.webAssemblyContext2D;
         var oldBlendMode = nativeContext.GetBlendMode();
@@ -110,7 +111,6 @@ var SciChartRenderer = /** @class */ (function () {
         this.validate();
         // Animation Step
         var timeElapsed = this.previousTime ? Date.now() - this.previousTime : undefined;
-        // console.log("draw ", timeElapsed);
         this.previousTime = Date.now();
         this.sciChartSurface.onAnimate(timeElapsed);
         this.sciChartSurface.updateBackground();

package/Charting/Visuals/Annotations/BoxAnnotation.d.ts

@@ -44,6 +44,7 @@ export declare class BoxAnnotation extends RenderContextAnnotationBase {
     private strokeThicknessProperty;
     private strokeProperty;
     private fillProperty;
+    private nativeDrawingProvider;
     private strokePenCache;
     private fillBrushCache;
     /**
@@ -83,6 +84,7 @@ export declare class BoxAnnotation extends RenderContextAnnotationBase {
     delete(): void;
     /** @inheritDoc */
     drawWithContext(renderContext: IRenderContext2D, xCalc: CoordinateCalculatorBase, yCalc: CoordinateCalculatorBase, viewRect: Rect): void;
+    private drawWithProvider;
     /** @inheritDoc */
     onAttach(scs: SciChartSurface): void;
     onDragStarted(args: ModifierMouseArgs): boolean;

package/Charting/Visuals/Annotations/BoxAnnotation.js

@@ -16,6 +16,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BoxAnnotation = void 0;
+var app_1 = require("../../../constants/app");
 var Deleter_1 = require("../../../Core/Deleter");
 var Guard_1 = require("../../../Core/Guard");
 var Point_1 = require("../../../Core/Point");
@@ -119,6 +120,7 @@ var BoxAnnotation = /** @class */ (function (_super) {
     BoxAnnotation.prototype.delete = function () {
         this.strokePenCache = (0, Deleter_1.deleteSafe)(this.strokePenCache);
         this.fillBrushCache = (0, Deleter_1.deleteSafe)(this.fillBrushCache);
+        this.nativeDrawingProvider = (0, Deleter_1.deleteSafe)(this.nativeDrawingProvider);
     };
     /** @inheritDoc */
     BoxAnnotation.prototype.drawWithContext = function (renderContext, xCalc, yCalc, viewRect) {
@@ -135,12 +137,58 @@ var BoxAnnotation = /** @class */ (function (_super) {
         var y2 = this.getY2Coordinate(xCalc, yCalc);
         this.setAnnotationBorders(x1, x2, y1, y2);
         var rect = Rect_1.Rect.createWithPoints(new Point_1.Point(x1, y1), new Point_1.Point(x2, y2));
-        renderContext.drawRect(rect, viewRect, strokePen, fillBrush);
+        // Temporary HAX! drawRect is rubbish with large strokeThickness, whereas the columnDrawingProvider does a nice
+        // outlined rectangle, but the code is ugly.  In 2.3 we will improve the native drawRect to do the outline properly.
+        if (!app_1.IS_TEST_ENV) {
+            this.drawWithProvider(renderContext, strokePen.scrtPen, fillBrush.scrtBrush, xCalc, yCalc, rect, viewRect);
+        }
+        //renderContext.drawRect(rect, viewRect, strokePen, fillBrush);
         this.updateAdornerInner();
     };
+    BoxAnnotation.prototype.drawWithProvider = function (renderContext, linesPen, fillBrush, xCalc, yCalc, rect, viewRect) {
+        var webAssemblyContext = this.parentSurface.webAssemblyContext2D;
+        var args = new webAssemblyContext.SCRTColumnDrawingParams();
+        args.forceShaderMethod = true;
+        args.verticalChart = this.isVerticalChart;
+        args.zeroLineY = this.isVerticalChart ? yCalc.getDataValue(rect.left) : yCalc.getDataValue(rect.bottom);
+        args.columnWidth = this.isVerticalChart ? rect.height : rect.width;
+        // ISSUE: If the strokeThickness property is not provided,
+        // the fill will be disappeared with large zoom (when the column width will be small or zero)
+        // if (args.columnWidth === 0 && this.strokeThickness === 0) {
+        //     strokePenCache = this.strokePenFillColoredCache;
+        // }
+        if (linesPen) {
+            args.SetLinesPen(linesPen);
+        }
+        if (fillBrush) {
+            args.SetFillBrush(fillBrush);
+        }
+        args.viewportWidth = viewRect.width;
+        args.viewportHeight = viewRect.height;
+        var xMid = this.isVerticalChart ? (rect.top + rect.bottom) / 2 : (rect.left + rect.right) / 2;
+        var xVal = xCalc.getDataValue(xMid);
+        var xValues = new webAssemblyContext.SCRTDoubleVector();
+        xValues.push_back(xVal);
+        var yVal = this.isVerticalChart ? yCalc.getDataValue(rect.right) : yCalc.getDataValue(rect.top);
+        var yValues = new webAssemblyContext.SCRTDoubleVector();
+        yValues.push_back(yVal);
+        args.count = yValues.size();
+        var nativeContext = renderContext.getNativeContext();
+        nativeContext.PushMatrix();
+        nativeContext.PushState();
+        nativeContext.Translate(viewRect.x, viewRect.y);
+        nativeContext.SetClipRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
+        this.nativeDrawingProvider.DrawPointsVec(nativeContext, xValues, yValues, xCalc.nativeCalculator, yCalc.nativeCalculator, args);
+        nativeContext.PopMatrix();
+        nativeContext.PopState();
+        xValues.delete();
+        yValues.delete();
+        args.delete();
+    };
     /** @inheritDoc */
     BoxAnnotation.prototype.onAttach = function (scs) {
         _super.prototype.onAttach.call(this, scs);
+        this.nativeDrawingProvider = new scs.webAssemblyContext2D.SCRTColumnSeriesDrawingProvider();
         if (!this.strokePenCache) {
             this.strokePenCache = new Pen2DCache_1.Pen2DCache(scs.webAssemblyContext2D);
         }

package/Charting/Visuals/SciChartSurface.d.ts

@@ -259,7 +259,7 @@ export declare class SciChartSurface extends SciChartSurfaceBase {
     /**
      * @inheritDoc
      */
-    delete(): void;
+    delete(clearHtml?: boolean): void;
     /**
      * @inheritDoc
      */

package/Charting/Visuals/SciChartSurface.js

@@ -397,7 +397,7 @@ var SciChartSurface = /** @class */ (function (_super) {
             // Logger.log("SciChartSurface.isSuspended = true. Ignoring invalidateElement() call");
             return;
         }
-        // console.log("Invalidating ", this.domChartRoot.id);
+        // console.trace("Invalidating ", this.domChartRoot.id);
         var canvasId = this.domCanvas2D ? this.domCanvas2D.id : "undefinedCanvasId";
         this.renderSurface.invalidateElement(canvasId);
     };
@@ -415,7 +415,8 @@ var SciChartSurface = /** @class */ (function (_super) {
     /**
      * @inheritDoc
      */
-    SciChartSurface.prototype.delete = function () {
+    SciChartSurface.prototype.delete = function (clearHtml) {
+        if (clearHtml === void 0) { clearHtml = true; }
         _super.prototype.delete.call(this);
         this.renderableSeries.asArray().forEach(function (rs) { return rs.delete(); });
         this.renderableSeries.clear();
@@ -428,7 +429,7 @@ var SciChartSurface = /** @class */ (function (_super) {
         this.watermarkProperties = (0, Deleter_1.deleteSafe)(this.watermarkProperties);
         this.watermarkPropertyPosition = (0, Deleter_1.deleteSafe)(this.watermarkPropertyPosition);
         this.chartModifiers.asArray().forEach(function (chm) { return chm.delete(); });
-        if (this.domChartRoot) {
+        if (clearHtml && this.domChartRoot) {
             var style = this.domChartRoot.style;
             if (style) {
                 style.background = "";

package/Charting/Visuals/SciChartSurfaceBase.d.ts

@@ -259,7 +259,7 @@ export declare abstract class SciChartSurfaceBase implements ISciChartSurfaceBas
     /**
      * @inheritDoc
      */
-    delete(): void;
+    delete(clearHtml?: boolean): void;
     addDeletable(deletable: IDeletable): void;
     /**
      * Call invalidateElement() to trigger a redraw of the {@link SciChartSurfaceBase}. SciChart's WebGL WebAssembly rendering

package/Charting/Visuals/SciChartSurfaceBase.js

@@ -286,9 +286,10 @@ var SciChartSurfaceBase = /** @class */ (function () {
     /**
      * @inheritDoc
      */
-    SciChartSurfaceBase.prototype.delete = function () {
+    SciChartSurfaceBase.prototype.delete = function (clearHtml) {
         var _this = this;
         var _a;
+        if (clearHtml === void 0) { clearHtml = true; }
         this.isDeletedProperty = true;
         var currentSurfaceIndex = (_a = this.destinations) === null || _a === void 0 ? void 0 : _a.findIndex(function (dest) { return dest.sciChartSurface === _this; });
         if (currentSurfaceIndex >= 0) {

package/Charting/Visuals/createMaster.js

@@ -171,7 +171,7 @@ var createMaster = function () {
                 Guard_1.Guard.notNull(theme, "theme");
                 var canvas2dId = sciChartInitCommon_1.default.getCanvas2dId(divElementId);
                 var sameIdDestinations = exports.sciChartDestinations.filter(function (el) { return el.canvasElementId === canvas2dId; });
-                sameIdDestinations.forEach(function (el) { return el.sciChartSurface.delete(); });
+                sameIdDestinations.forEach(function (el) { return el.sciChartSurface.delete(false); });
                 var otherDestinations = exports.sciChartDestinations.filter(function (el) { return el.canvasElementId !== canvas2dId; });
                 chartInitObj.ClearDestinations();
                 while (exports.sciChartDestinations.length > 0) {

package/Charting/Visuals/licenseManager2D.js

@@ -415,7 +415,9 @@ var applyLicense = function (licenseContext) {
     var licenseKey = "";
     var lt = licenseContext.SCRTCredentials.GetLicenseType();
     debug("Initial license status is " + licensingClasses_1.LicenseType[convertLicenseType(lt, licenseContext)]);
-    if (window.location.hostname.includes(".csb.app") || window.location.hostname.includes(".codesandbox.io")) {
+    if (window.location.hostname.includes(".csb.app") ||
+        window.location.hostname === "codesandbox.io" ||
+        window.location.hostname.includes(".codesandbox.io")) {
         runtimeLicenseKey = "csb";
     }
     // Get from global store

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.2393";
+export declare const libraryVersion = "2.2.2396";
 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-06-10T00:00:00";
+var buildStamp = "2022-06-29T00:00:00";
 var result;
 // tslint:disable-next-line:no-var-requires
-exports.libraryVersion = "2.2.2393";
+exports.libraryVersion = "2.2.2396";
 var checkBuildStamp = function (wasmContext) {
     if (result !== undefined)
         return result;