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

Bi-directional tool callout is reattached to the nearest control point,

Browse Source 
Bi-directional tool is added to hide/show tool
This commit is contained in:
Evren Ozkan 2015-12-18 17:11:34 -05:00
parent ed4fdba54e
commit 8fb0695097
2 changed files with 142 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
Packages/lesiontracker/client/compatibility/biDirectionalTool.js
View File

@ -55,8 +55,8 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
// since we are dragging to another place to drop the end point, we can just activate // since we are dragging to another place to drop the end point, we can just activate
// the end point and let the moveHandle move it for us. // the end point and let the moveHandle move it for us.
$(element).off('CornerstoneToolsMouseMove', mouseMoveCallback); $(element).off('CornerstoneToolsMouseMove', cornerstoneTools.biDirectional.mouseMoveCallback);
$(element).off('CornerstoneToolsMouseDown', cornerstoneTools.biDirectional.mouseDownCallback); $(element).off('CornerstoneToolsMouseDown', mouseDownCallback);
$(element).off('CornerstoneToolsMouseDownActivate', cornerstoneTools.biDirectional.mouseDownActivateCallback); $(element).off('CornerstoneToolsMouseDownActivate', cornerstoneTools.biDirectional.mouseDownActivateCallback);
// Set lesion number and lesion name // Set lesion number and lesion name
@ -75,8 +75,8 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
// perpendicular line is not connected to long-line // perpendicular line is not connected to long-line
measurementData.handles.perpendicularStart.locked = false; measurementData.handles.perpendicularStart.locked = false;
$(element).on('CornerstoneToolsMouseMove', eventData, mouseMoveCallback); $(element).on('CornerstoneToolsMouseMove', eventData, cornerstoneTools.biDirectional.mouseMoveCallback);
$(element).on('CornerstoneToolsMouseDown', eventData, cornerstoneTools.biDirectional.mouseDownCallback); $(element).on('CornerstoneToolsMouseDown', eventData, mouseDownCallback);
$(element).on('CornerstoneToolsMouseDownActivate', eventData, cornerstoneTools.biDirectional.mouseDownActivateCallback); $(element).on('CornerstoneToolsMouseDownActivate', eventData, cornerstoneTools.biDirectional.mouseDownActivateCallback);
cornerstone.updateImage(element); cornerstone.updateImage(element);
@ -158,8 +158,8 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
index: 1 index: 1
}, },
textBox: { textBox: {
x: mouseEventData.currentPoints.image.x - 70, x: mouseEventData.currentPoints.image.x - 50,
y: mouseEventData.currentPoints.image.y - 100, y: mouseEventData.currentPoints.image.y - 70,
pointNearHandle: pointNearTextBox, pointNearHandle: pointNearTextBox,
active: false, active: false,
movesIndependently: true, movesIndependently: true,
@ -173,7 +173,6 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
highlight: true, highlight: true,
active: false, active: false,
locked: true, // If perpendicular line is connected to long-line locked: true, // If perpendicular line is connected to long-line
lineType: 'perpendicular',
index: 2 index: 2
}, },
@ -182,7 +181,6 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
y: mouseEventData.currentPoints.image.y, y: mouseEventData.currentPoints.image.y,
highlight: true, highlight: true,
active: false, active: false,
lineType: 'perpendicular',
index: 3 index: 3
} }
@ -412,15 +410,8 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
return true; return true;
} }
function moveHandle(mouseEventData, toolType, data, handle, doneMovingCallback, preventHandleOutsideImage) { // Sets position of handles(start, end, perpendicularStart, perpendicularEnd)
var element = mouseEventData.element; function setHandlesPosition (handle, eventData, data) {
var distanceFromTool = {
x: handle.x - mouseEventData.currentPoints.image.x,
y: handle.y - mouseEventData.currentPoints.image.y
};
function mouseDragCallback(e, eventData) {
handle.active = true;
if (handle.index === 0) { if (handle.index === 0) {
// if long-axis start point is moved // if long-axis start point is moved
@ -499,11 +490,25 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
} }
} }
} else { }
}
function moveHandle(mouseEventData, toolType, data, handle, doneMovingCallback, preventHandleOutsideImage) {
var element = mouseEventData.element;
var distanceFromTool = {
x: handle.x - mouseEventData.currentPoints.image.x,
y: handle.y - mouseEventData.currentPoints.image.y
};
function mouseDragCallback(e, eventData) {
handle.active = true;
if (handle.index === undefined || handle.index === null) {
handle.x = eventData.currentPoints.image.x + distanceFromTool.x; handle.x = eventData.currentPoints.image.x + distanceFromTool.x;
handle.y = eventData.currentPoints.image.y + distanceFromTool.y; handle.y = eventData.currentPoints.image.y + distanceFromTool.y;
} else {
setHandlesPosition(handle, eventData, data);
} }
if (preventHandleOutsideImage) { if (preventHandleOutsideImage) {
@ -556,7 +561,7 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
} }
cornerstone.updateImage(element); cornerstone.updateImage(element);
$(element).on('CornerstoneToolsMouseMove', eventData, mouseMoveCallback); $(element).on('CornerstoneToolsMouseMove', eventData, cornerstoneTools.biDirectional.mouseMoveCallback);
} }
if (cornerstoneTools.isMouseButtonEnabled(eventData.which, e.data.mouseButtonMask)) { if (cornerstoneTools.isMouseButtonEnabled(eventData.which, e.data.mouseButtonMask)) {
@ -572,7 +577,7 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
var distanceSq = 25; var distanceSq = 25;
var handle = cornerstoneTools.getHandleNearImagePoint(element, data.handles, coords, distanceSq); var handle = cornerstoneTools.getHandleNearImagePoint(element, data.handles, coords, distanceSq);
if (handle) { if (handle) {
$(element).off('CornerstoneToolsMouseMove',mouseMoveCallback); $(element).off('CornerstoneToolsMouseMove',cornerstoneTools.biDirectional.mouseMoveCallback);
data.active = true; data.active = true;
moveHandle(eventData, toolType, data, handle, handleDoneMove); moveHandle(eventData, toolType, data, handle, handleDoneMove);
e.stopImmediatePropagation(); e.stopImmediatePropagation();
@ -592,7 +597,7 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
for (i = 0; i < toolData.data.length; i++) { for (i = 0; i < toolData.data.length; i++) {
data = toolData.data[i]; data = toolData.data[i];
if (pointNearTool(element, data, coords)) { if (pointNearTool(element, data, coords)) {
$(element).off('CornerstoneToolsMouseMove', mouseMoveCallback); $(element).off('CornerstoneToolsMouseMove', cornerstoneTools.biDirectional.mouseMoveCallback);
cornerstoneTools.moveAllHandles(e, data, toolData, toolType, options, handleDoneMove); cornerstoneTools.moveAllHandles(e, data, toolData, toolType, options, handleDoneMove);
e.stopImmediatePropagation(); e.stopImmediatePropagation();
return false; return false;
@ -602,43 +607,7 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
} }
} }
function mouseMoveCallback(e, eventData){ // draw perpendicular line
cornerstoneTools.toolCoordinates.setCoords(eventData);
// if a mouse button is down, do nothing
if (eventData.which !== 0) {
return;
}
// if we have no tool data for this element, do nothing
var toolData = cornerstoneTools.getToolState(eventData.element, toolType);
if (!toolData) {
return;
}
// We have tool data, search through all data
// and see if we can activate a handle
var imageNeedsUpdate = false;
for (var i = 0; i < toolData.data.length; i++) {
// get the cursor position in canvas coordinates
var coords = eventData.currentPoints.canvas;
var data = toolData.data[i];
if (cornerstoneTools.handleActivator(eventData.element, data.handles, coords) === true) {
imageNeedsUpdate = true;
}
if ((pointNearTool(eventData.element, data, coords) && !data.active) || (!pointNearTool(eventData.element, data, coords) && data.active)) {
data.active = !data.active;
imageNeedsUpdate = true;
}
}
// Handle activation status changed, redraw the image
if (imageNeedsUpdate === true) {
cornerstone.updateImage(eventData.element);
}
}
function drawPerpendicularLine(context, eventData,element, data, color, lineWidth) { function drawPerpendicularLine(context, eventData,element, data, color, lineWidth) {
// mid point of long-axis line // mid point of long-axis line
@ -681,6 +650,47 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
} }
function findDottedLinePosition(data) {
var distancesArr = [];
var minDistance;
// Find distances between handles and textBox
var distanceToStart = getDistance(data.handles.start, data.handles.textBox);
distancesArr.push({distance: distanceToStart, point: data.handles.start});
minDistance = distanceToStart;
var distanceToEnd = getDistance(data.handles.end, data.handles.textBox);
distancesArr.push({distance: distanceToEnd, point: data.handles.end});
if(distanceToEnd < minDistance) {
minDistance = distanceToEnd;
}
if(data.handles.perpendicularStart.x && data.handles.perpendicularStart.y) {
var distanceToPerpendicularStart = getDistance(data.handles.perpendicularStart, data.handles.textBox);
distancesArr.push({distance: distanceToPerpendicularStart, point: data.handles.perpendicularStart});
if(distanceToPerpendicularStart < minDistance) {
minDistance = distanceToPerpendicularStart;
}
}
if(data.handles.perpendicularEnd.x && data.handles.perpendicularEnd.y) {
var distanceToPerpendicularEnd = getDistance(data.handles.perpendicularEnd, data.handles.textBox);
distancesArr.push({distance: distanceToPerpendicularEnd, point: data.handles.perpendicularEnd});
if(distanceToPerpendicularEnd < minDistance) {
minDistance = distanceToPerpendicularEnd;
}
}
for(var i=0; i< distancesArr.length; i++) {
var obj = distancesArr[i];
if (obj.distance === minDistance) {
return obj.point;
}
}
}
///////// BEGIN IMAGE RENDERING /////// ///////// BEGIN IMAGE RENDERING ///////
function onImageRendered(e, eventData) { function onImageRendered(e, eventData) {
// if we have no toolData for this element, return immediately as there is nothing to do // if we have no toolData for this element, return immediately as there is nothing to do
@ -740,9 +750,10 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
context.lineWidth = lineWidth; context.lineWidth = lineWidth;
context.setLineDash([2, 3]); context.setLineDash([2, 3]);
var perpendicularStartCanvas = cornerstone.pixelToCanvas(element, data.handles.perpendicularStart); // Set position of text
var perpendicularStartCanvas = cornerstone.pixelToCanvas(element, findDottedLinePosition(data));
context.moveTo(perpendicularStartCanvas.x, perpendicularStartCanvas.y); context.moveTo(perpendicularStartCanvas.x, perpendicularStartCanvas.y);
context.lineTo(canvasTextLocation.x + 20, canvasTextLocation.y + 20); context.lineTo(canvasTextLocation.x + 20, canvasTextLocation.y + 40);
context.stroke(); context.stroke();
// Draw the Length text // Draw the Length text
@ -850,7 +861,6 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
onImageRendered: onImageRendered, onImageRendered: onImageRendered,
pointNearTool: pointNearTool, pointNearTool: pointNearTool,
mouseDoubleClickCallback: doubleClickCallback, mouseDoubleClickCallback: doubleClickCallback,
mouseMoveCallback: mouseMoveCallback,
mouseDownCallback: mouseDownCallback, mouseDownCallback: mouseDownCallback,
toolType: toolType toolType: toolType
}); });

2
Packages/lesiontracker/lib/toggleLesionTrackerTools.js
View File

@ -18,7 +18,7 @@ toggleLesionTrackerTools = function() {
activate: [], activate: [],
deactivate: [], deactivate: [],
enable: [], enable: [],
disable: ['lesion', 'nonTarget'] disable: ['lesion', 'nonTarget', 'biDirectional']
}; };
toolManager.setToolDefaultStates(toolDefaultStates); toolManager.setToolDefaultStates(toolDefaultStates);