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

Fixing broken arrow tools

Browse Source
This commit is contained in:
Bruno Alves de Faria 2017-11-23 17:56:24 -02:00
parent 9ee6cb302a
commit a6fc444209
3 changed files with 155 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool.js
View File

@ -97,7 +97,7 @@ function createNewMeasurement(mouseEventData) {
} }
function addNewMeasurement(mouseEventData) { function addNewMeasurement(mouseEventData) {
const element = mouseEventData.element; const { element } = mouseEventData;
const $element = $(element); const $element = $(element);
// LT-29 Disable Target Measurements when pixel spacing is not available // LT-29 Disable Target Measurements when pixel spacing is not available
@ -113,10 +113,7 @@ function addNewMeasurement(mouseEventData) {
const measurementData = createNewMeasurement(mouseEventData); const measurementData = createNewMeasurement(mouseEventData);
measurementData.viewport = cornerstone.getViewport(element); measurementData.viewport = cornerstone.getViewport(element);
const eventData = { const eventData = { mouseButtonMask: mouseEventData.which };
mouseButtonMask: mouseEventData.which
};
const config = cornerstoneTools.bidirectional.getConfiguration(); const config = cornerstoneTools.bidirectional.getConfiguration();
// associate this data with this imageId so we can render it and manipulate it // associate this data with this imageId so we can render it and manipulate it

101
Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
View File

@ -66,7 +66,8 @@ function changeMeasurementLocationCallback(measurementData, eventData) {
/// --- Mouse Tool --- /// /// --- Mouse Tool --- ///
///////// BEGIN ACTIVE TOOL /////// ///////// BEGIN ACTIVE TOOL ///////
function addNewMeasurement(mouseEventData) { function addNewMeasurement(mouseEventData) {
const element = mouseEventData.element; const { element } = mouseEventData;
const $element = $(element);
function doneCallback() { function doneCallback() {
measurementData.active = true; measurementData.active = true;
@ -76,38 +77,76 @@ function addNewMeasurement(mouseEventData) {
const measurementData = createNewMeasurement(mouseEventData); const measurementData = createNewMeasurement(mouseEventData);
measurementData.viewport = cornerstone.getViewport(element); measurementData.viewport = cornerstone.getViewport(element);
const eventData = { const eventData = { mouseButtonMask: mouseEventData.which };
mouseButtonMask: mouseEventData.which const config = cornerstoneTools[toolType].getConfiguration();
};
const config = cornerstoneTools.nonTarget.getConfiguration();
// associate this data with this imageId so we can render it and manipulate it // associate this data with this imageId so we can render it and manipulate it
cornerstoneTools.addToolState(mouseEventData.element, toolType, measurementData); cornerstoneTools.addToolState(element, toolType, measurementData);
// since we are dragging to another place to drop the end point, we can just activate const disableDefaultHandlers = () => {
// the end point and let the moveHandle move it for us. // since we are dragging to another place to drop the end point, we can just activate
$(element).off('CornerstoneToolsMouseMove', cornerstoneTools.nonTarget.mouseMoveCallback); // the end point and let the moveHandle move it for us.
$(element).off('CornerstoneToolsMouseDown', cornerstoneTools.nonTarget.mouseDownCallback); $element.off('CornerstoneToolsMouseMove', cornerstoneTools[toolType].mouseMoveCallback);
$(element).off('CornerstoneToolsMouseDownActivate', cornerstoneTools.nonTarget.mouseDownActivateCallback); $element.off('CornerstoneToolsMouseDown', cornerstoneTools[toolType].mouseDownCallback);
$(element).off('CornerstoneToolsMouseDoubleClick', doubleClickCallback); $element.off('CornerstoneToolsMouseDownActivate', cornerstoneTools[toolType].mouseDownActivateCallback);
$element.off('CornerstoneToolsMouseDoubleClick', doubleClickCallback);
};
disableDefaultHandlers();
// Add a flag for using Esc to cancel tool placement // Add a flag for using Esc to cancel tool placement
let cancelled = false; let cancelled = false;
function cancelCallback(e) { const cancelAction = () => {
cancelled = true;
cornerstoneTools.removeToolState(element, toolType, measurementData);
};
// Add a flag for using Esc to cancel tool placement
const keyDownHandler = event => {
// If the Esc key was pressed, set the flag to true // If the Esc key was pressed, set the flag to true
if (e.which === keys.ESC) { if (event.which === keys.ESC) {
cancelled = true; cancelAction();
cornerstoneTools.removeToolState(mouseEventData.element, toolType, measurementData);
} }
// Don't propagate this keydown event so it can't interfere // Don't propagate this keydown event so it can't interfere
// with anything outside of this tool // with anything outside of this tool
return false; return false;
} };
// Bind a one-time event listener for the Esc key // Bind a one-time event listener for the Esc key
$(element).one('keydown', cancelCallback); $(element).one('keydown', keyDownHandler);
// Bind a mousedown handler to cancel the measurement if it's zero-sized
const mousedownHandler = () => {
const { start, end } = measurementData.handles;
if (!cornerstoneMath.point.distance(start, end)) {
cancelAction();
}
};
// Bind a one-time event listener for mouse down
$element.one('mousedown', mousedownHandler);
// Keep the current image and create a handler for new rendered images
const currentImage = cornerstone.getImage(element);
const currentViewport = cornerstone.getViewport(element);
const imageRenderedHandler = () => {
const newImage = cornerstone.getImage(element);
// Check if the rendered image changed during measurement creation and delete it if so
if (newImage.imageId !== currentImage.imageId) {
cornerstone.displayImage(element, currentImage, currentViewport);
cancelAction();
cornerstone.displayImage(element, newImage, currentViewport);
}
};
// Bind the event listener for image rendering
$element.on('CornerstoneImageRendered', imageRenderedHandler);
// Bind the tool deactivation and enlargement handlers
$element.on('CornerstoneToolsToolDeactivated', cancelAction);
$element.one('ohif.viewer.viewport.toggleEnlargement', cancelAction);
cornerstone.updateImage(element); cornerstone.updateImage(element);
@ -120,14 +159,26 @@ function addNewMeasurement(mouseEventData) {
} }
// Unbind the Esc keydown hook // Unbind the Esc keydown hook
$(element).off('keydown', cancelCallback); $element.off('keydown', keyDownHandler);
$(element).on('CornerstoneToolsMouseMove', eventData, cornerstoneTools.nonTarget.mouseMoveCallback); // Unbind the mouse down hook
$(element).on('CornerstoneToolsMouseDown', eventData, cornerstoneTools.nonTarget.mouseDownCallback); $element.off('mousedown', mousedownHandler);
$(element).on('CornerstoneToolsMouseDownActivate', eventData, cornerstoneTools.nonTarget.mouseDownActivateCallback);
$(element).on('CornerstoneToolsMouseDoubleClick', eventData, doubleClickCallback);
cornerstone.updateImage(mouseEventData.element); // Unbind the event listener for image rendering
$element.off('CornerstoneImageRendered', imageRenderedHandler);
// Unbind the tool deactivation and enlargement handlers
$element.off('CornerstoneToolsToolDeactivated', cancelAction);
$element.off('ohif.viewer.viewport.toggleEnlargement', cancelAction);
// Disable the default handlers and re-enable again
disableDefaultHandlers();
$element.on('CornerstoneToolsMouseMove', eventData, cornerstoneTools[toolType].mouseMoveCallback);
$element.on('CornerstoneToolsMouseDown', eventData, cornerstoneTools[toolType].mouseDownCallback);
$element.on('CornerstoneToolsMouseDownActivate', eventData, cornerstoneTools[toolType].mouseDownActivateCallback);
$element.on('CornerstoneToolsMouseDoubleClick', eventData, doubleClickCallback);
cornerstone.updateImage(element);
}); });
} }

105
Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
View File

@ -56,48 +56,87 @@ function createQualitativeTargetTool(toolType) {
/// --- Mouse Tool --- /// /// --- Mouse Tool --- ///
///////// BEGIN ACTIVE TOOL /////// ///////// BEGIN ACTIVE TOOL ///////
function addNewMeasurement(mouseEventData) { function addNewMeasurement(mouseEventData) {
var element = mouseEventData.element; const { element } = mouseEventData;
const $element = $(element);
function doneCallback() { function doneCallback() {
measurementData.active = true; measurementData.active = true;
cornerstone.updateImage(element); cornerstone.updateImage(element);
} }
var measurementData = createNewMeasurement(mouseEventData); const measurementData = createNewMeasurement(mouseEventData);
measurementData.viewport = cornerstone.getViewport(element);
var eventData = { const eventData = { mouseButtonMask: mouseEventData.which };
mouseButtonMask: mouseEventData.which const config = cornerstoneTools[toolType].getConfiguration();
};
var config = cornerstoneTools[toolType].getConfiguration();
// associate this data with this imageId so we can render it and manipulate it // associate this data with this imageId so we can render it and manipulate it
cornerstoneTools.addToolState(mouseEventData.element, toolType, measurementData); cornerstoneTools.addToolState(element, toolType, measurementData);
// since we are dragging to another place to drop the end point, we can just activate const disableDefaultHandlers = () => {
// the end point and let the moveHandle move it for us. // since we are dragging to another place to drop the end point, we can just activate
$(element).off('CornerstoneToolsMouseMove', cornerstoneTools[toolType].mouseMoveCallback); // the end point and let the moveHandle move it for us.
$(element).off('CornerstoneToolsMouseDown', cornerstoneTools[toolType].mouseDownCallback); $element.off('CornerstoneToolsMouseMove', cornerstoneTools[toolType].mouseMoveCallback);
$(element).off('CornerstoneToolsMouseDownActivate', cornerstoneTools[toolType].mouseDownActivateCallback); $element.off('CornerstoneToolsMouseDown', cornerstoneTools[toolType].mouseDownCallback);
$(element).off('CornerstoneToolsMouseDoubleClick', doubleClickCallback); $element.off('CornerstoneToolsMouseDownActivate', cornerstoneTools[toolType].mouseDownActivateCallback);
$element.off('CornerstoneToolsMouseDoubleClick', doubleClickCallback);
};
disableDefaultHandlers();
// Add a flag for using Esc to cancel tool placement // Add a flag for using Esc to cancel tool placement
var cancelled = false; let cancelled = false;
const cancelAction = () => {
cancelled = true;
cornerstoneTools.removeToolState(element, toolType, measurementData);
};
function cancelCallback(e) { // Add a flag for using Esc to cancel tool placement
const keyDownHandler = event => {
// If the Esc key was pressed, set the flag to true // If the Esc key was pressed, set the flag to true
if (e.which === keys.ESC) { if (event.which === keys.ESC) {
cancelled = true; cancelAction();
cornerstoneTools.removeToolState(mouseEventData.element, toolType, measurementData);
} }
// Don't propagate this keydown event so it can't interfere // Don't propagate this keydown event so it can't interfere
// with anything outside of this tool // with anything outside of this tool
return false; return false;
} };
// Bind a one-time event listener for the Esc key // Bind a one-time event listener for the Esc key
$(element).one('keydown', cancelCallback); $(element).one('keydown', keyDownHandler);
// Bind a mousedown handler to cancel the measurement if it's zero-sized
const mousedownHandler = () => {
const { start, end } = measurementData.handles;
if (!cornerstoneMath.point.distance(start, end)) {
cancelAction();
}
};
// Bind a one-time event listener for mouse down
$element.one('mousedown', mousedownHandler);
// Keep the current image and create a handler for new rendered images
const currentImage = cornerstone.getImage(element);
const currentViewport = cornerstone.getViewport(element);
const imageRenderedHandler = () => {
const newImage = cornerstone.getImage(element);
// Check if the rendered image changed during measurement creation and delete it if so
if (newImage.imageId !== currentImage.imageId) {
cornerstone.displayImage(element, currentImage, currentViewport);
cancelAction();
cornerstone.displayImage(element, newImage, currentViewport);
}
};
// Bind the event listener for image rendering
$element.on('CornerstoneImageRendered', imageRenderedHandler);
// Bind the tool deactivation and enlargement handlers
$element.on('CornerstoneToolsToolDeactivated', cancelAction);
$element.one('ohif.viewer.viewport.toggleEnlargement', cancelAction);
cornerstone.updateImage(element); cornerstone.updateImage(element);
@ -110,16 +149,26 @@ function createQualitativeTargetTool(toolType) {
} }
// Unbind the Esc keydown hook // Unbind the Esc keydown hook
$(element).off('keydown', cancelCallback); $element.off('keydown', keyDownHandler);
$(element).on('CornerstoneToolsMouseMove', eventData, cornerstoneTools[toolType].mouseMoveCallback); // Unbind the mouse down hook
$(element).on('CornerstoneToolsMouseDown', eventData, cornerstoneTools[toolType].mouseDownCallback); $element.off('mousedown', mousedownHandler);
$(element).on('CornerstoneToolsMouseDownActivate', eventData, cornerstoneTools[toolType].mouseDownActivateCallback);
$(element).on('CornerstoneToolsMouseDoubleClick', eventData, doubleClickCallback);
$(element).off('keydown', cancelCallback); // Unbind the event listener for image rendering
$element.off('CornerstoneImageRendered', imageRenderedHandler);
cornerstone.updateImage(mouseEventData.element); // Unbind the tool deactivation and enlargement handlers
$element.off('CornerstoneToolsToolDeactivated', cancelAction);
$element.off('ohif.viewer.viewport.toggleEnlargement', cancelAction);
// Disable the default handlers and re-enable again
disableDefaultHandlers();
$element.on('CornerstoneToolsMouseMove', eventData, cornerstoneTools[toolType].mouseMoveCallback);
$element.on('CornerstoneToolsMouseDown', eventData, cornerstoneTools[toolType].mouseDownCallback);
$element.on('CornerstoneToolsMouseDownActivate', eventData, cornerstoneTools[toolType].mouseDownActivateCallback);
$element.on('CornerstoneToolsMouseDoubleClick', eventData, doubleClickCallback);
cornerstone.updateImage(element);
}); });
} }