larvitar 1.3.4 → 1.4.1

package/README.md

@@ -6,11 +6,9 @@
 
 ## Dicom Image Toolkit for CornerstoneJS
 
-### Current version: 1.3.4
+### Current version: 1.4.1
 
-### Latest Stable version: 1.3.4
-
-### Latest Published Release: 1.3.4
+### 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.
@@ -90,3 +88,9 @@ Full documentation and examples are available at http://www.dvisionlab.com/Larvi
 # Build package
 
 `yarn build-lib`
+
+# Development
+
+Use `yarn dev-lib` to have `rollup` hot-reload (live recompiling the library).
+In order to test functionalities you can modify the library import path in an example (see the `docs/examples` folder) to use the recompiled bundle in `dist/`, then serve the .html file with VSCode extension [LiveServer](https://marketplace.visualstudio.com/items?itemName=ritwickdey.LiveServer) or other similar tools.
+Once you are done, upgrade the version, build the library and copy it to the `docs/examples` folder. This file must be included into the commit, while docs will be compiled by the Github action.

package/imaging/imageParsing.js

@@ -78,11 +78,10 @@ export const readFile = function (entry) {
  * @instance
  * @function parseDataSet
  * @param {Object} dataSet - dicom parser dataSet object
- * @param {Array} metadata - Initialized metadata object
+ * @param {Object} metadata - Initialized metadata object
  * @param {Array} customFilter - Optional filter: {tags:[], frameId: 0}
  */
-// This function iterates through dataSet recursively and adds new HTML strings
-// to the output array passed into it
+// This function iterates through dataSet recursively and store tag values into metadata object
 export const parseDataSet = function (dataSet, metadata, customFilter) {
   // customFilter= {tags:[], frameId:xxx}
   // the dataSet.elements object contains properties for each element parsed.  The name of the property
@@ -113,7 +112,18 @@ export const parseDataSet = function (dataSet, metadata, customFilter) {
         }
       } else {
         let tagValue = parseTag(dataSet, propertyName, element);
-        metadata[propertyName] = tagValue;
+
+        // identify duplicated tags (keep the first occurency and store the others in another tag eg x00280010_uuid)
+        if (metadata[propertyName] !== undefined) {
+          console.debug(
+            `Identified duplicated tag "${propertyName}", values are:`,
+            metadata[propertyName],
+            tagValue
+          );
+          metadata[propertyName + "_" + uuidv4()] = tagValue;
+        } else {
+          metadata[propertyName] = tagValue;
+        }
       }
     }
   } catch (err) {

package/imaging/imageTools.js

@@ -1,6 +1,9 @@
 /** @module imaging/imageTools
  *  @desc This file provides functionalities for
  *        interacting with cornerstone tools
+ *        DEPRECATION WARNING: these are legacy functions
+ *        that will be removed soon. Use the corresponding
+ *        functions in /tools/main.js instead.
  */
 
 // external libraries
@@ -277,6 +280,7 @@ export const clearMeasurements = function () {
  * @param {Object} options - The custom options. @default from tools/default.js
  * @param {String} activeViewport - The active viewport (if "all", viewports array will be used)
  * @param {Array} viewports - The hmtl element id to be used for tool initialization.
+ * @deprecated (OBSOLETE)
  */
 export const setToolActive = function (
   toolName,
@@ -304,10 +308,11 @@ export const setToolActive = function (
 
 /**
  * Set Tool "disabled" on all elements (ie, not rendered) & refresh cornerstone elements
- * @function setToolActive
+ * @function setToolDisabled
  * @param {String} toolName - The tool name.
  * @param {String} activeViewport - The active viewport (if "all", viewports array will be used)
  * @param {Array} viewports - The hmtl element id to be used for tool initialization.
+ * @deprecated (OBSOLETE)
  */
 export const setToolDisabled = function (toolName, activeViewport, viewports) {
   cornerstoneTools.setToolDisabled(toolName);
@@ -332,6 +337,7 @@ export const setToolDisabled = function (toolName, activeViewport, viewports) {
  * @param {String} toolName - The tool name.
  * @param {String} activeViewport - The active viewport (if "all", viewports array will be used)
  * @param {Array} viewports - The hmtl element id to be used for tool initialization.
+ * @deprecated (OBSOLETE)
  */
 export const setToolEnabled = function (toolName, activeViewport, viewports) {
   cornerstoneTools.setToolEnabled(toolName);
@@ -356,6 +362,7 @@ export const setToolEnabled = function (toolName, activeViewport, viewports) {
  * @param {String} toolName - The tool name.
  * @param {String} activeViewport - The active viewport (if "all", viewports array will be used)
  * @param {Array} viewports - The hmtl element id to be used for tool initialization.
+ * @deprecated (OBSOLETE)
  */
 export const setToolPassive = function (toolName, activeViewport, viewports) {
   cornerstoneTools.setToolPassive(toolName);

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";
@@ -22,27 +24,46 @@ import { updateViewportData } from "../imageRendering";
  */
 
 /**
- * Setup mouse handler modifiers and keyboard shortcuts
- * NOTE: at the moment only mouse right button is affected
+ * Global event callbacks
+ */
+let onKeyDownFn = null;
+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 (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)
  * - possibility to change modifier keys
  * @param {Object} config - see tools/default
- * @param {Array} viewports - The hmtl element ids to be used for tool activation.
  */
 
-export function addMouseKeyHandlers(config, viewports) {
+export function addMouseKeyHandlers(config) {
   if (!config) {
     config = DEFAULT_MOUSE_KEYS;
   }
 
+  if (onKeyDownFn) {
+    document.removeEventListener("keydown", onKeyDownFn);
+  }
+  if (onKeyUpFn) {
+    document.removeEventListener("keyup", onKeyUpFn);
+  }
+
   // Prevent context menu on right click
   document.addEventListener("contextmenu", evt => {
     evt.preventDefault();
     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)
     let codes = config.keyboard_shortcuts
@@ -56,10 +77,16 @@ export function addMouseKeyHandlers(config, viewports) {
         .filter(key => keyCodes[key] == evt.keyCode)
         .pop();
       if (config.debug) console.log("active", config.keyboard_shortcuts[key]);
+      const viewports = allViewports.filter(viewport =>
+        cornerstoneTools.getToolForElement(
+          viewport,
+          config.keyboard_shortcuts[key]
+        )
+      );
       setToolActive(
         config.keyboard_shortcuts[key],
         { mouseButtonMask: 1 },
-        viewports
+        viewports.map(v => v.id)
       );
       document.addEventListener("keydown", onKeyDown, { once: true });
     }
@@ -70,10 +97,17 @@ export function addMouseKeyHandlers(config, viewports) {
       evt.keyCode == keyCodes.KEY_SHIFT
     ) {
       if (config.debug) console.log("active", config.mouse_button_right.shift);
+      const viewports = allViewports.filter(viewport =>
+        cornerstoneTools.getToolForElement(
+          viewport,
+          config.mouse_button_right.shift
+        )
+      );
+
       setToolActive(
         config.mouse_button_right.shift,
         { mouseButtonMask: 2 },
-        viewports
+        viewports.map(v => v.id)
       );
       document.addEventListener("keyup", onKeyUp, { once: true });
     }
@@ -84,10 +118,17 @@ export function addMouseKeyHandlers(config, viewports) {
       evt.keyCode == keyCodes.KEY_CONTROL
     ) {
       if (config.debug) console.log("active", config.mouse_button_right.ctrl);
+      const viewports = allViewports.filter(viewport =>
+        cornerstoneTools.getToolForElement(
+          viewport,
+          config.mouse_button_right.ctrl
+        )
+      );
+
       setToolActive(
         config.mouse_button_right.ctrl,
         { mouseButtonMask: 2 },
-        viewports
+        viewports.map(v => v.id)
       );
       document.addEventListener("keyup", onKeyUp, { once: true });
     }
@@ -98,36 +139,67 @@ export function addMouseKeyHandlers(config, viewports) {
     }
   }
 
+  // Define behaviour on key up: restore original tool
   function onKeyUp(e) {
     if (config.debug)
       console.log("active default", config.mouse_button_right.default);
+    const viewports = allViewports.filter(viewport =>
+      cornerstoneTools.getToolForElement(
+        viewport,
+        config.mouse_button_right.default
+      )
+    );
     setToolActive(
       config.mouse_button_right.default,
       { mouseButtonMask: 2 },
-      viewports
+      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) {
+    const viewports = allViewports.filter(viewport =>
+      cornerstoneTools.getToolForElement(
+        viewport,
+        config.mouse_button_right.default
+      )
+    );
     setToolActive(
       config.mouse_button_right.default,
       { mouseButtonMask: 2 },
-      viewports
+      viewports.map(v => v.id)
     );
   }
 
+  // activate default on mouse left, if any
   if (config.mouse_button_left && config.mouse_button_left.default) {
+    const viewports = allViewports.filter(viewport =>
+      cornerstoneTools.getToolForElement(
+        viewport,
+        config.mouse_button_left.default
+      )
+    );
     setToolActive(
       config.mouse_button_left.default,
       { mouseButtonMask: 1 },
-      viewports
+      viewports.map(v => v.id)
     );
   }
 
   document.addEventListener("keydown", onKeyDown, { once: true });
+
+  onKeyDownFn = onKeyDown;
+  onKeyUpFn = onKeyUp;
+}
+
+/**
+ *
+ */
+export function removeMouseKeyHandlers() {
+  document.removeEventListener("keydown", onKeyDownFn);
+  onKeyDownFn = null;
+  onKeyUpFn = null;
 }
 
 /**

package/index.js

@@ -205,6 +205,7 @@ import { saveAnnotations, loadAnnotations } from "./imaging/tools/io";
 
 import {
   addMouseKeyHandlers,
+  removeMouseKeyHandlers,
   toggleMouseToolsListeners
 } from "./imaging/tools/interaction";
 
@@ -367,6 +368,7 @@ export {
   loadAnnotations,
   // tools/interaction
   addMouseKeyHandlers,
+  removeMouseKeyHandlers,
   // tools/segmentation
   initSegmentationModule,
   addSegmentationMask,

package/package.json

@@ -6,7 +6,7 @@
     "medical",
     "cornerstone"
   ],
-  "version": "1.3.4",
+  "version": "1.4.1",
   "description": "javascript library for parsing, loading, rendering and interacting with DICOM images",
   "repository": {
     "url": "https://github.com/dvisionlab/Larvitar.git",
@@ -54,4 +54,4 @@
   "module": "dist/larvitar.js",
   "browser": "dist/larvitar.js",
   "type": "module"
-}
+}