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

Added support for multi-frame images (e.g. ultrasound). Updated cornerstoneTools with mouseClick bug fix

Browse Source
This commit is contained in:
Erik Ziegler committed 2015-11-26 10:36:34 +01:00
1 parent 5010307b6e
commit 462820f0aa
4 files changed
+42 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Packages/cornerstone/client/cornerstoneTools.js
+15 -1
View File
@@ -1,4 +1,4 @@
/*! cornerstoneTools - v0.7.7 - 2015-11-25 | (c) 2014 Chris Hafey | https://github.com/chafey/cornerstoneTools */
/*! cornerstoneTools - v0.7.7 - 2015-11-26 | (c) 2014 Chris Hafey | https://github.com/chafey/cornerstoneTools */
// Begin Source: src/header.js
if (typeof cornerstone === 'undefined') {
cornerstone = {};
@@ -2747,6 +2747,7 @@ if (typeof cornerstoneTools === 'undefined') {
function mouseUpCallback(e, eventData) {
$(eventData.element).off('CornerstoneToolsMouseDrag', dragCallback);
$(eventData.element).off('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).off('CornerstoneToolsMouseClick', mouseUpCallback);
cornerstone.updateImage(eventData.element);
}
@@ -2754,6 +2755,7 @@ if (typeof cornerstoneTools === 'undefined') {
if (cornerstoneTools.isMouseButtonEnabled(eventData.which, e.data.mouseButtonMask)) {
$(eventData.element).on('CornerstoneToolsMouseDrag', dragCallback);
$(eventData.element).on('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).on('CornerstoneToolsMouseClick', mouseUpCallback);
cornerstoneTools.dragProbe.strategy(eventData);
return false; // false = causes jquery to preventDefault() and stopPropagation() this event
}
@@ -4214,12 +4216,14 @@ if (typeof cornerstoneTools === 'undefined') {
function mouseUpCallback(e, eventData) {
$(eventData.element).off('CornerstoneToolsMouseDrag', dragCallback);
$(eventData.element).off('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).off('CornerstoneToolsMouseClick', mouseUpCallback);
}
function mouseDownCallback(e, eventData) {
if (cornerstoneTools.isMouseButtonEnabled(eventData.which, e.data.mouseButtonMask)) {
$(eventData.element).on('CornerstoneToolsMouseDrag', dragCallback);
$(eventData.element).on('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).on('CornerstoneToolsMouseClick', mouseUpCallback);
return false; // false = causes jquery to preventDefault() and stopPropagation() this event
}
}
@@ -4628,12 +4632,14 @@ if (typeof cornerstoneTools === 'undefined') {
function mouseUpCallback(e, eventData) {
$(eventData.element).off('CornerstoneToolsMouseDrag', dragCallback);
$(eventData.element).off('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).off('CornerstoneToolsMouseClick', mouseUpCallback);
}
function mouseDownCallback(e, eventData) {
if (cornerstoneTools.isMouseButtonEnabled(eventData.which, e.data.mouseButtonMask)) {
$(eventData.element).on('CornerstoneToolsMouseDrag', dragCallback);
$(eventData.element).on('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).on('CornerstoneToolsMouseClick', mouseUpCallback);
return false; // false = causes jquery to preventDefault() and stopPropagation() this event
}
}
@@ -5286,12 +5292,14 @@ if (typeof cornerstoneTools === 'undefined') {
function mouseUpCallback(e, eventData) {
$(eventData.element).off('CornerstoneToolsMouseDrag', mouseDragCallback);
$(eventData.element).off('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).off('CornerstoneToolsMouseClick', mouseUpCallback);
}
function mouseDownCallback(e, eventData) {
if (cornerstoneTools.isMouseButtonEnabled(eventData.which, e.data.mouseButtonMask)) {
$(eventData.element).on('CornerstoneToolsMouseDrag', mouseDragCallback);
$(eventData.element).on('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).on('CornerstoneToolsMouseClick', mouseUpCallback);
return false; // false = cases jquery to preventDefault() and stopPropagation() this event
}
}
@@ -5853,6 +5861,7 @@ if (typeof cornerstoneTools === 'undefined') {
function mouseUpCallback(e, eventData) {
$(eventData.element).off('CornerstoneToolsMouseDrag', dragCallback);
$(eventData.element).off('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).off('CornerstoneToolsMouseClick', mouseUpCallback);
}
function mouseDownCallback(e, eventData) {
@@ -5860,6 +5869,7 @@ if (typeof cornerstoneTools === 'undefined') {
startPoints = eventData.startPoints; // Used for translateStrategy
$(eventData.element).on('CornerstoneToolsMouseDrag', dragCallback);
$(eventData.element).on('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).on('CornerstoneToolsMouseClick', mouseUpCallback);
return false; // false = cases jquery to preventDefault() and stopPropagation() this event
}
}
@@ -7766,6 +7776,7 @@ Display scroll progress bar across bottom of image.
function mouseUpCallback(e, eventData) {
$(eventData.element).off('CornerstoneToolsMouseDrag', dragCallback);
$(eventData.element).off('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).off('CornerstoneToolsMouseClick', mouseUpCallback);
}
function mouseDownCallback(e, eventData) {
@@ -7775,6 +7786,7 @@ Display scroll progress bar across bottom of image.
};
$(eventData.element).on('CornerstoneToolsMouseDrag', mouseDragEventData, dragCallback);
$(eventData.element).on('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).on('CornerstoneToolsMouseClick', mouseUpCallback);
e.stopImmediatePropagation();
return false;
}
@@ -9589,6 +9601,7 @@ Display scroll progress bar across bottom of image.
function mouseUpCallback(e, eventData) {
$(eventData.element).off('CornerstoneToolsMouseDrag', mouseDragCallback);
$(eventData.element).off('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).off('CornerstoneToolsMouseClick', mouseUpCallback);
}
function mouseDownCallback(e, eventData) {
@@ -9600,6 +9613,7 @@ Display scroll progress bar across bottom of image.
};
$(eventData.element).on('CornerstoneToolsMouseDrag', mouseDragEventData, mouseDragCallback);
$(eventData.element).on('CornerstoneToolsMouseUp', mouseUpCallback);
$(eventData.element).on('CornerstoneToolsMouseClick', mouseUpCallback);
e.stopImmediatePropagation();
return false;
}