@itwin/core-frontend 3.4.0-dev.9 → 3.5.0-dev.5

package/lib/cjs/tools/MeasureTool.js

@@ -22,7 +22,9 @@ const GraphicBuilder_1 = require("../render/GraphicBuilder");
 const PrimitiveTool_1 = require("./PrimitiveTool");
 const Tool_1 = require("./Tool");
 const ToolAssistance_1 = require("./ToolAssistance");
-function translateBold(key) { return `<b>${Tool_1.CoreTools.translate(`Measure.Labels.${key}`)}:</b> `; }
+function translateBold(key) {
+    return `<b>${Tool_1.CoreTools.translate(`Measure.Labels.${key}`)}:</b> `;
+}
 /** @internal */
 class MeasureLabel {
     constructor(worldLocation, label) {
@@ -95,33 +97,28 @@ class MeasureMarker extends Marker_1.Marker {
 }
 /** @internal */
 function adjustPoint(ev, segments, locations) {
-    // If the point was from a hit we must transform it by the model display transform of what got hit.
-    if (undefined === ev.viewport || undefined === ev.viewport.view.modelDisplayTransformProvider)
+    var _a;
+    // If the point was from a hit we must transform it by the display transform of what got hit.
+    const hit = IModelApp_1.IModelApp.accuSnap.currHit;
+    if (!hit || !ev.viewport || !hit.modelId)
         return ev.point;
-    if (undefined !== IModelApp_1.IModelApp.accuSnap.currHit && undefined !== IModelApp_1.IModelApp.accuSnap.currHit.modelId) {
-        if ("0" !== IModelApp_1.IModelApp.accuSnap.currHit.modelId) {
-            const newPoint = ev.point.clone();
-            ev.viewport.view.transformPointByModelDisplayTransform(IModelApp_1.IModelApp.accuSnap.currHit.modelId, newPoint, true);
-            return newPoint;
-        }
-        else {
-            // Must have snapped to a decoration, so look through previous any segments & locations for a match to get an adjusted point.
-            if (undefined !== segments) {
-                for (const seg of segments) {
-                    if (seg.start.isExactEqual(ev.point))
-                        return seg.adjustedStart.clone();
-                    if (seg.end.isExactEqual(ev.point))
-                        return seg.adjustedEnd.clone();
-                }
-            }
-            if (undefined !== locations) {
-                for (const loc of locations) {
-                    if (loc.point.isExactEqual(ev.point))
-                        return loc.adjustedPoint.clone();
-                }
-            }
+    if ("0" !== hit.modelId) {
+        const transform = ev.viewport.view.computeDisplayTransform({ modelId: hit.modelId, elementId: hit.sourceId });
+        return (_a = transform === null || transform === void 0 ? void 0 : transform.multiplyInversePoint3d(ev.point)) !== null && _a !== void 0 ? _a : ev.point;
+    }
+    // Must have snapped to a decoration, so look through previous any segments & locations for a match to get an adjusted point.
+    if (segments) {
+        for (const seg of segments) {
+            if (seg.start.isExactEqual(ev.point))
+                return seg.adjustedStart.clone();
+            if (seg.end.isExactEqual(ev.point))
+                return seg.adjustedEnd.clone();
         }
     }
+    if (locations)
+        for (const loc of locations)
+            if (loc.point.isExactEqual(ev.point))
+                return loc.adjustedPoint.clone();
     return ev.point;
 }
 /** Report distance between 2 points using current quantity formatter for length.
@@ -146,7 +143,10 @@ class MeasureDistanceTool extends PrimitiveTool_1.PrimitiveTool {
     /** @internal */
     requireWriteableTarget() { return false; }
     /** @internal */
-    async onPostInstall() { await super.onPostInstall(); this.setupAndPromptForNextAction(); }
+    async onPostInstall() {
+        await super.onPostInstall();
+        this.setupAndPromptForNextAction();
+    }
     /** @internal */
     async onUnsuspend() { this.showPrompt(); }
     /** @internal */
@@ -587,7 +587,10 @@ class MeasureLocationTool extends PrimitiveTool_1.PrimitiveTool {
     /** @internal */
     requireWriteableTarget() { return false; }
     /** @internal */
-    async onPostInstall() { await super.onPostInstall(); this.setupAndPromptForNextAction(); }
+    async onPostInstall() {
+        await super.onPostInstall();
+        this.setupAndPromptForNextAction();
+    }
     /** @internal */
     async onUnsuspend() { this.showPrompt(); }
     /** @internal */
@@ -653,8 +656,11 @@ class MeasureLocationTool extends PrimitiveTool_1.PrimitiveTool {
         return toolTip;
     }
     /** @internal */
-    decorate(context) { if (!this.isCompatibleViewport(context.viewport, false))
-        return; this._acceptedLocations.forEach((marker) => marker.addDecoration(context)); }
+    decorate(context) {
+        if (!this.isCompatibleViewport(context.viewport, false))
+            return;
+        this._acceptedLocations.forEach((marker) => marker.addDecoration(context));
+    }
     /** @internal */
     decorateSuspended(context) { this.decorate(context); }
     reportMeasurements() {
@@ -761,7 +767,10 @@ class MeasureAreaByPointsTool extends PrimitiveTool_1.PrimitiveTool {
     /** @internal */
     requireWriteableTarget() { return false; }
     /** @internal */
-    async onPostInstall() { await super.onPostInstall(); this.setupAndPromptForNextAction(); }
+    async onPostInstall() {
+        await super.onPostInstall();
+        this.setupAndPromptForNextAction();
+    }
     /** @internal */
     async onUnsuspend() { this.showPrompt(); }
     /** @internal */
@@ -887,8 +896,10 @@ class MeasureAreaByPointsTool extends PrimitiveTool_1.PrimitiveTool {
             this._marker.addDecoration(context);
     }
     /** @internal */
-    decorateSuspended(context) { if (this._isComplete)
-        this.decorate(context); }
+    decorateSuspended(context) {
+        if (this._isComplete)
+            this.decorate(context);
+    }
     /** @internal */
     async onMouseMotion(ev) {
         if (this._points.length > 0 && undefined !== ev.viewport && !this._isComplete) {
@@ -1065,16 +1076,23 @@ class MeasureElementTool extends PrimitiveTool_1.PrimitiveTool {
         this._useSelection = false;
     }
     /** @internal */
-    allowView(vp) { return (core_common_1.MassPropertiesOperation.AccumulateVolumes === this.getOperation() ? vp.view.isSpatialView() : (vp.view.isSpatialView() || vp.view.isDrawingView())); }
+    allowView(vp) {
+        return (core_common_1.MassPropertiesOperation.AccumulateVolumes === this.getOperation() ? vp.view.isSpatialView() : (vp.view.isSpatialView() || vp.view.isDrawingView()));
+    }
     /** @internal */
     isCompatibleViewport(vp, isSelectedViewChange) { return (super.isCompatibleViewport(vp, isSelectedViewChange) && undefined !== vp && this.allowView(vp)); }
     /** @internal */
     requireWriteableTarget() { return false; }
     /** @internal */
-    async onPostInstall() { await super.onPostInstall(); this.setupAndPromptForNextAction(); }
+    async onPostInstall() {
+        await super.onPostInstall();
+        this.setupAndPromptForNextAction();
+    }
     /** @internal */
-    async onCleanup() { if (0 !== this._acceptedIds.length)
-        this.iModel.hilited.setHilite(this._acceptedIds, false); }
+    async onCleanup() {
+        if (0 !== this._acceptedIds.length)
+            this.iModel.hilited.setHilite(this._acceptedIds, false);
+    }
     /** @internal */
     async onUnsuspend() { this.showPrompt(); }
     /** @internal */
@@ -1117,9 +1135,13 @@ class MeasureElementTool extends PrimitiveTool_1.PrimitiveTool {
         this.showPrompt();
     }
     /** @internal */
-    decorate(context) { if (!this.isCompatibleViewport(context.viewport, false))
-        return; this._acceptedMeasurements.forEach((marker) => marker.addDecoration(context)); if (undefined !== this._totalMarker)
-        this._totalMarker.addDecoration(context); }
+    decorate(context) {
+        if (!this.isCompatibleViewport(context.viewport, false))
+            return;
+        this._acceptedMeasurements.forEach((marker) => marker.addDecoration(context));
+        if (undefined !== this._totalMarker)
+            this._totalMarker.addDecoration(context);
+    }
     /** @internal */
     decorateSuspended(context) { this.decorate(context); }
     reportMeasurements() {
@@ -1266,8 +1288,10 @@ class MeasureElementTool extends PrimitiveTool_1.PrimitiveTool {
     /** @internal */
     async doMeasureSelectedElements(viewport) {
         const candidates = [];
-        viewport.iModel.selectionSet.elements.forEach((val) => { if (!core_bentley_1.Id64.isInvalid(val) && !core_bentley_1.Id64.isTransient(val))
-            candidates.push(val); });
+        viewport.iModel.selectionSet.elements.forEach((val) => {
+            if (!core_bentley_1.Id64.isInvalid(val) && !core_bentley_1.Id64.isTransient(val))
+                candidates.push(val);
+        });
         if (0 === candidates.length)
             return;
         const requestProps = {