From d452432f09c1b2c07469733d416a9300c4b0f9cd Mon Sep 17 00:00:00 2001
From: Paul Elliott <paul.elliott@kitware.com>
Date: Mon, 18 Sep 2023 16:53:39 -0400
Subject: [PATCH 1/2] fix(AnnotationContextMenu): when deleting tool, get
 undefined errors

---
 src/components/tools/AnnotationContextMenu.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/tools/AnnotationContextMenu.vue b/src/components/tools/AnnotationContextMenu.vue
index c63f4b561..ffc7aa164 100644
--- a/src/components/tools/AnnotationContextMenu.vue
+++ b/src/components/tools/AnnotationContextMenu.vue
@@ -46,6 +46,7 @@ const hideToolFromContextMenu = () => {
 
 <template>
   <v-menu
+    v-if="tool"
     v-model="contextMenu.show"
     class="position-absolute"
     :style="{

From 05b06643186108cb96bcddea67e40463f2772f57 Mon Sep 17 00:00:00 2001
From: Paul Elliott <paul.elliott@kitware.com>
Date: Mon, 18 Sep 2023 17:26:14 -0400
Subject: [PATCH 2/2] fix(rectangle): init visible state

---
 src/components/tools/rectangle/RectangleWidget2D.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/tools/rectangle/RectangleWidget2D.vue b/src/components/tools/rectangle/RectangleWidget2D.vue
index 6092226bb..406c8c101 100644
--- a/src/components/tools/rectangle/RectangleWidget2D.vue
+++ b/src/components/tools/rectangle/RectangleWidget2D.vue
@@ -29,6 +29,7 @@ import {
   useRightClickContextMenu,
   useHoverEvent,
 } from '@/src/composables/annotationTool';
+import { vtkRulerWidgetState } from '@/src/vtk/RulerWidget';
 
 const useStore = useRectangleStore;
 const vtkWidgetFactory = vtkRectangleWidget;
@@ -180,11 +181,16 @@ export default defineComponent({
       secondPoint: false,
     });
 
-    const widgetState = widgetFactory.getWidgetState();
-    onVTKEvent(widgetFactory.getWidgetState(), 'onModified', () => {
+    const updateVisibleState = (widgetState: vtkRulerWidgetState) => {
       visibleStates.firstPoint = widgetState.getFirstPoint().getVisible();
       visibleStates.secondPoint = widgetState.getSecondPoint().getVisible();
-    });
+    };
+
+    const widgetState = widgetFactory.getWidgetState();
+    onVTKEvent(widgetFactory.getWidgetState(), 'onModified', () =>
+      updateVisibleState(widgetState)
+    );
+    updateVisibleState(widgetState);
 
     return {
       tool,