From 5a4deedda8e83fe97560c617cc526507f8ba7949 Mon Sep 17 00:00:00 2001 From: Evren Ozkan Date: Thu, 29 Nov 2018 16:02:33 -0500 Subject: [PATCH] fix(reference-lines): Update reference lines for the latest changes in cornerstone tools --- .../viewer/imageViewerViewport/imageViewerViewport.js | 4 +++- .../ohif-viewerbase/client/lib/displayReferenceLines.js | 7 +++++-- Packages/ohif-viewerbase/client/lib/toolManager.js | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js index d0b5e50d9..795033687 100644 --- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js +++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js @@ -455,7 +455,9 @@ const loadDisplaySetIntoViewport = (data, templateData) => { if (OHIF.viewer.refLinesEnabled) { // ... and if reference lines are globally enabled, let cornerstoneTools know. - cornerstoneTools.referenceLines.tool.enable(element, OHIF.viewer.updateImageSynchronizer); + cornerstoneTools.setToolEnabledForElement(element, 'referenceLines', { + synchronizationContext: OHIF.viewer.updateImageSynchronizer + }); } // If the crosshairs tool is active, update the synchronizer diff --git a/Packages/ohif-viewerbase/client/lib/displayReferenceLines.js b/Packages/ohif-viewerbase/client/lib/displayReferenceLines.js index 2fafd7db5..f8cc43305 100644 --- a/Packages/ohif-viewerbase/client/lib/displayReferenceLines.js +++ b/Packages/ohif-viewerbase/client/lib/displayReferenceLines.js @@ -1,4 +1,5 @@ import { OHIF } from 'meteor/ohif:core'; +import { cornerstone, cornerstoneTools } from 'meteor/ohif:cornerstone'; /** * This function disables reference lines for a specific viewport element. @@ -22,7 +23,7 @@ export function displayReferenceLines(element) { const imagePlane = cornerstone.metaData.get('imagePlane', imageId); // Disable reference lines for the current element - cornerstoneTools.referenceLines.tool.disable(element); + cornerstoneTools.setToolDisabledForElement(element, 'referenceLines'); if (!OHIF.viewer.refLinesEnabled || !imagePlane || !imagePlane.frameOfReferenceUID) { OHIF.log.info('displayReferenceLines refLinesEnabled is not enabled, no imagePlane or no frameOfReferenceUID'); @@ -46,7 +47,9 @@ export function displayReferenceLines(element) { return; } - cornerstoneTools.referenceLines.tool.enable(viewportElement, OHIF.viewer.updateImageSynchronizer); + cornerstoneTools.setToolEnabledForElement(viewportElement, 'referenceLines', { + synchronizationContext: OHIF.viewer.updateImageSynchronizer + }); } }); } diff --git a/Packages/ohif-viewerbase/client/lib/toolManager.js b/Packages/ohif-viewerbase/client/lib/toolManager.js index 78ed191aa..b8c512fe1 100644 --- a/Packages/ohif-viewerbase/client/lib/toolManager.js +++ b/Packages/ohif-viewerbase/client/lib/toolManager.js @@ -56,7 +56,8 @@ export const toolManager = { wwwcRegion: 'WwwcRegionTool', zoomTouchPinch: 'ZoomTouchPinchTool', panMultiTouch: 'PanMultiTouchTool', - stackScrollMouseWheel: 'StackScrollMouseWheelTool' + stackScrollMouseWheel: 'StackScrollMouseWheelTool', + referenceLines: 'ReferenceLinesTool' }; const { textStyle, toolStyle, toolColors } = cornerstoneTools;