TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OHIF-189: Fix to activate the viewport when clicked

Browse Source
This commit is contained in:
Aysel Afsar 2017-12-13 17:57:03 -05:00 committed by Bruno Alves de Faria
parent e5c5818ed4
commit 324db89ef7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
View File

@ -16,11 +16,10 @@ import { updateOrientationMarkers } from '../../../lib/updateOrientationMarkers'
import { getInstanceClassDefaultViewport } from '../../../lib/instanceClassSpecificViewport'; import { getInstanceClassDefaultViewport } from '../../../lib/instanceClassSpecificViewport';
import { OHIFError } from '../../../lib/classes/OHIFError'; import { OHIFError } from '../../../lib/classes/OHIFError';
const allCornerstoneEvents = 'click CornerstoneToolsMouseDown CornerstoneToolsMouseDownActivate ' + const allCornerstoneEvents = ['click', 'cornerstonetoolsmousedown', 'cornerstonetoolsmousedownactivate',
'CornerstoneToolsMouseClick CornerstoneToolsMouseDrag CornerstoneToolsMouseUp ' + 'cornerstonetoolsmouseclick', 'cornerstonetoolsmousedrag', 'cornerstonetoolsmouseup',
'CornerstoneToolsMouseWheel CornerstoneToolsTap CornerstoneToolsTouchPress ' + 'cornerstonetoolsmousewheel', 'cornerstonetoolsdoubletap', 'cornerstonetoolstouchpress',
'CornerstoneToolsTouchStart CornerstoneToolsTouchStartActive ' + 'cornerstonetoolsmultitouchstart', 'cornerstonetoolsmultitouchstartactive', 'cornerstonetoolsmultitouchdrag'];
'CornerstoneToolsMultiTouchDragStart';
/** /**
* This function loads a study series into a viewport element. * This function loads a study series into a viewport element.
@ -376,7 +375,8 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
// Define a function to trigger an event whenever a new viewport is being used // Define a function to trigger an event whenever a new viewport is being used
// This is used to update the value of the "active viewport", when the user interacts // This is used to update the value of the "active viewport", when the user interacts
// with a new viewport element // with a new viewport element
const sendActivationTrigger = (event, eventData) => { const sendActivationTrigger = (event) => {
const eventData = event && event.detail;
// Attention: Adding OHIF.log.info in this function decrease the performance // Attention: Adding OHIF.log.info in this function decrease the performance
// since this callback function is called multiple times (eg: when a tool is // since this callback function is called multiple times (eg: when a tool is
// enabled/disabled -> cornerstone[toolName].tool.enable) // enabled/disabled -> cornerstone[toolName].tool.enable)
@ -416,8 +416,10 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
}; };
// Attach the sendActivationTrigger function to all of the Cornerstone interaction events // Attach the sendActivationTrigger function to all of the Cornerstone interaction events
$element.off(allCornerstoneEvents, sendActivationTrigger); allCornerstoneEvents.forEach(eventType => {
$element.on(allCornerstoneEvents, sendActivationTrigger); element.removeEventListener(eventType, sendActivationTrigger);
element.addEventListener(eventType, sendActivationTrigger);
});
$element.off('mouseenter', onMouseEnter); $element.off('mouseenter', onMouseEnter);
$element.on('mouseenter', onMouseEnter); $element.on('mouseenter', onMouseEnter);