Move towards NPM for Cornerstone dependencies

Packages/ohif-viewerbase/client/components/basic/errorText/errorText.html

@@ -0,0 +1,5 @@
+<template name="errorText">
+    <div class="errorTextDiv">
+        Error: {{ error }}
+    </div>
+</template>

Packages/ohif-viewerbase/client/components/basic/errorText/errorText.styl

@@ -0,0 +1,4 @@
+.errorTextDiv
+  font-weight: 300
+  padding: 30px
+  text-align: center

Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js

@@ -35,6 +35,7 @@ Template.imageThumbnail.onRendered(() => {
     const element = $element.get(0);
 
     instance.refreshImage = () => {
+        console.log('imageThumbnail refreshImage');
         if (!element) {
             return;
         }
@@ -84,16 +85,14 @@ Template.imageThumbnail.onRendered(() => {
 });
 
 Template.imageThumbnail.onDestroyed(() => {
+    console.log('imagethumbnail onDestroyed');
     const instance = Template.instance();
 
     // Declare DOM and jQuery objects
     const $parent = instance.$('.imageThumbnail');
     const $element = $parent.find('.imageThumbnailCanvas');
     const element = $element.get(0);
-
-    if (element) {
-        cornerstone.disable(element);
-    }
+    cornerstone.disable(element);
 });
 
 Template.imageThumbnail.helpers({

Packages/ohif-viewerbase/client/lib/StackManager.js

@@ -26,8 +26,8 @@ function createAndAddStack(stackMap, study, displaySet) {
         const metaData = {
             instance: image, // in this context, instance will be the data of the InstanceMetadata object...
             series: displaySet, // TODO: Check this
-            study: study,
-            numImages: numImages,
+            study,
+            numImages,
             imageIndex: imageIndex + 1
         };
 
@@ -40,8 +40,7 @@ function createAndAddStack(stackMap, study, displaySet) {
                 imageIds.push(imageId);
                 metadataProvider.addMetadata(imageId, metaData);
             }
-        } 
-        else {
+        } else {
             imageId = getImageId(image);
             imageIds.push(imageId);
             metadataProvider.addMetadata(imageId, metaData);
@@ -50,7 +49,7 @@ function createAndAddStack(stackMap, study, displaySet) {
 
     const stack = {
         displaySetInstanceUid: displaySet.displaySetInstanceUid,
-        imageIds: imageIds,
+        imageIds,
         frameRate: displaySet.frameRate,
         isClip: displaySet.isClip
     };
@@ -61,7 +60,7 @@ function createAndAddStack(stackMap, study, displaySet) {
 }
 
 configuration = {
-    createAndAddStack: createAndAddStack
+    createAndAddStack
 };
 
 /**

Packages/ohif-viewerbase/client/lib/classes/ResizeViewportManager.js

@@ -7,7 +7,6 @@ import { getInstanceClassDefaultViewport } from '../instanceClassSpecificViewpor
 export class ResizeViewportManager {
     constructor() {
         this._resizeHandler = null;
-        OHIF.log.info('ResizeViewportManager');
     }
 
     // Reposition Study Series Quick Switch based whether side bars are opened or not

Packages/ohif-viewerbase/client/lib/classes/StudyLoadingListener.js

@@ -118,12 +118,12 @@ class DICOMFileLoadingListener extends BaseLoadingListener {
 
         this.stopListening();
 
-        $(cornerstone).on(imageLoadProgressEventName, imageLoadProgressEventHandle);
+        $(cornerstone.events).on(imageLoadProgressEventName, imageLoadProgressEventHandle);
     }
 
     stopListening() {
         const imageLoadProgressEventName = this._getImageLoadProgressEventName();
-        $(cornerstone).off(imageLoadProgressEventName);
+        $(cornerstone.events).off(imageLoadProgressEventName);
     }
 
     _imageLoadProgressEventHandle(e, eventData) {
@@ -241,16 +241,16 @@ class StackLoadingListener extends BaseLoadingListener {
 
         this.stopListening();
 
-        $(cornerstone).on(imageLoadedEventName, imageLoadedEventHandle);
-        $(cornerstone).on(imageCachePromiseRemovedEventName, imageCachePromiseRemovedEventHandle);
+        $(cornerstone.events).on(imageLoadedEventName, imageLoadedEventHandle);
+        $(cornerstone.events).on(imageCachePromiseRemovedEventName, imageCachePromiseRemovedEventHandle);
     }
 
     stopListening() {
         const imageLoadedEventName = this._getImageLoadedEventName();
         const imageCachePromiseRemovedEventName = this._getImageCachePromiseRemoveEventName();
 
-        $(cornerstone).off(imageLoadedEventName);
-        $(cornerstone).off(imageCachePromiseRemovedEventName);
+        $(cornerstone.events).off(imageLoadedEventName);
+        $(cornerstone.events).off(imageCachePromiseRemovedEventName);
     }
 
     _updateFrameStatus(imageId, loaded) {

Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js

@@ -13,12 +13,12 @@ export class StudyPrefetcher {
         this.prefetchDisplaySetsTimeout = 300;
         this.lastActiveViewportElement = null;
 
-        $(cornerstone).on('CornerstoneImageCacheFull.StudyPrefetcher', _.bind(this.cacheFullHandler, this));
+        $(cornerstone.events).on('CornerstoneImageCacheFull.StudyPrefetcher', _.bind(this.cacheFullHandler, this));
     }
 
     destroy() {
         this.stopPrefetching();
-        $(cornerstone).off('CornerstoneImageCacheFull.StudyPrefetcher');
+        $(cornerstone.events).off('CornerstoneImageCacheFull.StudyPrefetcher');
     }
 
     static getInstance() {
@@ -162,7 +162,7 @@ export class StudyPrefetcher {
 
     getStudy(image) {
         const studyMetadata = cornerstoneTools.metaData.get('study', image.imageId);
-        return _.find(this.studies, study => study.studyInstanceUid === studyMetadata.studyInstanceUid);
+        return OHIF.viewer.Studies.find(study => study.studyInstanceUid === studyMetadata.studyInstanceUid);
     }
 
     getSeries(study, image) {
@@ -191,6 +191,10 @@ export class StudyPrefetcher {
         }
 
         const study = this.getStudy(image);
+        if (!study.seriesList || !study.seriesList.length) {
+            console.error(study);
+        }
+
         const series = this.getSeries(study, image);
         const instance = this.getInstance(series, image);
         const displaySets = study.displaySets;

Packages/ohif-viewerbase/client/lib/renderViewer.js

@@ -22,5 +22,12 @@ export const renderViewer = (context, params, layoutTemplate='app') => {
                 studies
             }
         });
+    }).catch(error => {
+        context.render(layoutTemplate, {
+            data: {
+                template: 'errorText',
+                error
+            }
+        });
     });
 };

Packages/ohif-viewerbase/client/lib/toolManager.js

@@ -235,8 +235,8 @@ export const toolManager = {
         // Whenever the CornerstoneImageLoadProgress is fired, identify which viewports
         // the "in-progress" image is to be displayed in. Then pass the percent complete
         // via the Meteor Session to the other templates to be displayed in the relevant viewports.
-        $(cornerstone).on('CornerstoneImageLoadProgress', (e, eventData) => {
-            const viewportIndices = this.getKeysByValue(window.ViewportLoading, eventData.imageId);
+        $(cornerstone.events).on('CornerstoneImageLoadProgress', (e, eventData) => {
+            viewportIndices = this.getKeysByValue(window.ViewportLoading, eventData.imageId);
             viewportIndices.forEach(viewportIndex => {
                 Session.set('CornerstoneLoadProgress' + viewportIndex, eventData.percentComplete);
             });