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

Call showLesionDialog event from lesionTool.js

Browse Source
This commit is contained in:
Aysel Afsar 2015-10-26 11:04:42 -04:00
parent e2000480d3
commit edc9ecf69c
2 changed files with 60 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,13 +15,26 @@ var cornerstoneTools = (function ($, cornerstone, cornerstoneMath, cornerstoneTo
var element = mouseEventData.element; var element = mouseEventData.element;
var lesionCounter = ""; var lesionCounter = "";
//setting name of lesion // Subscribe CornerstoneMouseup event, when mouse is up, call lesionDialog
$(element).on("LesionNameSet", function(e,counter){ $(element).on("CornerstoneToolsMouseUp", function (e) {
lesionCounter = counter;
// Unsubscribe CornerstoneToolsMouseUp event
$(element).off("CornerstoneToolsMouseUp");
// Show LesionDialog
$(document).trigger("ShowLesionDialog", e);
}); });
//Listens LesionToolModified event and calls measurementModified function when lesion measurement is changed or updated. // Set Lesion Name
$(element).on("LesionNameSet", function(e,lesionName){
lesionCounter = lesionName;
});
// Subscribe LesionToolModified and calls measurementModified function when lesion measurement is changed or updated.
$(element).on("LesionToolModified", measurementModified); $(element).on("LesionToolModified", measurementModified);
// Subscribe LesionMeasurementCreated
$(element).trigger("LesionMeasurementCreated"); $(element).trigger("LesionMeasurementCreated");
// create the measurement data for this tool with the end handle activated // create the measurement data for this tool with the end handle activated

71
Packages/lesiontracker/components/lesionDialog/lesionDialog.js
View File

@ -1,31 +1,46 @@
Template.lesionDialog.onRendered(function () { Template.lesionDialog.onRendered(function () {
// Listen lesionMeaurementCreated Event and when this event is triggered, show lesionLocationDialog Box // Show Lesion Dialog
$(document).on("lesionMeasurementCreated",function(e,eventCaller,data){ $(document).on("ShowLesionDialog", function (e, eventData) {
var element = data.element; var dialogPointsOnPage = eventData.currentPoints.page;
var tabId = data.tabId; $("#modal-dialog-container").css({
var viewports = $("#content"+tabId).find(".imageViewerViewport"); "top": dialogPointsOnPage.y,
var viewportIndex = $(viewports).index($(element)); "left": dialogPointsOnPage.x
data.viewportIndex = viewportIndex; });
data.totalViewportCount = viewports.length;
//Set Lesion Table Data to insert into lesion table $("#lesionDialog").modal("show");
setLesionTableData(data);
// Check popup will shown or not
var returnVal = lesionNumberIsAdded(data);
if(!returnVal.isFound) {
if( !Session.get("lesionLocationSelected") ) {
$("#modal-dialog-container").css({
"top": eventCaller.pageY,
"left": eventCaller.pageX
});
$("#lesionDialog").modal("show");
}
} else {
// If lesionNumber is added before:
data.rowIndex = returnVal.rowIndex;
$(document).trigger("addLesionToExistedRow",data);
}
}); });
}); });
// Listen lesionMeaurementCreated Event and when this event is triggered, show lesionLocationDialog Box
/*
$(document).on("lesionMeasurementCreated",function(e,eventCaller,data){
console.log("Lesion measurement xreated");
var element = data.element;
var tabId = data.tabId;
var viewports = $("#content"+tabId).find(".imageViewerViewport");
var viewportIndex = $(viewports).index($(element));
data.viewportIndex = viewportIndex;
data.totalViewportCount = viewports.length;
//Set Lesion Table Data to insert into lesion table
setLesionTableData(data);
// Check popup will shown or not
var returnVal = lesionNumberIsAdded(data);
if(!returnVal.isFound) {
if( !Session.get("lesionLocationSelected") ) {
$("#modal-dialog-container").css({
"top": eventCaller.pageY,
"left": eventCaller.pageX
});
$("#lesionDialog").modal("show");
}
} else {
// If lesionNumber is added before:
data.rowIndex = returnVal.rowIndex;
$(document).trigger("addLesionToExistedRow",data);
}
});*/