scichart 2.2.2417 → 3.0.0-beta.230

package/Charting/Visuals/Axis/AxisRenderer.js

@@ -197,7 +197,7 @@ var AxisRenderer = /** @class */ (function () {
         var width = Math.floor(viewRect.width);
         var height = Math.floor(viewRect.height);
         var tickSize = this.desiredTicksSize;
-        var ctx = textureManager.getTextureContext(width, height);
+        var ctx;
         var padding = labelStyle.padding, alignment = labelStyle.alignment;
         if (isAxisFlipped) {
             tickCoords = tickCoords.reverse();
@@ -205,14 +205,48 @@ var AxisRenderer = /** @class */ (function () {
         }
         // for debug
         var labelRects = [];
+        var textColor = (0, parseColor_1.parseColorToUIntArgb)(labelStyle.color);
+        var nativeFont = labelProvider.useNativeText
+            ? renderContext.getFont(labelStyle, labelProvider.rotation !== 0)
+            : null;
+        var textBounds = labelProvider.useNativeText ? (0, NativeObject_1.getTextBounds)(this.webAssemblyContext) : null;
+        if (!nativeFont) {
+            // The clearRect in here is slow.
+            ctx = textureManager.getTextureContext(width, height);
+        }
+        var adjRotation = labelProvider.rotation;
+        if (adjRotation > 90)
+            adjRotation -= 180;
+        else if (adjRotation < -90)
+            adjRotation += 180;
+        var rotationRad = -(adjRotation * Math.PI) / 180;
         tickCoords = tickCoords.map(function (t) { return t - axisOffset; });
+        var multiLineAlignment = convertMultiLineAlignment(alignment, this.webAssemblyContext);
+        var lineHeight = 0;
+        if (nativeFont) {
+            nativeFont.CalculateStringBounds("Ag", textBounds, 0);
+            lineHeight = textBounds.GetLineBounds(0).m_fHeight;
+        }
         if ((0, AxisAlignment_1.getIsHorizontal)(axisAlignment)) {
-            var tickSizes = tickLabels.map(function (label) { return labelProvider.getLabelWidth(ctx, label, labelStyle); });
-            var _b = this.layoutLabels(width, tickCoords, tickSizes, isFlippedCoordinates, padding === null || padding === void 0 ? void 0 : padding.top, padding === null || padding === void 0 ? void 0 : padding.bottom), labelCoords = _b.labelCoords, labelIndexes = _b.labelIndexes;
+            var labelHeights = [];
+            var labelWidths = [];
+            if (!labelProvider.useCache && labelProvider.useNativeText) {
+                for (var _i = 0, tickLabels_1 = tickLabels; _i < tickLabels_1.length; _i++) {
+                    var label = tickLabels_1[_i];
+                    nativeFont.CalculateStringBounds(label !== null && label !== void 0 ? label : "", textBounds, 2);
+                    labelHeights.push(textBounds.m_fHeight + labelStyle.padding.top + labelStyle.padding.bottom);
+                    labelWidths.push(textBounds.m_fWidth + labelStyle.padding.left + labelStyle.padding.right);
+                }
+            }
+            else {
+                labelHeights = tickLabels.map(function (label) { return labelProvider.getLabelHeight(ctx, label, labelStyle); });
+                labelWidths = tickLabels.map(function (label) { return labelProvider.getLabelWidth(ctx, label, labelStyle); });
+            }
+            var _b = this.layoutLabels(width, tickCoords, labelWidths, isFlippedCoordinates, padding === null || padding === void 0 ? void 0 : padding.top, padding === null || padding === void 0 ? void 0 : padding.bottom), labelCoords = _b.labelCoords, labelIndexes = _b.labelIndexes;
             for (var index = 0; index < labelIndexes.length; index++) {
                 var xCoord = labelCoords[index];
                 var labelText = tickLabels[labelIndexes[index]];
-                var labelHeight = labelProvider.getLabelHeight(ctx, labelText, labelStyle);
+                var labelHeight = labelHeights[labelIndexes[index]];
                 var yCoord = 0;
                 // Always align to the axis for horizontal
                 if ((axisAlignment === AxisAlignment_1.EAxisAlignment.Bottom && !isInnerAxis) ||
@@ -223,14 +257,36 @@ var AxisRenderer = /** @class */ (function () {
                     yCoord += height - labelHeight - tickSize;
                 }
                 if (this.drawDebug) {
-                    labelRects.push(Rect_1.Rect.create(xCoord, yCoord, tickSizes[labelIndexes[index]], labelHeight));
+                    labelRects.push(Rect_1.Rect.create(xCoord, yCoord, labelWidths[labelIndexes[index]], labelHeight));
                 }
                 try {
-                    var _c = labelProvider.getCachedLabelTexture(labelText, textureManager, labelStyle), bitmapTexture = _c.bitmapTexture, textureHeight = _c.textureHeight, textureWidth = _c.textureWidth;
-                    if (bitmapTexture) {
-                        nativeContext.DrawTexture(bitmapTexture, Math.round(xCoord + viewRect.left), Math.round(yCoord + viewRect.top), textureWidth, textureHeight);
-                        if (!labelProvider.useCache) {
-                            bitmapTexture.delete();
+                    if (nativeFont) {
+                        var tx = xCoord + viewRect.left + padding.left;
+                        var ty = yCoord + viewRect.top + lineHeight - padding.bottom;
+                        var rx = tx;
+                        var ry = ty - lineHeight;
+                        if (rotationRad !== 0) {
+                            var _c = labelProvider.getNativeLabelInfo(labelText), textWidth = _c.textWidth, textHeight = _c.textHeight;
+                            tx =
+                                tickCoords[labelIndexes[index]] +
+                                    viewRect.left -
+                                    (textHeight * Math.sin(rotationRad)) / 2;
+                            rx = tx;
+                            if (rotationRad > 0) {
+                                // rotating up
+                                tx -= textWidth;
+                            }
+                        }
+                        nativeFont.DrawStringAdvanced(labelText !== null && labelText !== void 0 ? labelText : "", textColor, Math.round(tx), Math.round(ty), (0, NativeObject_1.getVector4)(this.webAssemblyContext, rx, ry, rotationRad, 0), multiLineAlignment, 2 // TODO from labelProvider
+                        );
+                    }
+                    else {
+                        var _d = labelProvider.getCachedLabelTexture(labelText, textureManager, labelStyle), bitmapTexture = _d.bitmapTexture, textureHeight = _d.textureHeight, textureWidth = _d.textureWidth;
+                        if (bitmapTexture) {
+                            nativeContext.DrawTexture(bitmapTexture, Math.round(xCoord + viewRect.left), Math.round(yCoord + viewRect.top), textureWidth, textureHeight);
+                            if (!labelProvider.useCache) {
+                                bitmapTexture.delete();
+                            }
                         }
                     }
                 }
@@ -241,23 +297,43 @@ var AxisRenderer = /** @class */ (function () {
             }
         }
         else {
-            var tickSizes = tickLabels.map(function (label) { return labelProvider.getLabelHeight(ctx, label, labelStyle); });
-            var _d = this.layoutLabels(height, tickCoords, tickSizes, isFlippedCoordinates, padding === null || padding === void 0 ? void 0 : padding.left, padding === null || padding === void 0 ? void 0 : padding.right), labelCoords = _d.labelCoords, labelIndexes = _d.labelIndexes;
+            var labelHeights = [];
+            var labelWidths = [];
+            if (!labelProvider.useCache && labelProvider.useNativeText) {
+                for (var _e = 0, tickLabels_2 = tickLabels; _e < tickLabels_2.length; _e++) {
+                    var label = tickLabels_2[_e];
+                    nativeFont.CalculateStringBounds(label !== null && label !== void 0 ? label : "", textBounds, 2);
+                    labelHeights.push(textBounds.m_fHeight + labelStyle.padding.top + labelStyle.padding.bottom);
+                    labelWidths.push(textBounds.m_fWidth + labelStyle.padding.left + labelStyle.padding.right);
+                }
+            }
+            else {
+                labelHeights = tickLabels.map(function (label) { return labelProvider.getLabelHeight(ctx, label, labelStyle); });
+                labelWidths = tickLabels.map(function (label) { return labelProvider.getLabelWidth(ctx, label, labelStyle); });
+            }
+            var _f = this.layoutLabels(height, tickCoords, labelHeights, isFlippedCoordinates, padding === null || padding === void 0 ? void 0 : padding.left, padding === null || padding === void 0 ? void 0 : padding.right), labelCoords = _f.labelCoords, labelIndexes = _f.labelIndexes;
             for (var index = 0; index < labelIndexes.length; index++) {
                 var xCoord = 0;
                 var labelText = tickLabels[labelIndexes[index]];
-                var labelWidth = labelProvider.getLabelWidth(ctx, labelText, labelStyle);
+                var labelWidth = labelWidths[labelIndexes[index]];
                 xCoord = this.adjustForLabelAlignment(xCoord, labelWidth, alignment, axisAlignment, isInnerAxis, width, tickSize);
                 var yCoord = labelCoords[index];
                 if (this.drawDebug) {
-                    labelRects.push(Rect_1.Rect.create(xCoord, yCoord, labelWidth, tickSizes[labelIndexes[index]]));
+                    labelRects.push(Rect_1.Rect.create(xCoord, yCoord, labelWidth, labelHeights[labelIndexes[index]]));
                 }
                 try {
-                    var _e = labelProvider.getCachedLabelTexture(labelText, textureManager, labelStyle), bitmapTexture = _e.bitmapTexture, textureHeight = _e.textureHeight, textureWidth = _e.textureWidth;
-                    if (bitmapTexture) {
-                        nativeContext.DrawTexture(bitmapTexture, Math.round(xCoord + viewRect.left), Math.round(yCoord + viewRect.top), textureWidth, textureHeight);
-                        if (!labelProvider.useCache) {
-                            bitmapTexture.delete();
+                    if (nativeFont) {
+                        var tx = xCoord + viewRect.left + padding.left;
+                        var ty = yCoord + viewRect.top + lineHeight - padding.bottom;
+                        nativeFont.DrawStringAdvanced(labelText !== null && labelText !== void 0 ? labelText : "", textColor, Math.round(tx), Math.round(ty), (0, NativeObject_1.getVector4)(this.webAssemblyContext, tx, ty, rotationRad, 0), multiLineAlignment, 2);
+                    }
+                    else {
+                        var _g = labelProvider.getCachedLabelTexture(labelText, textureManager, labelStyle), bitmapTexture = _g.bitmapTexture, textureHeight = _g.textureHeight, textureWidth = _g.textureWidth;
+                        if (bitmapTexture) {
+                            nativeContext.DrawTexture(bitmapTexture, Math.round(xCoord + viewRect.left), Math.round(yCoord + viewRect.top), textureWidth, textureHeight);
+                            if (!labelProvider.useCache) {
+                                bitmapTexture.delete();
+                            }
                         }
                     }
                 }
@@ -445,7 +521,7 @@ var AxisRenderer = /** @class */ (function () {
             var nativeRect = (0, createNativeRect_1.createNativeRect)(this.webAssemblyContext, rect.left, rect.top, rect.right, rect.bottom);
             vecRects.push_back(nativeRect);
         }
-        renderContext.drawRects(vecRects, brush, this.viewRect.left, this.viewRect.top);
+        renderContext.drawRects(vecRects, brush, axisRect.left, axisRect.top);
         brush.delete();
     };
     return AxisRenderer;
@@ -508,3 +584,21 @@ var layoutLabelsHelper = function (keepLabelsWithinAxis, hideOverlappingLabels,
     return { labelCoords: labelCoords, labelIndexes: labelIndexes };
 };
 exports.layoutLabelsHelper = layoutLabelsHelper;
+var convertMultiLineAlignment = function (multiLineAlignment, webAssemblyContext) {
+    var alignMode = webAssemblyContext.eTSRTextAlignMode.Left;
+    switch (multiLineAlignment) {
+        case LabelAlignment_1.ELabelAlignment.Left:
+            alignMode = webAssemblyContext.eTSRTextAlignMode.Left;
+            break;
+        case LabelAlignment_1.ELabelAlignment.Right:
+            alignMode = webAssemblyContext.eTSRTextAlignMode.Right;
+            break;
+        case LabelAlignment_1.ELabelAlignment.Center:
+            alignMode = webAssemblyContext.eTSRTextAlignMode.Center;
+            break;
+        default:
+            alignMode = webAssemblyContext.eTSRTextAlignMode.Left;
+            break;
+    }
+    return alignMode;
+};

package/Charting/Visuals/Axis/CategoryAxis.js

@@ -36,8 +36,9 @@ var CategoryAxis = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link ICategoryAxisOptions} used to configure the axis at instantiation time
      */
     function CategoryAxis(webAssemblyContext, options) {
+        var _this = this;
         var _a;
-        var _this = _super.call(this, webAssemblyContext, options) || this;
+        _this = _super.call(this, webAssemblyContext, options) || this;
         _this.type = AxisType_1.EAxisType.CategoryAxis;
         _this.labelProvider =
             (_a = options === null || options === void 0 ? void 0 : options.labelProvider) !== null && _a !== void 0 ? _a : new DateLabelProvider_1.DateLabelProvider(options);

package/Charting/Visuals/Axis/CategoryAxisBase.d.ts

@@ -27,17 +27,6 @@ export interface ICategoryAxisBaseOptions extends IAxisBase2dOptions, ILabel2DOp
  * @summary A 2D Chart Category Axis Base type
  */
 export declare abstract class CategoryAxisBase extends AxisBase2D {
-    private defaultXValuesProperty;
-    private defaultXStartProperty;
-    private defaultXStepProperty;
-    private defaultBaseXValues;
-    /**
-     * Creates an instance of a {@link CategoryAxisBase}
-     * @param webAssemblyContext The {@link TSciChart | SciChart 2D WebAssembly Context} containing native methods and
-     * access to our WebGL2 Engine and WebAssembly numerical methods
-     * @param options Optional parameters of type {@link ICategoryAxisBaseOptions} used to configure the axis at instantiation time
-     */
-    constructor(webAssemblyContext: TSciChart, options?: ICategoryAxisBaseOptions);
     /**
      * @inheritDoc
      */
@@ -74,10 +63,25 @@ export declare abstract class CategoryAxisBase extends AxisBase2D {
      * The step size for default x values.  See defaultXValues
      */
     set defaultXStep(value: number);
+    private defaultXValuesProperty;
+    private defaultXStartProperty;
+    private defaultXStepProperty;
+    private defaultBaseXValues;
+    /**
+     * Creates an instance of a {@link CategoryAxisBase}
+     * @param webAssemblyContext The {@link TSciChart | SciChart 2D WebAssembly Context} containing native methods and
+     * access to our WebGL2 Engine and WebAssembly numerical methods
+     * @param options Optional parameters of type {@link ICategoryAxisBaseOptions} used to configure the axis at instantiation time
+     */
+    constructor(webAssemblyContext: TSciChart, options?: ICategoryAxisBaseOptions);
     /**
      * @inheritDoc
      */
     prepareRenderData(): void;
+    /**
+     * @inheritDoc
+     */
+    delete(): void;
     /**
      * @inheritDoc
      */
@@ -89,8 +93,4 @@ export declare abstract class CategoryAxisBase extends AxisBase2D {
     protected getMaxAutoTicks(): number;
     private generateDefaultXValuesForCategoryAxis;
     private setBaseXValues;
-    /**
-     * @inheritDoc
-     */
-    delete(): void;
 }

package/Charting/Visuals/Axis/CategoryAxisBase.js

@@ -37,8 +37,9 @@ var CategoryAxisBase = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link ICategoryAxisBaseOptions} used to configure the axis at instantiation time
      */
     function CategoryAxisBase(webAssemblyContext, options) {
+        var _this = this;
         var _a, _b, _c;
-        var _this = _super.call(this, webAssemblyContext, options) || this;
+        _this = _super.call(this, webAssemblyContext, options) || this;
         _this.defaultXValuesProperty = [];
         _this.defaultXStartProperty = 0;
         _this.defaultXStepProperty = 1;
@@ -134,6 +135,13 @@ var CategoryAxisBase = /** @class */ (function (_super) {
         this.setBaseXValues(coordCalc, renderableSeries);
         this.coordCalcCache = coordCalc;
     };
+    /**
+     * @inheritDoc
+     */
+    CategoryAxisBase.prototype.delete = function () {
+        _super.prototype.delete.call(this);
+        this.defaultBaseXValues = (0, Deleter_1.deleteSafe)(this.defaultBaseXValues);
+    };
     /**
      * @inheritDoc
      */
@@ -142,12 +150,13 @@ var CategoryAxisBase = /** @class */ (function (_super) {
         var min = this.visibleRange.min;
         var max = this.visibleRange.max;
         var size = this.axisLength;
-        var shouldFlip = !(this.isXAxis !== this.flippedCoordinates);
         var scs = this.parentSurface;
         var renderableSeries = scs.renderableSeries.asArray().find(function (rs) { return rs.xAxisId === _this.id; });
-        var coordCalc = shouldFlip
-            ? new FlippedCategoryCoordinateCalculator_1.FlippedCategoryCoordinateCalculator(this.webAssemblyContext2D, size, 0, 0, min, max, this.offset)
-            : new CategoryCoordinateCalculator_1.CategoryCoordinateCalculator(this.webAssemblyContext2D, size, 0, 0, min, max, this.offset);
+        // For reasons passing understanding, the native Category Coord Calculators operate in reverse to the linear ones
+        // The order is switched so they match the values of shouldFlipCC
+        var coordCalc = this.isXAxis !== this.flippedCoordinates
+            ? new CategoryCoordinateCalculator_1.CategoryCoordinateCalculator(this.webAssemblyContext2D, size, 0, 0, min, max, this.offset)
+            : new FlippedCategoryCoordinateCalculator_1.FlippedCategoryCoordinateCalculator(this.webAssemblyContext2D, size, 0, 0, min, max, this.offset);
         this.setBaseXValues(coordCalc, renderableSeries);
         return coordCalc;
     };
@@ -220,13 +229,6 @@ var CategoryAxisBase = /** @class */ (function (_super) {
             coordCalc.baseXValues = renderableSeries.dataSeries.getNativeXValues();
         }
     };
-    /**
-     * @inheritDoc
-     */
-    CategoryAxisBase.prototype.delete = function () {
-        _super.prototype.delete.call(this);
-        this.defaultBaseXValues = (0, Deleter_1.deleteSafe)(this.defaultBaseXValues);
-    };
     return CategoryAxisBase;
 }(AxisBase2D_1.AxisBase2D));
 exports.CategoryAxisBase = CategoryAxisBase;

package/Charting/Visuals/Axis/DateTimeNumericAxis.js

@@ -22,8 +22,9 @@ var NumericAxis_1 = require("./NumericAxis");
 var DateTimeNumericAxis = /** @class */ (function (_super) {
     __extends(DateTimeNumericAxis, _super);
     function DateTimeNumericAxis(webAssemblyContext, options) {
+        var _this = this;
         var _a;
-        var _this = _super.call(this, webAssemblyContext, options) || this;
+        _this = _super.call(this, webAssemblyContext, options) || this;
         _this.labelProvider = (_a = options === null || options === void 0 ? void 0 : options.labelProvider) !== null && _a !== void 0 ? _a : new SmartDateLabelProvider_1.SmartDateLabelProvider();
         _this.deltaCalculator = new DateTimeDeltaCalculator_1.DateTimeDeltaCalculator(webAssemblyContext, {
             possibleDeltas: options === null || options === void 0 ? void 0 : options.possibleDeltas,

package/Charting/Visuals/Axis/DeltaCalculator/DateTimeDeltaCalculator.js

@@ -25,8 +25,9 @@ var NumericDeltaCalculator_1 = require("./NumericDeltaCalculator");
 var DateTimeDeltaCalculator = /** @class */ (function (_super) {
     __extends(DateTimeDeltaCalculator, _super);
     function DateTimeDeltaCalculator(webAssemblyContext, options) {
+        var _this = this;
         var _a;
-        var _this = _super.call(this, webAssemblyContext) || this;
+        _this = _super.call(this, webAssemblyContext) || this;
         _this.possibleDeltasProperty = [
             1,
             2,

package/Charting/Visuals/Axis/LabelProvider/DateLabelProvider.js

@@ -41,8 +41,9 @@ var DateLabelProvider = /** @class */ (function (_super) {
      * @param options Optional parameters of type {@link ILabelOptions} used to configure the axis at instantiation time
      */
     function DateLabelProvider(options) {
+        var _this = this;
         var _a, _b;
-        var _this = _super.call(this, __assign({ labelFormat: (_a = options === null || options === void 0 ? void 0 : options.labelFormat) !== null && _a !== void 0 ? _a : NumericFormat_1.ENumericFormat.Date_DDMMYYYY, cursorLabelFormat: (_b = options === null || options === void 0 ? void 0 : options.cursorLabelFormat) !== null && _b !== void 0 ? _b : NumericFormat_1.ENumericFormat.Date_DDMMYYYY }, options)) || this;
+        _this = _super.call(this, __assign({ labelFormat: (_a = options === null || options === void 0 ? void 0 : options.labelFormat) !== null && _a !== void 0 ? _a : NumericFormat_1.ENumericFormat.Date_DDMMYYYY, cursorLabelFormat: (_b = options === null || options === void 0 ? void 0 : options.cursorLabelFormat) !== null && _b !== void 0 ? _b : NumericFormat_1.ENumericFormat.Date_DDMMYYYY }, options)) || this;
         _this.type = LabelProviderType_1.ELabelProviderType.Date;
         _this.formatLabelProperty = function (dataValue) {
             return _this.applyFormat((0, number_1.formatNumber)(dataValue, _this.numericFormat, _this.precision));

package/Charting/Visuals/Axis/LabelProvider/LabelCache.js

@@ -68,6 +68,8 @@ var clearCacheByStyle = function (styleId) {
         var keyStr = _a[_i];
         var _b = parseCacheKey(keyStr), text = _b.text, keyStyleId = _b.styleId;
         if (keyStyleId === styleId) {
+            var label = labelCacheByTextAndStyle.get(keyStr);
+            (0, Deleter_1.deleteSafe)(label.bitmapTexture);
             labelCacheByTextAndStyle.delete(keyStr);
         }
     }

package/Charting/Visuals/Axis/LabelProvider/LabelProviderBase2D.d.ts

@@ -8,6 +8,8 @@ export declare class LabelInfo {
     tick: number;
     text: string;
     bitmapTexture: TSRTexture;
+    textWidth: number;
+    textHeight: number;
     textureHeight: number;
     textureWidth: number;
     lastUsed: number;
@@ -29,6 +31,10 @@ export interface ILabel2DOptions extends ILabelOptions {
      * You may need to set this false if you are overriding getLabelTexture or getLabelTextureAsync without setting a unique style.
      */
     useSharedCache?: boolean;
+    /**
+     * Experimental - set true to use native text for axes.  Not all text features currently supported
+     */
+    useNativeText?: boolean;
 }
 /**
  * The {@link LabelProviderBase2D} provides base functionality for 2D label providers, including caching of label textures
@@ -45,7 +51,13 @@ export declare abstract class LabelProviderBase2D extends LabelProvider implemen
      * Can be set globally using SciChartDefaults.  Currently default false.
      */
     asyncLabels: boolean;
+    /**
+     * Experimental - set true to use native text for axes.  Not all text features currently supported
+     */
+    useNativeText: boolean;
     protected tickToText: Map<number, string>;
+    /** Set this true if the format function could return different results for the same input (eg SmartDateLabelprovider) */
+    protected textVariesForSameTick: boolean;
     /**
      * This is the id for the text style used by this axis, as stored in the label cache. Cached labels are accessed by text and styleId.
      * If you have useSharedCache = true and are overriding getLabelTexture or getLabelTextureAsync and do not ensure the style is unique,
@@ -116,11 +128,13 @@ export declare abstract class LabelProviderBase2D extends LabelProvider implemen
      * otherwise other axes using the same style and text may see your custom texture. Alternatively you can override getCachedStyle or set styleId directly
      */
     getLabelTexture(labelText: string, textureManager: TextureManager, labelStyle: TTextStyle): TTextureObject;
+    getNativeLabelInfo(labelText: string): LabelInfo;
     delete(): void;
     toJSON(): {
         type: string;
         options: Required<Omit<ILabelOptions, never>>;
     };
+    protected getLabelSizesNative(labels: string[], textStyle: TTextStyle): void;
     protected providerId: string;
     /**
      * This method creates the text style to be stored in the label cache.