From fee6b240a43c50cf39c143b41f885dca253c3916 Mon Sep 17 00:00:00 2001 From: Gustavo Lelis Date: Fri, 17 Aug 2018 02:54:17 -0300 Subject: [PATCH] Adding cornerstoneTools init() --- .../imageViewerViewport/imageViewerViewport.js | 9 ++------- Packages/ohif-viewerbase/client/lib/toolManager.js | 13 ++++++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js index 51b4760e1..f051ceba6 100644 --- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js +++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js @@ -278,19 +278,14 @@ const loadDisplaySetIntoViewport = (data, templateData) => { } // Enabling new eventDispatches form cornerstoneTools v3 - cornerstoneTools.mouseInput.enable(element); - cornerstoneTools.mouseToolEventDispatcher.enable(element); - cornerstoneTools.touchInput.enable(element); - cornerstoneTools.touchToolEventDispatcher.enable(element); - cornerstoneTools.mouseWheelInput.enable(element); - cornerstoneTools.keyboardInput.enable(element); + åtoolManager.cTools.addCanvas(element); toolManager.instantiateTools(element); // Use the tool manager to enable the currently active tool for this // newly rendered element const activeTool = toolManager.getActiveTool(); - toolManager.setActiveTool(activeTool, [element]); + toolManager.cTools.setToolActive(element, activeTool); // Define a function to run whenever the Cornerstone viewport is rendered // (e.g. following a change of window or zoom) diff --git a/Packages/ohif-viewerbase/client/lib/toolManager.js b/Packages/ohif-viewerbase/client/lib/toolManager.js index 685370bd1..5601fbb2f 100644 --- a/Packages/ohif-viewerbase/client/lib/toolManager.js +++ b/Packages/ohif-viewerbase/client/lib/toolManager.js @@ -32,11 +32,14 @@ export const toolManager = { this.setDefaultTool(OHIF.viewer.defaultTool); } + this.cTools = cornerstoneTools.init(); + tools = [ 'length', 'angle', 'wwwc', - 'zoom', + 'zoom', + 'pan', 'zoomTouchPinch', 'zoomMouseWheel', 'ellipticalRoi', @@ -85,12 +88,12 @@ export const toolManager = { setActiveToolForElement(toolId, element) { this.setAllToolsPassive(element); - cornerstoneTools.setToolActive(element, toolId, { mouseButtonMask: 1 }); + this.cTools.setToolActive(element, toolId, { mouseButtonMask: 1 }); }, setAllToolsPassive(element) { - cornerstoneTools.store.state.tools.forEach((tool) => { - cornerstoneTools.setToolPassive(element, tool.name) + this.cTools.store.state.tools.forEach((tool) => { + this.cTools.setToolPassive(element, tool.name) }) }, @@ -100,7 +103,7 @@ export const toolManager = { const apiTool = cornerstoneTools[`${toolName}Tool`]; if (apiTool) { const tool = new apiTool(); - cornerstoneTools.addTool(element, tool); + this.cTools.addTool(element, tool); } }); },