larvitar 1.4.0 → 1.4.1

package/README.md

@@ -6,9 +6,9 @@
 
 ## Dicom Image Toolkit for CornerstoneJS
 
-### Current version: 1.4.0
+### Current version: 1.4.1
 
-### Latest Published Release: 1.4.0
+### Latest Published Release: 1.4.1
 
 This library provides common DICOM functionalities to be used in web-applications: it's wrapper that simplifies the use of cornerstone-js environment.
 Orthogonal multiplanar reformat is included as well as custom loader/exporter for nrrd files and [Vuex](https://vuex.vuejs.org/) custom integration.

package/imaging/tools/interaction.js

@@ -6,6 +6,8 @@
 // external libraries
 import { throttle } from "lodash";
 import * as keyCodes from "keycode-js";
+import cornerstone from "cornerstone-core";
+import cornerstoneTools from "cornerstone-tools/dist/cornerstoneTools.js";
 
 // internal libraries
 import { DEFAULT_MOUSE_KEYS } from "./default";
@@ -31,7 +33,8 @@ let onKeyUpFn = null;
  * Setup mouse handler modifiers and keyboard shortcuts:
  * register a tool on right button and another one
  * when pressing a modifier (ctrl/shift/alt) + right button
- * The activation take place on all active viewports
+ * The activation take place on all active viewports (we added a check to activate only on viewports
+ * in which the tool has been added previously)
  * Improvements could be:
  * - "restore previous active tool" instead of passed "default" tool
  * - manage left button (an idea could be to cycle over object keys for both buttons)
@@ -57,6 +60,9 @@ export function addMouseKeyHandlers(config) {
     return false;
   });
 
+  // get all enabled viewports. Then, filter only viewport in which the target tool had been added previously.
+  let allViewports = cornerstone.getEnabledElements().map(enel => enel.element);
+
   // Define behaviour on key down: activate registered tool
   function onKeyDown(evt) {
     // keyboard shortcuts (activate on left mouse button)
@@ -71,7 +77,17 @@ export function addMouseKeyHandlers(config) {
         .filter(key => keyCodes[key] == evt.keyCode)
         .pop();
       if (config.debug) console.log("active", config.keyboard_shortcuts[key]);
-      setToolActive(config.keyboard_shortcuts[key], { mouseButtonMask: 1 });
+      const viewports = allViewports.filter(viewport =>
+        cornerstoneTools.getToolForElement(
+          viewport,
+          config.keyboard_shortcuts[key]
+        )
+      );
+      setToolActive(
+        config.keyboard_shortcuts[key],
+        { mouseButtonMask: 1 },
+        viewports.map(v => v.id)
+      );
       document.addEventListener("keydown", onKeyDown, { once: true });
     }
     // right drag + shift
@@ -81,7 +97,18 @@ export function addMouseKeyHandlers(config) {
       evt.keyCode == keyCodes.KEY_SHIFT
     ) {
       if (config.debug) console.log("active", config.mouse_button_right.shift);
-      setToolActive(config.mouse_button_right.shift, { mouseButtonMask: 2 });
+      const viewports = allViewports.filter(viewport =>
+        cornerstoneTools.getToolForElement(
+          viewport,
+          config.mouse_button_right.shift
+        )
+      );
+
+      setToolActive(
+        config.mouse_button_right.shift,
+        { mouseButtonMask: 2 },
+        viewports.map(v => v.id)
+      );
       document.addEventListener("keyup", onKeyUp, { once: true });
     }
     // right drag + ctrl
@@ -91,7 +118,18 @@ export function addMouseKeyHandlers(config) {
       evt.keyCode == keyCodes.KEY_CONTROL
     ) {
       if (config.debug) console.log("active", config.mouse_button_right.ctrl);
-      setToolActive(config.mouse_button_right.ctrl, { mouseButtonMask: 2 });
+      const viewports = allViewports.filter(viewport =>
+        cornerstoneTools.getToolForElement(
+          viewport,
+          config.mouse_button_right.ctrl
+        )
+      );
+
+      setToolActive(
+        config.mouse_button_right.ctrl,
+        { mouseButtonMask: 2 },
+        viewports.map(v => v.id)
+      );
       document.addEventListener("keyup", onKeyUp, { once: true });
     }
     // leave default
@@ -105,17 +143,48 @@ export function addMouseKeyHandlers(config) {
   function onKeyUp(e) {
     if (config.debug)
       console.log("active default", config.mouse_button_right.default);
-    setToolActive(config.mouse_button_right.default, { mouseButtonMask: 2 });
+    const viewports = allViewports.filter(viewport =>
+      cornerstoneTools.getToolForElement(
+        viewport,
+        config.mouse_button_right.default
+      )
+    );
+    setToolActive(
+      config.mouse_button_right.default,
+      { mouseButtonMask: 2 },
+      viewports.map(v => v.id)
+    );
     document.addEventListener("keydown", onKeyDown, { once: true });
   }
 
-  // activate default, if any
+  // activate default on mouse right, if any
   if (config.mouse_button_right && config.mouse_button_right.default) {
-    setToolActive(config.mouse_button_right.default, { mouseButtonMask: 2 });
+    const viewports = allViewports.filter(viewport =>
+      cornerstoneTools.getToolForElement(
+        viewport,
+        config.mouse_button_right.default
+      )
+    );
+    setToolActive(
+      config.mouse_button_right.default,
+      { mouseButtonMask: 2 },
+      viewports.map(v => v.id)
+    );
   }
 
+  // activate default on mouse left, if any
   if (config.mouse_button_left && config.mouse_button_left.default) {
-    setToolActive(config.mouse_button_left.default, { mouseButtonMask: 1 });
+    const viewports = allViewports.filter(viewport =>
+      cornerstoneTools.getToolForElement(
+        viewport,
+        config.mouse_button_left.default
+      )
+    );
+    setToolActive(
+      config.mouse_button_left.default,
+      { mouseButtonMask: 1 },
+      viewports.map(v => v.id)
+    );
   }
 
   document.addEventListener("keydown", onKeyDown, { once: true });

package/package.json

@@ -6,7 +6,7 @@
     "medical",
     "cornerstone"
   ],
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "javascript library for parsing, loading, rendering and interacting with DICOM images",
   "repository": {
     "url": "https://github.com/dvisionlab/Larvitar.git",