Merge pull request #713 from PaulHax/delete-shortcut

Delete image shortcut

Author: PaulHax

docs/mouse_controls.md

@@ -2,8 +2,10 @@
 
 ## Data management
 
-| Shortcut | Action |
-| -------- | ------ |
+| Shortcut | Action                |
+| -------- | --------------------- |
+| Ctrl + . | Delete Current Image  |
+| Ctrl + / | Clear all data        |
 
 ## Slice
 

src/components/App.vue

@@ -123,13 +123,15 @@ export default defineComponent({
     const { currentImageMetadata, isImageLoading } = useCurrentImage();
     const defaultImageMetadataName = defaultImageMetadata().name;
     watch(currentImageMetadata, (newMetadata) => {
+      let prefix = '';
       if (
         newMetadata?.name &&
         // wait until we get a real name, but if we never do, show default name
         (newMetadata.name !== defaultImageMetadataName || !isImageLoading)
       ) {
-        document.title = `${newMetadata.name} - VolView`;
+        prefix = `${newMetadata.name} -`;
       }
+      document.title = `${prefix}VolView`;
     });
 
     // --- parse URL -- //

src/composables/actions.ts

@@ -8,6 +8,7 @@ import { Action } from '../constants';
 import { useKeyboardShortcutsStore } from '../store/keyboard-shortcuts';
 import { useCurrentImage } from './useCurrentImage';
 import { useSliceConfig } from './useSliceConfig';
+import { useDatasetStore } from '../store/datasets';
 
 const applyLabelOffset = (offset: number) => () => {
   const toolToStore = {
@@ -47,6 +48,19 @@ const changeSlice = (offset: number) => () => {
   currentSlice.value += offset;
 };
 
+const clearScene = () => () => {
+  const datasetStore = useDatasetStore();
+  datasetStore.removeAll();
+};
+
+const deleteCurrentImage = () => () => {
+  const datasetStore = useDatasetStore();
+  datasetStore.remove(datasetStore.primaryImageID);
+
+  // Automatically select next image
+  datasetStore.setPrimarySelection(datasetStore.idsAsSelections[0]);
+};
+
 export const ACTION_TO_FUNC = {
   windowLevel: setTool(Tools.WindowLevel),
   pan: setTool(Tools.Pan),
@@ -65,6 +79,9 @@ export const ACTION_TO_FUNC = {
   decrementLabel: applyLabelOffset(-1),
   incrementLabel: applyLabelOffset(1),
 
+  deleteCurrentImage: deleteCurrentImage(),
+  clearScene: clearScene(),
+
   mergeNewPolygon: () => {}, // acts as a modifier key rather than immediate effect, so no-op
 
   showKeyboardShortcuts,

src/config.ts

@@ -287,6 +287,9 @@ export const ACTION_TO_KEY = {
   decrementLabel: 'q',
   incrementLabel: 'w',
 
+  deleteCurrentImage: 'ctrl+.',
+  clearScene: 'ctrl+/',
+
   showKeyboardShortcuts: '?',
 } satisfies Record<Action, string>;
 

src/constants.ts

@@ -67,6 +67,14 @@ export const ACTIONS = {
     readable: 'Activate next Label',
   },
 
+  deleteCurrentImage: {
+    readable: 'Remove current active image',
+  },
+
+  clearScene: {
+    readable: 'Clear scene',
+  },
+
   mergeNewPolygon: {
     readable: 'Hold to merge new polygons with overlapping polygons',
   },

src/store/datasets.ts

@@ -12,6 +12,7 @@ import { useFileStore } from './datasets-files';
 import { StateFile } from '../io/state-file/schema';
 import { useErrorMessage } from '../composables/useErrorMessage';
 import { useLayersStore } from './datasets-layers';
+import { useModelStore } from './datasets-models';
 
 export const DataType = {
   Image: 'Image',
@@ -23,6 +24,7 @@ export const useDatasetStore = defineStore('dataset', () => {
   const dicomStore = useDICOMStore();
   const fileStore = useFileStore();
   const layersStore = useLayersStore();
+  const modelStore = useModelStore();
 
   // --- state --- //
 
@@ -67,7 +69,9 @@ export const useDatasetStore = defineStore('dataset', () => {
     }
   }
 
-  const remove = (id: string) => {
+  const remove = (id: string | null) => {
+    if (!id) return;
+
     if (id === primarySelection.value) {
       primarySelection.value = null;
     }
@@ -81,6 +85,19 @@ export const useDatasetStore = defineStore('dataset', () => {
     layersStore.remove(id);
   };
 
+  const removeAll = () => {
+    // Create a copy to avoid iteration issue while removing data
+    const imageIdCopy = [...imageStore.idList];
+    imageIdCopy.forEach((id) => {
+      remove(id);
+    });
+
+    const modelIdCopy = [...modelStore.idList];
+    modelIdCopy.forEach((id) => {
+      remove(id);
+    });
+  };
+
   return {
     primaryImageID,
     primarySelection,
@@ -89,5 +106,6 @@ export const useDatasetStore = defineStore('dataset', () => {
     setPrimarySelection,
     serialize,
     remove,
+    removeAll,
   };
 });