implement label overwrites for occt dimensions, which allow expression evaluations.

Author: matas-bitbybit-dev

packages/dev/occt/lib/api/inputs/occ-inputs.ts

@@ -7041,7 +7041,7 @@ export namespace OCCT {
         direction: Base.Vector3 = [0, 1, 0];
     }
     export class SimpleLinearLengthDimensionDto {
-        constructor(start?: Base.Point3, end?: Base.Point3, direction?: Base.Vector3, offsetFromPoints?: number, crossingSize?: number, labelSuffix?: string, labelSize?: number, labelOffset?: number, labelRotation?: number, arrowType?: dimensionEndTypeEnum, arrowSize?: number, arrowAngle?: number, arrowsFlipped?: boolean, labelFlipHorizontal?: boolean, labelFlipVertical?: boolean) {
+        constructor(start?: Base.Point3, end?: Base.Point3, direction?: Base.Vector3, offsetFromPoints?: number, crossingSize?: number, labelSuffix?: string, labelSize?: number, labelOffset?: number, labelRotation?: number, arrowType?: dimensionEndTypeEnum, arrowSize?: number, arrowAngle?: number, arrowsFlipped?: boolean, labelFlipHorizontal?: boolean, labelFlipVertical?: boolean, labelOverwrite?: string) {
             if (start !== undefined) { this.start = start; }
             if (end !== undefined) { this.end = end; }
             if (direction !== undefined) { this.direction = direction; }
@@ -7057,6 +7057,7 @@ export namespace OCCT {
             if (arrowsFlipped !== undefined) { this.arrowsFlipped = arrowsFlipped; }
             if (labelFlipHorizontal !== undefined) { this.labelFlipHorizontal = labelFlipHorizontal; }
             if (labelFlipVertical !== undefined) { this.labelFlipVertical = labelFlipVertical; }
+            if (labelOverwrite !== undefined) { this.labelOverwrite = labelOverwrite; }
         }
         /**
          * The start point for dimension
@@ -7162,9 +7163,15 @@ export namespace OCCT {
          * @default false
          */
         labelFlipVertical? = false;
+        /**
+         * Override label text with custom expression (supports 'val' for computed value, e.g., '100*val', 'Length: val mm')
+         * @default 1*val
+         * @optional true
+         */
+        labelOverwrite? = "1*val";
     }
     export class SimpleAngularDimensionDto {
-        constructor(direction1?: Base.Point3, direction2?: Base.Point3, center?: Base.Point3, radius?: number, offsetFromCenter?: number, crossingSize?: number, radians?: boolean, labelSuffix?: string, labelSize?: number, labelOffset?: number, endType?: dimensionEndTypeEnum, arrowSize?: number, arrowAngle?: number, arrowsFlipped?: boolean, labelRotation?: number, labelFlipHorizontal?: boolean, labelFlipVertical?: boolean) {
+        constructor(direction1?: Base.Point3, direction2?: Base.Point3, center?: Base.Point3, radius?: number, offsetFromCenter?: number, crossingSize?: number, radians?: boolean, labelSuffix?: string, labelSize?: number, labelOffset?: number, endType?: dimensionEndTypeEnum, arrowSize?: number, arrowAngle?: number, arrowsFlipped?: boolean, labelRotation?: number, labelFlipHorizontal?: boolean, labelFlipVertical?: boolean, labelOverwrite?: string) {
             if (direction1 !== undefined) { this.direction1 = direction1; }
             if (direction2 !== undefined) { this.direction2 = direction2; }
             if (center !== undefined) { this.center = center; }
@@ -7182,6 +7189,7 @@ export namespace OCCT {
             if (labelRotation !== undefined) { this.labelRotation = labelRotation; }
             if (labelFlipHorizontal !== undefined) { this.labelFlipHorizontal = labelFlipHorizontal; }
             if (labelFlipVertical !== undefined) { this.labelFlipVertical = labelFlipVertical; }
+            if (labelOverwrite !== undefined) { this.labelOverwrite = labelOverwrite; }
         }
 
         /**
@@ -7301,6 +7309,12 @@ export namespace OCCT {
          * @default false
          */
         labelFlipVertical? = false;
+        /**
+         * Override label text with custom expression (supports 'val' for computed value, e.g., '100*val', 'Angle: val deg')
+         * @default 1*val
+         * @optional true
+         */
+        labelOverwrite? = "1*val";
     }
     export class PinWithLabelDto {
         constructor(startPoint?: Base.Point3, endPoint?: Base.Point3, direction?: Base.Vector3, offsetFromStart?: number, label?: string, labelOffset?: number, labelSize?: number, endType?: dimensionEndTypeEnum, arrowSize?: number, arrowAngle?: number, arrowsFlipped?: boolean, labelRotation?: number, labelFlipHorizontal?: boolean, labelFlipVertical?: boolean) {

packages/dev/occt/lib/services/base/dimensions.service.ts

@@ -22,6 +22,60 @@ export class DimensionsService {
         private readonly wiresService: WiresService
     ) { }
 
+    /**
+     * Evaluates a mathematical expression or template string with a given value
+     * @param expression The expression to evaluate (can contain 'val' placeholder)
+     * @param value The numeric value to substitute for 'val'
+     * @param decimalPlaces Number of decimal places to format the result
+     * @returns The evaluated expression as a formatted string
+     */
+    private evaluateExpression(expression: string, value: number, decimalPlaces: number): string {
+        try {
+            // Replace 'val' with the actual value in the expression
+            const evaluatedExpression = expression.replace(/val/g, value.toString());
+            
+            // Simple math expression evaluation (supports +, -, *, /, parentheses)
+            // Only allow safe mathematical operations
+            const safeExpression = evaluatedExpression.replace(/[^0-9+\-*/.() ]/g, "");
+            if (safeExpression !== evaluatedExpression) {
+                // If expression contains non-math characters, treat it as a template
+                // For template strings, we still want to format numbers with decimal places
+                const formattedValue = value.toFixed(decimalPlaces);
+                return expression.replace(/val/g, formattedValue);
+            }
+            
+            // Evaluate mathematical expression and apply decimal places
+            const result = Function("\"use strict\"; return (" + safeExpression + ")")();
+            return result.toFixed(decimalPlaces);
+        } catch (error) {
+            // If evaluation fails, return the original value formatted
+            return value.toFixed(decimalPlaces);
+        }
+    }
+
+    /**
+     * Formats dimension label text with optional expression evaluation
+     * @param value The numeric value to display
+     * @param labelOverwrite Optional expression to evaluate instead of raw value
+     * @param decimalPlaces Number of decimal places for formatting
+     * @param labelSuffix Suffix to append to the text
+     * @returns Formatted dimension label text
+     */
+    private formatDimensionLabel(
+        value: number,
+        labelOverwrite: string | undefined,
+        decimalPlaces: number,
+        labelSuffix: string
+    ): string {
+        let result: string;
+        if (labelOverwrite) {
+            result = this.evaluateExpression(labelOverwrite, value, decimalPlaces);
+        } else {
+            result = value.toFixed(decimalPlaces);
+        }
+        return result + " " + labelSuffix;
+    }
+
     private createArrow(inputs: {
         tipPoint: Inputs.Base.Point3,
         direction: Inputs.Base.Vector3,
@@ -141,8 +195,15 @@ export class DimensionsService {
             endPoint: inputs.end,
         });
 
+        const labelText = this.formatDimensionLabel(
+            length,
+            inputs.labelOverwrite,
+            inputs.decimalPlaces,
+            inputs.labelSuffix
+        );
+
         const txtOpt = new Inputs.OCCT.TextWiresDto();
-        txtOpt.text = length.toFixed(inputs.decimalPlaces) + " " + inputs.labelSuffix;
+        txtOpt.text = labelText;
         txtOpt.xOffset = 0;
         txtOpt.yOffset = 0;
         txtOpt.height = inputs.labelSize;
@@ -324,8 +385,15 @@ export class DimensionsService {
             angle = this.base.math.degToRad({ number: angle });
         }
 
+        const labelText = this.formatDimensionLabel(
+            angle,
+            inputs.labelOverwrite,
+            inputs.decimalPlaces,
+            inputs.labelSuffix
+        );
+
         const txtOpt = new Inputs.OCCT.TextWiresDto();
-        txtOpt.text = angle.toFixed(inputs.decimalPlaces) + " " + inputs.labelSuffix;
+        txtOpt.text = labelText;
         txtOpt.xOffset = 0;
         txtOpt.yOffset = 0;
         txtOpt.height = inputs.labelSize;