Test OHIF Viewer against Cornerstone* version 2.0.0

zengbo · Feb 27, 2018 · 44233c4 · 44233c4
1 parent c4b43f4
commit 44233c4
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 347 deletions.
diff --git a/Packages/ohif-cornerstone/client/index.js b/Packages/ohif-cornerstone/client/index.js
@@ -1,6 +1,5 @@
 import { OHIF } from '../namespace';
 import './renderer.js';
 
-import './lib/cornerstoneToolsMouseInputOverrides.js';
 import { MetadataProvider } from './lib/classes/MetadataProvider';
 OHIF.cornerstone.metadataProvider = new MetadataProvider();
diff --git a/Packages/ohif-cornerstone/client/lib/cornerstoneToolsMouseInputOverrides.js b/Packages/ohif-cornerstone/client/lib/cornerstoneToolsMouseInputOverrides.js
diff --git a/Packages/ohif-cornerstone/main.js b/Packages/ohif-cornerstone/main.js
@@ -13,7 +13,6 @@ import * as cornerstoneTools from 'cornerstone-tools';
 import * as cornerstoneMath from 'cornerstone-math';
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
 import * as dicomParser from 'dicom-parser';
-import { $ } from 'meteor/jquery';
 import Hammer from 'hammerjs';
 
 import './client/'; // which is actually: import './client/index.js';
@@ -22,11 +21,11 @@ import './client/'; // which is actually: import './client/index.js';
 // WADO Image Loader and Tools libraries
 //
 // Note: You would also need to do this with Cornerstone Web Image Loader
-cornerstone.external.$ = $;
-cornerstoneTools.external.$ = $;
 cornerstoneTools.external.Hammer = Hammer;
 cornerstoneTools.external.cornerstone = cornerstone;
+cornerstoneTools.external.cornerstoneMath = cornerstoneMath;
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
+cornerstoneWADOImageLoader.external.dicomParser = dicomParser;
 
 export {
     cornerstone,

diff --git a/Packages/ohif-cornerstone/package.js b/Packages/ohif-cornerstone/package.js
@@ -6,19 +6,17 @@ Package.describe({
 
 Npm.depends({
     hammerjs: '2.0.8',
-    'jquery-hammerjs': '2.0.0',
-    'cornerstone-core': '1.1.2',
-    'cornerstone-tools': '1.0.3',
+    'cornerstone-core': '2.0.0',
+    'cornerstone-tools': '2.0.0',
     'cornerstone-math': '0.1.6',
     'dicom-parser': '1.7.6',
-    'cornerstone-wado-image-loader': '1.0.1'
+    'cornerstone-wado-image-loader': '2.0.0'
 });
 
 Package.onUse(function(api) {
     api.versionsFrom('1.5');
 
     api.use('ecmascript');
-    api.use('jquery');
     api.use('ohif:core');
 
     api.addAssets('public/js/cornerstoneWADOImageLoaderCodecs.es5.js', 'client');