Updates to fix dialogs for non-target lesions.

Packages/lesiontracker/client/compatibility/nonTargetTool.js

@@ -6,8 +6,8 @@
 
     var configuration = {
         setLesionNumberCallback: setLesionNumberCallback,
-        getNonTargetLesionLocationCallback: getNonTargetLesionLocationCallback,
-        changeNonTargetLesionLocationCallback: changeNonTargetLesionLocationCallback,
+        getLesionLocationCallback: getLesionLocationCallback,
+        changeLesionLocationCallback: changeLesionLocationCallback,
         drawHandles: false,
         drawHandlesOnHover: true,
         arrowFirst: true
@@ -21,11 +21,11 @@
     }
     // Define a callback to get your text annotation
     // This could be used, e.g. to open a modal
-    function getNonTargetLesionLocationCallback(measurementData, eventData, doneCallback) {
+    function getLesionLocationCallback(measurementData, eventData, doneCallback) {
         doneCallback(prompt('Enter your lesion location:'));
     }
 
-    function changeNonTargetLesionLocationCallback(measurementData, eventData, doneCallback) {
+    function changeLesionLocationCallback(measurementData, eventData, doneCallback) {
         doneCallback(prompt('Change your lesion location:'));
     }
 
@@ -71,7 +71,7 @@
                 // delete the measurement
                 cornerstoneTools.removeToolState(mouseEventData.element, toolType, measurementData);
             }else{
-                config.getNonTargetLesionLocationCallback(measurementData, mouseEventData, doneCallback);
+                config.getLesionLocationCallback(measurementData, mouseEventData, doneCallback);
 
             }
 
@@ -268,7 +268,7 @@
                 cornerstoneTools.removeToolState(element, toolType, measurementData);
             }
 
-            config.getNonTargetLesionLocationCallback(measurementData, touchEventData, doneCallback);
+            config.getLesionLocationCallback(measurementData, touchEventData, doneCallback);
 
 
             $(element).on('CornerstoneToolsTouchDrag', cornerstoneTools.nonTargetTouch.touchMoveHandle);
@@ -282,11 +282,10 @@
         var element = eventData.element;
         var data;
 
-        function doneChangingTextCallback(data, updatedText, deleteTool) {
+        function doneCallback(data, deleteTool) {
             if (deleteTool === true) {
                 cornerstoneTools.removeToolState(element, toolType, data);
-            } else {
-                data.text = updatedText;
+                cornerstone.updateImage(element);
             }
 
             data.active = false;
@@ -313,7 +312,7 @@
                 data.active = true;
                 cornerstone.updateImage(element);
                 // Allow relabelling via a callback
-                config.changeTextCallback(data, doneChangingTextCallback);
+                config.changeLesionLocationCallback(data, eventData, doneCallback);
 
                 e.stopImmediatePropagation();
                 return false;
@@ -328,8 +327,8 @@
         createNewMeasurement: createNewMeasurement,
         onImageRendered: onImageRendered,
         pointNearTool: pointNearTool,
-        toolType: toolType
-        //mouseDoubleClickCallback: doubleClickCallback
+        toolType: toolType,
+        mouseDoubleClickCallback: doubleClickCallback
     });
 
     cornerstoneTools.nonTarget.setConfiguration(configuration);

Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.html

@@ -1,40 +1,61 @@
 <template name="nonTargetLesionDialog">
     <div id="nonTargetLesionLocationDialog">
         <div class="dialogHeader">
-            <div class="dialogHeader">
-                <div><h4>Select Lesion Location</h4></div>
-            </div>
+            <h4>Select Lesion Location</h4>
         </div>
         <div class="dialogContent">
             <div class="lesionLocation">
-                <div class="elementContainer">
-                    <label>Lesion Location</label>
-                </div>
-                <div class="elementContainer">
-                    <select id="selectNonTargetLesionLocation">
-                        <option value="-1"></option>
-                        {{ #each lesionLocations}}
-                        <option value='{{_id}}'>{{location}}</option>
-                        {{ /each}}
-                    </select>
-                </div>
+                <label>Lesion Location</label>
+                <select id="selectNonTargetLesionLocation">
+                    <option value="-1"></option>
+                    {{ #each lesionLocations}}
+                    <option value='{{_id}}'>{{location}}</option>
+                    {{ /each}}
+                </select>
             </div>
             <div class="locationResponse">
-                <div class="elementContainer">
-                    <label>Response</label>
-                </div>
-                <div class="elementContainer">
-                    <select id="selectNonTargetLesionLocationResponse">
-                        <option value="-1"></option>
-                        {{ #each locationResponses}}
-                        <option value='{{code}}'>{{code}} - {{text}}</option>
-                        {{ /each}}
-                    </select>
-                </div>
+                <label>Response</label>
+                <select id="selectNonTargetLesionLocationResponse">
+                    <option value="-1"></option>
+                    {{ #each locationResponses}}
+                    <option value='{{code}}'>{{code}} - {{text}}</option>
+                    {{ /each}}
+                </select>
             </div>
             <div class="locationOK">
                 <button class="btn btn-primary" id="nonTargetLesionOK">OK</button>
             </div>
         </div>
     </div>
+
+    <div id="nonTargetLesionRelabelDialog">
+        <div class="dialogHeader">
+            <h4>Select Lesion Location</h4>
+        </div>
+        <div class="dialogContent">
+            <div class="lesionLocation">
+                <label>Lesion Location</label>
+                <select id="selectNonTargetLesionLocation">
+                    <option value="-1"></option>
+                    {{ #each lesionLocations}}
+                    <option value='{{_id}}'>{{location}}</option>
+                    {{ /each}}
+                </select>
+            </div>
+            <div class="locationResponse">
+                <label>Response</label>
+                <select id="selectNonTargetLesionLocationResponse">
+                    <option value="-1"></option>
+                    {{ #each locationResponses}}
+                    <option value='{{code}}'>{{code}} - {{text}}</option>
+                    {{ /each}}
+                </select>
+            </div>
+            <div class="locationOK">
+                <button class="btn btn-link" id="removeLesion">Remove</button>
+
+                <button class="btn btn-primary" id="nonTargetLesionOK">OK</button>
+            </div>
+        </div>
+    </div>
 </template>

Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.js

@@ -36,7 +36,7 @@ function setLesionNumberCallback(measurementData, eventData, doneCallback) {
 // This event determines whether or not to show the Non-Target lesion dialog
 // If there already exists a lesion with this specific lesion number,
 // related to the chosen location.
-function getNonTargetLesionLocationCallback(measurementData, eventData) {
+function getLesionLocationCallback(measurementData, eventData) {
     Template.nonTargetLesionDialog.measurementData = measurementData;
 
     // Get the non-target lesion location dialog
@@ -49,11 +49,6 @@ function getNonTargetLesionLocationCallback(measurementData, eventData) {
     // Make sure the context menu is closed when the user clicks away
     $(".removableBackdrop").one('mousedown touchstart', function() {
         closeHandler(dialog);
-
-        if (doneCallback && typeof doneCallback === 'function') {
-            var deleteTool = true;
-            doneCallback(measurementData, deleteTool);
-        }
     });
 
     // Find the select option box
@@ -112,14 +107,63 @@ function getNonTargetLesionLocationCallback(measurementData, eventData) {
     dialog.css(dialogProperty);
 }
 
-function changeNonTargetLesionLocationCallback(measurementData, eventData, doneCallback) {
-    doneCallback(prompt('Change your lesion location:'));
+function changeLesionLocationCallback(measurementData, eventData, doneCallback) {
+    Template.nonTargetLesionDialog.measurementData = measurementData;
+    Template.nonTargetLesionDialog.doneCallback = doneCallback;
+
+    // Get the non-target lesion location dialog
+    var dialog = $("#nonTargetLesionRelabelDialog");
+    Template.nonTargetLesionDialog.dialog = dialog;
+
+    // Show the backdrop
+    UI.render(Template.removableBackdrop, document.body);
+
+    // Make sure the context menu is closed when the user clicks away
+    $(".removableBackdrop").one('mousedown touchstart', function() {
+        closeHandler(dialog);
+
+        if (doneCallback && typeof doneCallback === 'function') {
+            var deleteTool = true;
+            doneCallback(measurementData, deleteTool);
+        }
+    });
+
+    // Find the select option box
+    var selectorLocation = dialog.find("select#selectNonTargetLesionLocation");
+    var selectorResponse = dialog.find("select#selectNonTargetLesionLocationResponse");
+
+    log.info(measurementData);
+    selectorLocation.find("option:first").prop("selected", "selected");
+    selectorResponse.find("option:first").prop("selected", "selected");
+
+    // Allow location selection
+    selectorLocation.removeAttr("disabled");
+
+    // Show the nonTargetLesion dialog above
+    var dialogProperty =  {
+        top: eventData.currentPoints.page.y,
+        left: eventData.currentPoints.page.x,
+        display: 'block'
+    };
+
+    // Device is touch device or not
+    // If device is touch device, set position center of screen vertically and horizontally
+    if (isTouchDevice()) {
+        // add dialogMobile class to provide a black,transparent background
+        dialog.addClass("dialogMobile");
+        dialogProperty.top = 0;
+        dialogProperty.left = 0;
+        dialogProperty.right = 0;
+        dialogProperty.bottom = 0;
+    }
+
+    dialog.css(dialogProperty);
 }
 
 var config = {
     setLesionNumberCallback: setLesionNumberCallback,
-    getNonTargetLesionLocationCallback: getNonTargetLesionLocationCallback,
-    changeNonTargetLesionLocationCallback: changeNonTargetLesionLocationCallback
+    getLesionLocationCallback: getLesionLocationCallback,
+    changeLesionLocationCallback: changeLesionLocationCallback
 };
 
 cornerstoneTools.nonTarget.setConfiguration(config);

Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.styl

@@ -1,4 +1,4 @@
-#nonTargetLesionLocationDialog
+#nonTargetLesionLocationDialog, #nonTargetLesionRelabelDialog
   display: none
   position: absolute
   top: 0
@@ -25,11 +25,6 @@
   .dialogContent, .lesionLocation, .locationResponse
     margin-bottom: 20px
 
-  .elementContainer
-    width: 100%
-    margin: 0 auto
-    float: none
-
   .locationOK
     text-align: center