fix: Measure tools remove highlight when deactivating.

Author: phtaylor

src/Measurement/MeasureAngleTool.ts

@@ -215,63 +215,6 @@ class MeasureAngleTool extends MeasureTool {
       }
     }
   }
-
-  /**
-   *
-   *
-   * @param event - The event value
-  onPointerMove(event: ZeaPointerEvent): void {
-    // skip if the alt key is held. Allows the camera tool to work
-    if (
-      ((event instanceof ZeaMouseEvent || event instanceof ZeaTouchEvent) && event.altKey) ||
-      (event instanceof ZeaMouseEvent && event.button !== 0)
-    )
-      return
-
-    if (this.stage == 0) {
-      if (event.intersectionData && event.intersectionData.geomItem instanceof GeomItem) {
-        const geomItem = <GeomItem>event.intersectionData.geomItem
-        if (this.checkSurface(geomItem)) {
-          if (geomItem != this.highlightedItemA) {
-            if (this.highlightedItemA) {
-              this.highlightedItemA.removeHighlight(this.highlightedItemA_highlightKey, true)
-            }
-            this.highlightedItemA = geomItem
-            this.highlightedItemA_componentId = event.intersectionData.componentId
-            const color = this.colorParam.value
-            color.a = 0.2
-            this.highlightedItemA.addHighlight(this.highlightedItemA_highlightKey, color, true)
-          }
-        }
-      } else {
-        if (this.highlightedItemA) {
-          this.highlightedItemA.removeHighlight(this.highlightedItemA_highlightKey, true)
-          this.highlightedItemA = null
-        }
-      }
-    } else if (this.stage == 1) {
-      if (event.intersectionData && event.intersectionData.geomItem instanceof GeomItem) {
-        const geomItem = <GeomItem>event.intersectionData.geomItem
-        if (geomItem != this.highlightedItemA && geomItem != this.highlightedItemB && this.checkSurface(geomItem)) {
-          if (this.highlightedItemB) {
-            this.highlightedItemB.removeHighlight(this.highlightedItemB_highlightKey, true)
-          }
-          this.highlightedItemB = geomItem
-          this.highlightedItemB_componentId = event.intersectionData.componentId
-
-          const color = this.colorParam.value.clone()
-          color.a = 0.2
-          this.highlightedItemB.addHighlight(this.highlightedItemB_highlightKey, color, true)
-        }
-      } else {
-        if (this.highlightedItemB) {
-          this.highlightedItemB.removeHighlight(this.highlightedItemB_highlightKey, true)
-          this.highlightedItemB = null
-        }
-      }
-    }
-  }
-   */
 }
 
 export { MeasureAngleTool }

src/Measurement/MeasureDistanceTool.ts

@@ -152,67 +152,6 @@ class MeasureDistanceTool extends MeasureTool {
       }
     }
   }
-
-  /**
-   *
-   *
-   * @param event - The event value
-  onPointerMove(event: ZeaPointerEvent): void {
-    // skip if the alt key is held. Allows the camera tool to work
-    if (
-      ((event instanceof ZeaMouseEvent || event instanceof ZeaTouchEvent) && event.altKey) ||
-      (event instanceof ZeaMouseEvent && event.button !== 0)
-    ) {
-      return
-    }
-
-    const color = this.colorParam.value
-    color.a = 0.2
-    if (this.stage == 0) {
-      if (event.intersectionData && event.intersectionData.geomItem instanceof GeomItem) {
-        const geomItem = <GeomItem>event.intersectionData.geomItem
-        if (geomItem.hasParameter('CurveType') || geomItem.hasParameter('SurfaceType')) {
-          if (geomItem != this.highlightedItemA) {
-            if (this.highlightedItemA) {
-              this.highlightedItemA.removeHighlight(this.highlightedItemA_highlightKey, true)
-            }
-            this.highlightedItemA = geomItem
-            this.highlightedItemA.addHighlight(this.highlightedItemA_highlightKey, color, true)
-          }
-        }
-      } else {
-        if (this.highlightedItemA) {
-          this.highlightedItemA.removeHighlight(this.highlightedItemA_highlightKey, true)
-          this.highlightedItemA = null
-        }
-      }
-      event.stopPropagation()
-    } else if (this.stage == 1) {
-      if (event.intersectionData && event.intersectionData.geomItem instanceof GeomItem) {
-        const geomItem = <GeomItem>event.intersectionData.geomItem
-        if (geomItem != this.highlightedItemA && geomItem != this.highlightedItemB) {
-          if (geomItem.hasParameter('CurveType') || geomItem.hasParameter('SurfaceType')) {
-            if (this.highlightedItemB) {
-              this.highlightedItemB.removeHighlight(this.highlightedItemB_highlightKey, true)
-              this.highlightedItemB = null
-            }
-
-            this.highlightedItemB = geomItem
-            this.highlightedItemB.addHighlight(this.highlightedItemB_highlightKey, color, true)
-          }
-        }
-      } else {
-        if (this.highlightedItemB) {
-          this.highlightedItemB.removeHighlight(this.highlightedItemB_highlightKey, true)
-          this.highlightedItemB = null
-        }
-      }
-
-      event.stopPropagation()
-    }
-  }
-
-   */
 }
 
 export { MeasureDistanceTool }

src/Measurement/MeasureTool.ts

@@ -84,19 +84,20 @@ class MeasureTool extends BaseTool {
       this.appData.renderer.getGLCanvas().style.cursor = this.prevCursor
     }
 
+    if (this.highlightedItemB) {
+      this.highlightedItemB.removeHighlight(this.highlightedItemB_highlightKey, true)
+      this.highlightedItemB = null
+    }
+    if (this.highlightedItemA) {
+      this.highlightedItemA.removeHighlight(this.highlightedItemA_highlightKey, true)
+      this.highlightedItemA = null
+    }
+
     if (this.stage != 0) {
       const parentItem = <TreeItem>this.measurement.getOwner()
       parentItem.removeChild(parentItem.getChildIndex(this.measurement))
       this.measurement = null
 
-      if (this.highlightedItemB) {
-        this.highlightedItemB.removeHighlight(this.highlightedItemB_highlightKey, true)
-        this.highlightedItemB = null
-      }
-      if (this.highlightedItemA) {
-        this.highlightedItemA.removeHighlight(this.highlightedItemA_highlightKey, true)
-        this.highlightedItemA = null
-      }
       this.stage = 0
     }
   }

testing-e2e/measurement.html

@@ -171,19 +171,14 @@
         toolManager.registerTool('measureAngleTool', measureAngleTool)
         toolManager.registerTool('measureCenterDistancesTool', measureCenterDistancesTool)
         renderer.getViewport().setManipulator(toolManager)
-        
+
         // Push the Camera Manipultor onto the base of the stack.
         toolManager.pushTool('cameraManipulator')
 
         document.addEventListener('keydown', (e) => {
           switch (e.key) {
-            case 'm':
-              if (measurementOn) {
-                setToolToCameraManipulator()
-                return
-              }
-              setToolToMeasureDistanceTool()
-              break
+            case 'Escape':
+              toggleMode(0)
           }
         })