[measure-tools] add multi point option

.vscode/launch.json

@@ -5,12 +5,24 @@
   "version": "0.2.0",
   "compounds": [
     {
-      "name": "measure-tools tests (chrome)",
+      "name": "test-viewer (chrome)",
       "presentation": {
         "hidden": false,
         "group": "1_ChromeTests",
         "order": 1
       },
+      "configurations": [
+        "[SCRIPTS] test-viewer",
+        "[FRONTEND] test-viewer",
+      ]
+    },
+    {
+      "name": "measure-tools tests (chrome)",
+      "presentation": {
+        "hidden": false,
+        "group": "1_ChromeTests",
+        "order": 2
+      },
       "configurations": [
         "[CERTA] measure-tools tests",
         "[ATTACH] measure-tools tests",
@@ -57,6 +69,31 @@
         "[CERTA] measure-tools tests"
       ]
     },
+    { /* Partial */
+      "name": "[FRONTEND] test-viewer",
+      "presentation": {
+        "hidden": true,
+      },
+      "cwd": "${workspaceFolder}/apps/test-viewer",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:3000/",
+      "sourceMaps": true,
+      "outputCapture": "std",
+      "webRoot": "${workspaceFolder}/apps/test-viewer",
+      "outFiles": [
+        "${workspaceFolder}/apps/test-viewer/lib/**/*.js",
+        "${workspaceFolder}/packages/itwin/*/lib/**/*.js",
+      ],
+    },
+    { /* Partial */
+      "name": "[SCRIPTS] test-viewer",
+      "presentation": {
+        "hidden": true
+      },
+      "type": "node",
+      "preLaunchTask": "[TASK] test-viewer start"
+    },
     {
       "name": "Tests: Tree-widget",
       "cwd": "${workspaceFolder}/packages/itwin/tree-widget",

.vscode/tasks.json

@@ -0,0 +1,12 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+    {
+      "label": "[TASK] test-viewer start",
+      "type": "npm",
+      "script": "start",
+      "path": "apps/test-viewer/",
+      "problemMatcher": []
+    },
+  ]
+}

apps/test-viewer/src/components/Viewer.tsx

@@ -62,7 +62,7 @@ function ViewerWithOptions() {
       defaultUiConfig={{
         hideNavigationAid: true,
         hideStatusBar: false,
-        hideToolSettings: true,
+        hideToolSettings: false,
       }}
       mapLayerOptions={{ BingMaps: { key: "key", value: ApiKeys.BingMapsKey } }}
       tileAdmin={{ cesiumIonKey: ApiKeys.CesiumKey }}

change/@itwin-measure-tools-react-2cc3c695-6c3e-462a-a0ba-c95eddae0de4.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Add a tool settings to measuredistance tool allowing consecutive / multi point measurements",
+  "packageName": "@itwin/measure-tools-react",
+  "email": "3418768+a-gagnon@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

packages/itwin/measure-tools/public/locales/en/MeasureTools.json

@@ -41,6 +41,7 @@
       "slope": "Slope:",
       "run": "Run:",
       "rise": "Rise:",
+      "useMultiPoint": "Multi-point",
       "mainInstruction": "Enter point to measure from",
       "mainInstruction2": "Enter point to measure to"
     },
@@ -148,4 +149,4 @@
     "label": "Measurement",
     "tooltip": "Measurement Tools"
   }
-}
+}

packages/itwin/measure-tools/src/tools/MeasureDistanceTool.ts

@@ -26,14 +26,17 @@ import { MeasureTools } from "../MeasureTools";
 import { MeasureDistanceToolModel } from "../toolmodels/MeasureDistanceToolModel";
 import { SheetMeasurementsHelper } from "../api/SheetMeasurementHelper";
 import type { DrawingMetadata } from "../api/Measurement";
-import { DrawingDataCache } from "../api/DrawingTypeDataCache";
+import { type DialogItem, type DialogItemValue, type DialogPropertySyncItem, PropertyDescriptionHelper } from "@itwin/appui-abstract";
 
 export class MeasureDistanceTool extends MeasurementToolBase<
 DistanceMeasurement,
 MeasureDistanceToolModel
 > {
   public static override toolId = "MeasureTools.MeasureDistance";
   public static override iconSpec = "icon-measure-distance";
+  private static readonly useMultiPointPropertyName = "useMultiPoint";
+
+  private _useMultiPointMeasurement: boolean = false;
   private _enableSheetMeasurements: boolean;
 
   public static override get flyover() {
@@ -98,6 +101,11 @@ MeasureDistanceToolModel
     ) {
       this.toolModel.setEndPoint(viewType, ev.point, false);
       await this.onReinitialize();
+
+      // Trigger another button event to use as the start point of the next measurement
+      if (this._useMultiPointMeasurement) {
+        return this.onDataButtonDown(ev);
+      }
     }
 
     ev.viewport.invalidateDecorations();
@@ -247,4 +255,46 @@ MeasureDistanceToolModel
     );
     IModelApp.notifications.setToolAssistance(instructions);
   }
+
+  public override async onInstall(): Promise<boolean> {
+    if (!await super.onInstall()) {
+      return false;
+    }
+    const initialValue = IModelApp.toolAdmin.toolSettingsState.getInitialToolSettingValue(this.toolId, MeasureDistanceTool.useMultiPointPropertyName);
+    this._useMultiPointMeasurement = true === initialValue?.value;
+    return true;
+  }
+
+  public override async onCleanup(): Promise<void> {
+    const propertyName = MeasureDistanceTool.useMultiPointPropertyName;
+    const value: DialogItemValue = { value: this._useMultiPointMeasurement };
+    IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, { propertyName, value });
+
+    return super.onCleanup();
+  }
+
+  public override supplyToolSettingsProperties(): DialogItem[] {
+    const propertyLabel = MeasureTools.localization.getLocalizedString(
+      "MeasureTools:tools.MeasureDistance.useMultiPoint"
+    );
+    const toolSettings: DialogItem[] = [{
+      value: { value: this._useMultiPointMeasurement },
+      property: PropertyDescriptionHelper.buildToggleDescription(MeasureDistanceTool.useMultiPointPropertyName, propertyLabel),
+      editorPosition: { rowPriority: 0, columnIndex: 0 },
+      isDisabled: false,
+    }];
+    return toolSettings;
+  }
+
+  public override async applyToolSettingPropertyChange(updatedValue: DialogPropertySyncItem): Promise<boolean> {
+    if (MeasureDistanceTool.useMultiPointPropertyName === updatedValue.propertyName) {
+      const value = updatedValue.value.value;
+      if (typeof value !== "boolean") {
+        return false;
+      }
+      this._useMultiPointMeasurement = value;
+      return true;
+    }
+    return super.applyToolSettingPropertyChange(updatedValue);
+  }
 }

packages/itwin/tree-widget/src/e2e-tests/ModelsTree.test.ts

@@ -6,17 +6,8 @@
 import type { Locator } from "@playwright/test";
 import { expect, test } from "@playwright/test";
 import {
-  expandStagePanel,
-  initTreeWidgetTest,
-  locateInstanceFilter,
-  locateNode,
-  scrollTree,
-  selectOperatorInDialog,
-  selectPropertyInDialog,
-  selectTree,
-  selectValueInDialog,
-  takeScreenshot,
-  withDifferentDensities,
+  expandStagePanel, initTreeWidgetTest, locateInstanceFilter, locateNode, scrollTree, selectOperatorInDialog, selectPropertyInDialog, selectTree,
+  selectValueInDialog, takeScreenshot, withDifferentDensities,
 } from "./utils";
 
 test.describe("Models tree", () => {
@@ -39,9 +30,6 @@ test.describe("Models tree", () => {
       const physicalModelNode = locateNode(treeWidget, "ProcessPhysicalModel");
       await physicalModelNode.getByLabel("Expand").click();
 
-      // wait for node at the bottom to be visible/loaded
-      await locateNode(treeWidget, "Tag-Category").waitFor();
-
       const pipeSupportNode = locateNode(treeWidget, "PipeSupport");
       await pipeSupportNode.getByLabel("Expand").click();
 
@@ -115,9 +103,6 @@ test.describe("Models tree", () => {
       const node = locateNode(treeWidget, "ProcessPhysicalModel");
       await node.getByLabel("Expand").click();
 
-      // wait for node at the bottom to be visible/loaded
-      await locateNode(treeWidget, "Tag-Category").waitFor();
-
       await treeWidget.getByRole("button", { name: "Open" }).click();
       await treeWidget.getByPlaceholder("Search...").fill("Test");
 
@@ -130,9 +115,6 @@ test.describe("Models tree", () => {
       const node = locateNode(treeWidget, "ProcessPhysicalModel");
       await node.getByLabel("Expand").click();
 
-      // wait for node at the bottom to be visible/loaded
-      await locateNode(treeWidget, "Tag-Category").waitFor();
-
       await treeWidget.getByRole("button", { name: "OPen" }).click();
       await treeWidget.getByPlaceholder("Search...").fill("x");