larvitar 1.5.6 → 1.5.8

package/README.md

@@ -6,9 +6,9 @@
 
 ## Dicom Image Toolkit for CornerstoneJS
 
-### Current version: 1.5.6
+### Current version: 1.5.8
 
-### Latest Published Release: 1.5.6
+### Latest Published Release: 1.5.8
 
 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/imageStore.js

@@ -305,12 +305,14 @@ class Larvitar_Store {
  * @param {Object} vuexStore - The app vuex store [optional]
  * @param {String} vuexModule - The name of the vuex store module, can be null
  * @param {Boolean} registerModule - If true, the module is registered under Vuex global store
+ * @param {Object} _Vue - The Vue instance
  */
 
-export function initLarvitarStore(vuexStore, vuexModule, registerModule) {
+export function initLarvitarStore(vuexStore, vuexModule, registerModule, _Vue) {
   if (vuexStore) {
     larvitar_store = new Larvitar_Store(vuexStore, vuexModule);
     if (registerModule) {
+      larvitar.defineVue(_Vue);
       vuexStore.registerModule(vuexModule, larvitar);
     }
   } else {

package/imaging/imageUtils.js

@@ -861,7 +861,16 @@ export const parseTag = function (dataSet, propertyName, element) {
  */
 export const getImageMetadata = function (seriesId, instanceUID) {
   const seriesData = getSeriesDataFromLarvitarManager(seriesId);
+  if (seriesData === undefined || seriesData === null) {
+    console.log(`Invalid Series ID: ${seriesId}`);
+    return [];
+  }
   const imageId = seriesData.instanceUIDs[instanceUID];
+  if (imageId === undefined) {
+    console.log(`Invalid InstanceUID ID: ${instanceUID}`);
+    return [];
+  }
+
   let metadata = seriesData.instances[imageId].metadata;
   // get elements from metadata where the key starts with x and is length 7
   let metadata_keys = filter(keys(metadata), function (key) {
@@ -870,7 +879,8 @@ export const getImageMetadata = function (seriesId, instanceUID) {
   // loop metadata using metadata_keys and return list of key value pairs
   let metadata_list = map(metadata_keys, function (key) {
     // if value is a dictionary return empty string
-    const value = metadata[key].constructor == Object ? "" : metadata[key];
+    const value =
+      metadata[key] && metadata[key].constructor == Object ? "" : metadata[key];
     // convert key removing x and adding comma at position 4
     const tagKey = (
       "(" +

package/modules/vuex/larvitar.js

@@ -1,6 +1,5 @@
-// Larvitar Vuex storage
-
-import Vue from "vue";
+// Larvitar Vuex instance
+var Vue = null;
 
 // default viewport store object
 const DEFAULT_VIEWPORT = {
@@ -181,3 +180,8 @@ export default {
       commit("canvas", { id, d: { voi: { windowWidth, windowCenter } } })
   }
 };
+
+// define Vue instance from outside dependency
+export const defineVue = _Vue => {
+  Vue = _Vue;
+};

package/package.json

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