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

Remove unnecessary calls to setActiveViewport

Browse Source
This commit is contained in:
Erik Ziegler 2017-06-07 16:55:28 +02:00
parent 3a9a06478b
commit f43e0d45c7
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ 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 = 'CornerstoneToolsMouseDown CornerstoneToolsMouseDownActivate ' + const allCornerstoneEvents = 'click CornerstoneToolsMouseDown CornerstoneToolsMouseDownActivate ' +
'CornerstoneToolsMouseClick CornerstoneToolsMouseDrag CornerstoneToolsMouseUp ' + 'CornerstoneToolsMouseClick CornerstoneToolsMouseDrag CornerstoneToolsMouseUp ' +
'CornerstoneToolsMouseWheel CornerstoneToolsTap CornerstoneToolsTouchPress ' + 'CornerstoneToolsMouseWheel CornerstoneToolsTap CornerstoneToolsTouchPress ' +
'CornerstoneToolsTouchStart CornerstoneToolsTouchStartActive ' + 'CornerstoneToolsTouchStart CornerstoneToolsTouchStartActive ' +
@ -384,17 +384,15 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
// Check if the current active viewport in the Meteor Session // Check if the current active viewport in the Meteor Session
// Is the same as the viewport in which the activation event was fired. // Is the same as the viewport in which the activation event was fired.
// If it was, no changes are necessary, so stop here. // If it was, no changes are necessary, so stop here.
const element = eventData.element;
const activeViewportIndex = Session.get('activeViewport'); const activeViewportIndex = Session.get('activeViewport');
const viewportIndex = $('.imageViewerViewport').index(element);
// Reset the focus, even if we don't need to re-enable reference lines or prefetching
$(element).focus();
if (viewportIndex === activeViewportIndex) { if (viewportIndex === activeViewportIndex) {
return; return;
} }
// Reset the focus, even if we don't need to re-enable reference lines or prefetching
const element = eventData.element;
$(element).focus();
OHIF.log.info('imageViewerViewport sendActivationTrigger'); OHIF.log.info('imageViewerViewport sendActivationTrigger');
// Otherwise, trigger an 'OHIFActivateViewport' event to be handled by the Template event // Otherwise, trigger an 'OHIFActivateViewport' event to be handled by the Template event
@ -599,10 +597,6 @@ Template.imageViewerViewport.events({
setActiveViewport(event.currentTarget); setActiveViewport(event.currentTarget);
}, },
'click .imageViewerViewport'(event) {
setActiveViewport(event.currentTarget);
},
'CornerstoneToolsMouseDoubleClick .imageViewerViewport, CornerstoneToolsDoubleTap .imageViewerViewport'(event) { 'CornerstoneToolsMouseDoubleClick .imageViewerViewport, CornerstoneToolsDoubleTap .imageViewerViewport'(event) {
// Get the double clicked viewport index // Get the double clicked viewport index
const viewportIndex = $('.imageViewerViewport').index(event.currentTarget); const viewportIndex = $('.imageViewerViewport').index(event.currentTarget);