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

Bug fixing: nonTarget tool measurements will be active when row is selected

Browse Source
This commit is contained in:
Evren Ozkan 2015-11-09 15:35:06 -05:00
parent 1e61e487c0
commit aa5e23cf8e
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/cornerstone/client/cornerstoneTools.js
View File

@ -1104,7 +1104,7 @@ if (typeof cornerstoneTools === 'undefined') {
imageNeedsUpdate = true;
}
if ((mouseToolInterface.pointInsideRect(eventData.element, data, coords) && !data.active) || (!mouseToolInterface.pointInsideRect(eventData.element, data, coords) && data.active)) {
if (mouseToolInterface.pointInsideRect(eventData.element, data, coords) && !data.active || !mouseToolInterface.pointInsideRect(eventData.element, data, coords) && data.active) {
data.active = !data.active;
imageNeedsUpdate = true;
}

10
Packages/lesiontracker/compatibility/lesionTool.js
View File

@ -105,19 +105,19 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
}
function suscribeLesionToolModifiedEvent(element) {
function suscribeLesionToolSelectedEvent(element) {
var elementEvents = $._data(element, "events");
var index = Object.keys(elementEvents).indexOf("LesionToolModified");
var index = Object.keys(elementEvents).indexOf("LesionToolSelected");
if (index < 0) {
// Subscribe LesionToolModified and calls measurementModified function when lesion measurement is changed or updated.
$(element).on("LesionToolModified", measurementModified);
// Subscribe LesionToolSelected and calls measurementModified function when lesion measurement is changed or updated.
$(element).on("LesionToolSelected", measurementModified);
}
}
///////// BEGIN IMAGE RENDERING ///////
function onImageRendered(e, eventData) {
suscribeLesionToolModifiedEvent(e.currentTarget);
suscribeLesionToolSelectedEvent(e.currentTarget);
// if we have no toolData for this element, return immediately as there is nothing to do
var toolData = cornerstoneTools.getToolState(e.currentTarget, toolType);

7
Packages/lesiontracker/compatibility/nonTargetTool.js
View File

@ -187,10 +187,10 @@
function suscribeNonTargetToolModifiedEvent(element) {
var elementEvents = $._data(element, "events");
var index = Object.keys(elementEvents).indexOf("nonTargetToolModified");
var index = Object.keys(elementEvents).indexOf("NonTargetToolSelected");
if (index < 0) {
// Subscribe LesionToolModified and calls measurementModified function when lesion measurement is changed or updated.
$(element).on("nonTargetToolModified", measurementModified);
$(element).on("NonTargetToolSelected", measurementModified);
}
}
@ -303,7 +303,7 @@
context.restore();
}
// ---- Touch tool ----
// ---- Touch tool ----
///////// BEGIN ACTIVE TOOL ///////
function addNewMeasurementTouch(touchEventData) {
@ -346,6 +346,7 @@
});
}
function doubleClickCallback(e, eventData) {
var element = eventData.element;
var data;

14
Packages/lesiontracker/components/lesionTable/lesionTable.js
View File

@ -78,11 +78,19 @@ function updateLesions(e) {
eventData.type = "inactive";
}
if(!isTarget) {
$(element).trigger("nonTargetToolModified", eventData);
if (!isTarget) {
$(element).trigger("NonTargetToolSelected", eventData);
// Deactivate lesion tool measurements
eventData.type = "inactive";
$(element).trigger("LesionToolSelected", eventData);
return;
}
$(element).trigger("LesionToolModified", eventData);
$(element).trigger("LesionToolSelected", eventData);
// Deactivate nonTarget tool measurements
eventData.type = "inactive";
$(element).trigger("NonTargetToolSelected", eventData);
});
}