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

LT-53: Show control points only when mouse is hovered on a measurement and do not show control points while the measurement is edited

Browse Source
This commit is contained in:
Evren Ozkan 2015-12-21 17:28:52 -05:00
parent d7d4ea0394
commit 9d322e7ac2
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
var element = mouseEventData.element; var element = mouseEventData.element;
function doneCallback(lesionNumber) { function doneCallback(lesionNumber) {
measurementData.lesionName = "Bi-Directional " + lesionNumber; measurementData.lesionName = "Target " + lesionNumber;
measurementData.lesionNumber = lesionNumber; measurementData.lesionNumber = lesionNumber;
measurementData.active = false; measurementData.active = false;
cornerstone.updateImage(element); cornerstone.updateImage(element);
@ -148,7 +148,7 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
y: mouseEventData.currentPoints.image.y, y: mouseEventData.currentPoints.image.y,
highlight: true, highlight: true,
active: false, active: false,
drawnIndependently: false, drawnIndependently: true,
index: 0 index: 0
}, },
end: { end: {
@ -156,7 +156,7 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
y: mouseEventData.currentPoints.image.y, y: mouseEventData.currentPoints.image.y,
highlight: true, highlight: true,
active: true, active: true,
drawnIndependently: false, drawnIndependently: true,
index: 1 index: 1
}, },
textBox: { textBox: {
@ -175,7 +175,7 @@ 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
drawnIndependently: false, drawnIndependently: true,
index: 2 index: 2
}, },
@ -184,7 +184,7 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
y: mouseEventData.currentPoints.image.y, y: mouseEventData.currentPoints.image.y,
highlight: true, highlight: true,
active: false, active: false,
drawnIndependently: false, drawnIndependently: true,
index: 3 index: 3
} }
@ -194,8 +194,9 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
studyInstanceUid: studyInstanceUid, studyInstanceUid: studyInstanceUid,
patientId: patientId, patientId: patientId,
measurementText: 0, measurementText: 0,
widthMeasurement: 0,
perpendicularMeasurement: 0, perpendicularMeasurement: 0,
lesionName: 'Bi-Directional', lesionName: 'Target',
isDeleted: false, isDeleted: false,
isTarget: true, isTarget: true,
uid: uuid.v4() uid: uuid.v4()
@ -498,6 +499,16 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
} }
// Sets drawnIndependently property of control points(handles)
function setControlPoints(handles, value) {
Object.keys(handles).forEach(function(name) {
if(name !== "textBox") {
var handle = handles[name];
handle.drawnIndependently = value;
}
});
}
//****************************************/ //****************************************/
// Cornerstone Methods // Cornerstone Methods
//****************************************/ //****************************************/
@ -586,12 +597,7 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
data.active = !data.active; data.active = !data.active;
// Set handles visibility // Set handles visibility
Object.keys(data.handles).forEach(function(name) { setControlPoints(data.handles, !data.active);
if(name !== "textBox") {
var handle = data.handles[name];
handle.drawnIndependently = !data.active;
}
});
imageNeedsUpdate = true; imageNeedsUpdate = true;
} }
} }
@ -629,11 +635,14 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
if (toolData) { if (toolData) {
for (i = 0; i < toolData.data.length; i++) { for (i = 0; i < toolData.data.length; i++) {
data = toolData.data[i]; data = toolData.data[i];
// Hide control points
setControlPoints(data.handles, true);
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', mouseMoveCallback);
data.active = true; data.active = true;
moveHandle(eventData, toolType, data, handle, handleDoneMove); moveHandle(eventData, toolType, data, handle, handleDoneMove);
e.stopImmediatePropagation(); e.stopImmediatePropagation();
return false; return false;
@ -831,8 +840,8 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
suffix = ' pixels'; suffix = ' pixels';
} }
var lengthText = ' L ' + length.toFixed(2) + suffix; var lengthText = ' L ' + length.toFixed(1) + suffix;
var widthText = ' W ' + width.toFixed(2) + suffix; var widthText = ' W ' + width.toFixed(1) + suffix;
var textLines = [data.lesionName, lengthText, widthText]; var textLines = [data.lesionName, lengthText, widthText];
var boundingBox = cornerstoneTools.drawTextBox(context, var boundingBox = cornerstoneTools.drawTextBox(context,
@ -843,6 +852,7 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
// Set measurement text to show lesion table // Set measurement text to show lesion table
data.measurementText = length.toFixed(1); data.measurementText = length.toFixed(1);
data.widthMeasurement = width.toFixed(1);
context.restore(); context.restore();
} }