@xeokit/xeokit-sdk 2.6.91 → 2.6.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.91",
+  "version": "2.6.92",
   "description": "3D BIM IFC Viewer SDK for AEC engineering applications. Open Source JavaScript Toolkit based on pure WebGL for top performance, real-world coordinates and full double precision",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/plugins/AngleMeasurementsPlugin/AngleMeasurement.js

@@ -60,6 +60,9 @@ class AngleMeasurement extends Component {
 
         this.approximate = cfg.approximate;
 
+        this._labelStringFormat = (angle) => {
+            return (this._approximate ? " ~ " : " = ") + angle.toFixed(2) + "°";
+        };
 
         const canvas = scene.canvas.canvas;
 
@@ -181,7 +184,7 @@ class AngleMeasurement extends Component {
             math.normalizeVec3(tmpVec3a);
             math.normalizeVec3(tmpVec3b);
             this._angle = Math.abs(math.angleVec3(tmpVec3a, tmpVec3b)) * math.RADTODEG;
-            this._angleLabel.setText((this._approximate ? " ~ " : " = ") + this._angle.toFixed(2) + "°");
+            this._angleLabel.setText(this._labelStringFormat(this._angle));
         } else {
             this._angle = undefined;
             this._angleLabel.setText("");
@@ -441,6 +444,23 @@ class AngleMeasurement extends Component {
         this._drawables.forEach(d => d.setClickable(this._clickable.get()));
     }
 
+    /**
+     * Gets the function that formats the angle label's text.
+     *
+     * By default, this function formats the angle with two decimal places.
+     */
+    get labelStringFormat() {
+        return this._labelStringFormat;
+    }
+
+    /** 
+     * Sets the function that formats the angle label's text.
+     */
+    set labelStringFormat(value) {
+        this._labelStringFormat = value;
+        this._update();
+    }
+
     /**
      * Gets if the wires, dots ad labels will fire "mouseOver" "mouseLeave" and "contextMenu" events.
      *

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js

@@ -72,6 +72,13 @@ class DistanceMeasurement extends Component {
         this._axesBasis = math.identityMat4();
         this.approximate = cfg.approximate;
 
+        this._labelStringFormat = (len) => {
+            const metrics = this.plugin.viewer.scene.metrics;
+            const scale = metrics.scale;
+            const unit = metrics.unitsInfo[metrics.units].abbrev;
+
+            return (this.approximate ? " ~ " : " = ") + (len * scale).toFixed(2) + unit;
+        };
 
         const canvas = scene.canvas.canvas;
 
@@ -209,24 +216,24 @@ class DistanceMeasurement extends Component {
                     label.setPosOnWire(p0, p1, offsetIdx * 35, 0);
                 }
             };
-            const unitStr = len => (this._approximate ? " ~ " : " = ") + len.toFixed(2) + unit;
 
             this._xAxisWire.setEnds(p0, xEnd);
             setAxisLabelCoords(this._xAxisLabel, p0, xEnd, 1);
-            this._xAxisLabel.setText("X" + unitStr(math.distVec3(p0, xEnd) * scale));
+            this._xAxisLabel.setText("X" + this._labelStringFormat(math.distVec3(p0, xEnd)));
 
             this._yAxisWire.setEnds(xEnd, zStart);
             setAxisLabelCoords(this._yAxisLabel, xEnd, zStart, 2);
-            this._yAxisLabel.setText("Y" + unitStr(math.distVec3(xEnd, zStart) * scale));
+            this._yAxisLabel.setText("Y" + this._labelStringFormat(math.distVec3(xEnd, zStart)));
 
             this._zAxisWire.setEnds(zStart, p1);
             setAxisLabelCoords(this._zAxisLabel, zStart, p1, 3);
-            this._zAxisLabel.setText((measurementOrientationVertical ? "" : "Z") + unitStr(math.distVec3(zStart, p1) * scale));
+            this._zAxisLabel.setText((measurementOrientationVertical ? "" : "Z") + this._labelStringFormat(math.distVec3(zStart, p1)));
 
             this._lengthWire.setEnds(p0, p1);
             setAxisLabelCoords(this._lengthLabel, p0, p1, 0);
-            this._length = math.distVec3(p0, p1) * scale;
-            this._lengthLabel.setText(unitStr(this._length));
+            const length = math.distVec3(p0, p1);
+            this._length = length * scale;
+            this._lengthLabel.setText(this._labelStringFormat(length));
         };
 
         if (measurementOrientationVertical) {
@@ -679,6 +686,25 @@ class DistanceMeasurement extends Component {
         return this._clickable.get();
     }
 
+    /**
+     * Sets the function to format unit strings.
+     *
+     * @type {Function}
+     */
+    set labelStringFormat(value) {
+        this._labelStringFormat = value;
+        this._update();
+    }
+
+    /**
+     * Gets the function to format unit strings.
+     *
+     * @type {Function}
+     */
+    get labelStringFormat() {
+        return this._labelStringFormat;
+    }
+
     /**
      * @private
      */