OHIF-113: added element verification before tool activation. (#116)
* OHIF-113: added element verification before tool activation. * OHIF-113: fixing typo
This commit is contained in:
parent
23489b173d
commit
038039518a
@ -1,6 +1,7 @@
|
|||||||
import { Session } from 'meteor/session';
|
import { Session } from 'meteor/session';
|
||||||
import { $ } from 'meteor/jquery';
|
import { $ } from 'meteor/jquery';
|
||||||
import { OHIF } from 'meteor/ohif:core';
|
import { OHIF } from 'meteor/ohif:core';
|
||||||
|
import { _ } from 'meteor/underscore';
|
||||||
import { getFrameOfReferenceUID } from './getFrameOfReferenceUID';
|
import { getFrameOfReferenceUID } from './getFrameOfReferenceUID';
|
||||||
import { updateCrosshairsSynchronizer } from './updateCrosshairsSynchronizer';
|
import { updateCrosshairsSynchronizer } from './updateCrosshairsSynchronizer';
|
||||||
import { crosshairsSynchronizers } from './crosshairsSynchronizers';
|
import { crosshairsSynchronizers } from './crosshairsSynchronizers';
|
||||||
@ -403,6 +404,30 @@ export const toolManager = {
|
|||||||
toolManager.init();
|
toolManager.init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let $elements;
|
||||||
|
if (!elements || !elements.length) {
|
||||||
|
$elements = $('.imageViewerViewport');
|
||||||
|
} else {
|
||||||
|
$elements = $(elements);
|
||||||
|
}
|
||||||
|
|
||||||
|
const checkElementEnabled = function(allElementsEnabled, element) {
|
||||||
|
try {
|
||||||
|
cornerstone.getEnabledElement(element);
|
||||||
|
|
||||||
|
return allElementsEnabled;
|
||||||
|
} catch (error) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if ($elements.toArray().reduce(checkElementEnabled, false)) {
|
||||||
|
// if at least one element is not enabled, we do not activate tool.
|
||||||
|
OHIF.log.info(`Could not activate tool ${tool} due to a viewport not being enabled. Try again later.`);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TODO: Add textMarkerDialogs template to OHIF's
|
* TODO: Add textMarkerDialogs template to OHIF's
|
||||||
*/
|
*/
|
||||||
@ -429,13 +454,6 @@ export const toolManager = {
|
|||||||
tool = defaultTool;
|
tool = defaultTool;
|
||||||
}
|
}
|
||||||
|
|
||||||
let $elements;
|
|
||||||
if (!elements || !elements.length) {
|
|
||||||
$elements = $('.imageViewerViewport');
|
|
||||||
} else {
|
|
||||||
$elements = $(elements);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Otherwise, set the active tool for all viewport elements
|
// Otherwise, set the active tool for all viewport elements
|
||||||
$elements.each((index, element) => {
|
$elements.each((index, element) => {
|
||||||
toolManager.setActiveToolForElement(tool, element);
|
toolManager.setActiveToolForElement(tool, element);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user