Delete the lesion on image and from Measurements collection if del or ctrl+d(for mac) keys are pressed after a lesion is selected

Packages/lesiontracker/compatibility/lesionTool.js

@@ -290,7 +290,6 @@ var cornerstoneTools = (function($, cornerstone, cornerstoneMath, cornerstoneToo
     }
 
     function updateLesionCollection(lesionData) {
-        console.log(lesionData.measurementText);
         // TODO = Remove this in favour of measurement events
         if (!lesionData.active) {
             return;

Packages/lesiontracker/server/removeCollections.js

@@ -4,6 +4,59 @@ Meteor.methods({
         Measurements.remove(
             {patientId: patientId}
         );
+    },
+
+    "removePatientMeasurement": function(lesionObject) {
+
+        // Find patient data
+        var measurementData = Measurements.findOne(
+            {
+                patientId: lesionObject.patientId,
+                isTarget: lesionObject.isTarget,
+                lesionNumber: lesionObject.lesionNumber
+            }
+        );
+
+        // Get timepoints
+        var timepoints = measurementData.timepoints;
+
+        // Create an array to hold keys of timepoints
+        var timepointsIds = Object.keys(timepoints).slice(0);
+
+          timepointsIds.forEach(function(timepointId){
+              if(timepointId === lesionObject.timepointId) {
+                  delete timepoints[timepointId];
+              }
+          });
+
+        var newTimepointsIds = Object.keys(timepoints);
+        // If there is no timepoints object, remove measurement data
+        if(newTimepointsIds.length) {
+            //Update measurement timepoints
+            Measurements.update(
+                {
+                    patientId: lesionObject.patientId,
+                    isTarget: lesionObject.isTarget,
+                    lesionNumber: lesionObject.lesionNumber
+                 },
+                {
+                    $set: {
+                        timepoints: timepoints
+                    }
+                }
+            );
+        }else {
+            // Remove all data
+            Measurements.remove(
+                {
+                    patientId: lesionObject.patientId,
+                    isTarget: lesionObject.isTarget,
+                    lesionNumber: lesionObject.lesionNumber
+                }
+            );
+        }
+
+
     }
 
 });

Packages/viewerbase/components/viewer/imageViewerViewport/imageViewerViewport.js

@@ -233,6 +233,101 @@ function loadSeriesIntoViewport(data) {
         $(element).off('CornerstoneImageRendered', onImageRendered);
         $(element).on('CornerstoneImageRendered', onImageRendered);
 
+        //TODO: ********************************************
+        //TODO: Delete a lesion
+        // TODO: Delete a lesion, if ctrl+d r del is pressed after lesion selected
+        //TODO: getTimepointObject should be global function to use everywhere
+
+        function getTimepointObject(imageId) {
+            var study = cornerstoneTools.metaData.get('study', imageId);
+            return Timepoints.findOne({timepointName: study.studyDate});
+        }
+
+        // ctrl+d is used to detect delete event if del key is not found on keyboard.
+        // Id key is down
+        var keyMap = {17: false, 68: false, 46: false};
+        function keyPressDownHandler(e, lesionData){
+            if (e.keyCode in keyMap) {
+                keyMap[e.keyCode] = true;
+                if (keyMap[46] || keyMap[17] && keyMap[68]) {
+                    var toolType = lesionData.isTarget ? 'lesion' : 'nonTarget';
+                    var imageId = lesionData.imageId;
+                    var toolState = cornerstoneTools.globalImageIdSpecificToolStateManager.toolState;
+                    Object.keys(toolState).forEach(function(imageIdKey){
+                        if(imageIdKey === imageId) {
+                            var toolStateArray = toolState[imageId][toolType].data;
+                            toolStateArray.forEach(function(data, index) {
+                                if(data.lesionNumber === lesionData.lesionNumber){
+                                    toolState[imageId][toolType].data.splice(index, 1);
+
+                                    // Remove from collection
+                                    var patientId = data.patientId;
+                                    var enabledElement = cornerstone.getEnabledElement(element);
+                                    var elementImageId = enabledElement.image.imageId;
+                                    var timepointData = getTimepointObject(elementImageId);
+                                    var lesionObject = {
+                                        patientId: patientId,
+                                        lesionNumber: lesionData.lesionNumber,
+                                        isTarget: lesionData.isTarget,
+                                        timepointId: timepointData.timepointID
+                                    };
+
+                                    // Remove patient measurement
+                                    Meteor.call('removePatientMeasurement', lesionObject);
+
+                                    //Update element
+                                    cornerstone.updateImage(element);
+                                }
+                            });
+
+
+                        }
+                    });
+
+                }
+            }
+        }
+
+        // When key is up
+        function keyPressUpHandler(e){
+            if (e.keyCode in keyMap) {
+                keyMap[e.keyCode] = false;
+            }
+        }
+
+        // CornerstoneToolsMouseDown event callback
+        function onMouseDown(e,eventData) {
+            var element = e.currentTarget;
+            var distanceSq = 25;
+            var coords = eventData.startPoints.canvas;
+            var toolTypes = ["lesion", "nonTarget"];
+            toolTypes.forEach(function(toolType){
+                var toolData = cornerstoneTools.getToolState(element, toolType);
+
+                // now check to see if there is a handle we can move
+                if (toolData) {
+                    for (i = 0; i < toolData.data.length; i++) {
+                        var data = toolData.data[i];
+                        var handle = cornerstoneTools.getHandleNearImagePoint(element, data.handles, coords, distanceSq);
+                        if(handle) {
+                            $(document).off("keydown");
+                            $(document).on('keydown', function(e){
+                                keyPressDownHandler(e,data);
+                            });
+                            $(document).off("keyup");
+                            $(document).on('keyup',keyPressUpHandler);
+                        }
+                    }
+                }
+            });
+        }
+
+        $(element).on('CornerstoneToolsMouseDown', onMouseDown);
+        $(element).on('CornerstoneToolsMouseDown', onMouseDown);
+
+        //TODO: Delete a lesion ends
+        //TODO: ********************************************
+
         // Set a random value for the Session variable in order to trigger an overlay update
         Session.set('CornerstoneImageRendered' + viewportIndex, Random.id());