diff --git a/Packages/ohif-cornerstone/package.js b/Packages/ohif-cornerstone/package.js index d7eac0958..31a7443d0 100644 --- a/Packages/ohif-cornerstone/package.js +++ b/Packages/ohif-cornerstone/package.js @@ -7,7 +7,7 @@ Package.describe({ Npm.depends({ hammerjs: '2.0.8', 'cornerstone-core': '2.2.6', - 'cornerstone-tools': '3.0.0-b.959', + 'cornerstone-tools': '3.0.0-b.969', 'cornerstone-math': '0.1.6', 'dicom-parser': '1.8.0', 'cornerstone-wado-image-loader': '2.1.4', diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js index 4d0552358..80028e90c 100644 --- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js +++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js @@ -267,9 +267,7 @@ const loadDisplaySetIntoViewport = (data, templateData) => { cornerstoneTools.playClip(element); } - // Enabling new eventDispatches form cornerstoneTools v3 - //cornerstoneTools.addEnabledElement(element); NOTE: This should be done by cTools internally now, no? - console.log('====imageViewerViewport, instantiateTools'); + // InstantiateTools on the new element. toolManager.instantiateTools(element); // Use the tool manager to enable the currently active tool for this diff --git a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js index fc3df7a19..59c39c61d 100644 --- a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js +++ b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js @@ -107,20 +107,20 @@ Meteor.startup(function() { // Register the tool switching commands registerToolCommands({ - wwwc: 'W/L', - zoom: 'Zoom', - angle: 'Angle Measurement', - probe: 'Pixel Probe', - stackScroll: 'Stack Scroll', - ellipticalRoi: 'Elliptical ROI', - rectangleRoi: 'Rectangle ROI', - magnify: 'Magnify', - arrowAnnotate: 'Annotate', + Wwwc: 'W/L', + Zoom: 'Zoom', + Angle: 'Angle Measurement', + DragProbe: 'Pixel Probe', + StackScroll: 'Stack Scroll', + EllipticalRoi: 'Elliptical ROI', + RectangleRoi: 'Rectangle ROI', + Magnify: 'Magnify', + ArrowAnnotate: 'Annotate', stackScrollMouseWheel: 'Scroll Stack Mouse Wheel', - pan: 'Pan', - length: 'Length Measurement', - wwwcRegion: 'W/L by Region', - crosshairs: 'Crosshairs' + Pan: 'Pan', + Length: 'Length Measurement', + WwwcRegion: 'W/L by Region', + Crosshairs: 'Crosshairs' }); // Functions to register the viewport commands diff --git a/Packages/ohif-viewerbase/client/lib/toolManager.js b/Packages/ohif-viewerbase/client/lib/toolManager.js index cbdeac745..046d60412 100644 --- a/Packages/ohif-viewerbase/client/lib/toolManager.js +++ b/Packages/ohif-viewerbase/client/lib/toolManager.js @@ -27,12 +27,8 @@ export const toolManager = { toolManager.setDefaultTool(OHIF.viewer.defaultTool); } - console.log('======INITIALIZING CORNERSTONETOOLS======'); - cornerstoneTools.init(); - console.log('======CORNERSTONETOOLS INITIALIZED======'); - tools = [ 'Length', 'Angle', @@ -139,8 +135,6 @@ export const toolManager = { toolManager.init(); } - console.log("toolManager.getActiveTool"); - // If activeTool is not defined, we should set as defaultTool if (!activeTool) { activeTool = defaultTool; diff --git a/StandaloneViewer/StandaloneViewer/.meteor/packages b/StandaloneViewer/StandaloneViewer/.meteor/packages index 588291bca..7109146e9 100644 --- a/StandaloneViewer/StandaloneViewer/.meteor/packages +++ b/StandaloneViewer/StandaloneViewer/.meteor/packages @@ -32,7 +32,7 @@ ohif:measurement-table aldeed:template-extension aldeed:simple-schema@1.5.3 -stylus@2.513.9 +stylus@=2.513.14 clinical:router session@1.1.7 cultofcoders:persistent-session diff --git a/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.js b/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.js index fa6239fe8..2d47eca2f 100644 --- a/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.js +++ b/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.js @@ -126,7 +126,7 @@ Template.toolbarSection.helpers({ const buttonData = []; buttonData.push({ - id: 'stackScroll', + id: 'StackScroll', title: 'Stack Scroll', classes: 'imageViewerTool', iconClasses: 'fa fa-bars' @@ -260,9 +260,9 @@ Template.toolbarSection.onRendered(function() { instance.$('#layout').dropdown(); - // TODO: Figure out a way to disable/enable the buttons with each status from + // TODO: Figure out a way to disable/enable the buttons with each status from // New API - + // const states = OHIF.viewerbase.toolManager.getToolDefaultStates(); // const disabledToolButtons = states.disabledToolButtons; // const allToolbarButtons = $('#toolbar').find('button');