Merge branch 'crunexTools'

Packages/lesiontracker/client/components/lesionLocationDialog/lesionLocationDialog.js

@@ -115,6 +115,14 @@ changeLesionLocationCallback = function(measurementData, eventData, doneCallback
 
     // Get the lesion location dialog
     var dialog = $('#lesionLocationRelabelDialog');
+
+    // Show/Hide Convert To NonTarget option in lesionLocationRelabelDialog
+    if (measurementData.toolType === 'bidirectional') {
+        dialog.find("#convertToNonTarget").css("visibility", "visible");
+    } else {
+        dialog.find("#convertToNonTarget").css("visibility", "hidden");
+    }
+
     Template.lesionLocationDialog.dialog = dialog;
 
     // Show the backdrop
@@ -183,7 +191,17 @@ var config = {
     changeLesionLocationCallback: changeLesionLocationCallback
 };
 
-cornerstoneTools.lesion.setConfiguration(config);
+cornerstoneTools.bidirectional.setConfiguration(config);
+
+// Set CR-Tool, UN-Tool, EX-Tool configurations
+// Config for CR Tool
+cornerstoneTools.crTool.setConfiguration(config);
+
+// Config for EX Tool
+cornerstoneTools.exTool.setConfiguration(config);
+
+// Config for UN Tool
+cornerstoneTools.unTool.setConfiguration(config);
 
 Template.lesionLocationDialog.events({
     'change .selectLesionLocation': function(e) {

Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.html

@@ -1,6 +1,6 @@
 <template name="lesionTableTimepointCell">
     {{ #if hasDataAtThisTimepoint }}
-        {{ #if isTarget }}
+        {{ #if isBirectional }}
             <td class="lesionTableTimepointCell targetCell" tabindex="1">{{displayData}}</td>
         {{ else }}
             <td class="lesionTableTimepointCell nonTargetCell" tabindex="1">{{displayData}}</td>

Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.js

@@ -18,7 +18,7 @@ Template.lesionTableTimepointCell.helpers({
 
         var data = lesionData.timepoints[this.timepointId];
 
-        if (lesionData.isTarget === true) {
+        if (lesionData.toolType === 'bidirectional') {
             if (data.shortestDiameter) {
                 return data.longestDiameter + ' x ' + data.shortestDiameter;
             }
@@ -28,9 +28,13 @@ Template.lesionTableTimepointCell.helpers({
             return data.response;
         }
     },
-    isTarget: function() {
+
+    isBidirectional: function() {
         var lesionData = Template.parentData(1);
-        return lesionData.isTarget;
+        if (lesionData.toolType === 'bidirectional') {
+            return true;
+        }
+        return false
     }
 });
 

Packages/lesiontracker/client/components/studyAssociationTable/studyAssociationTable.html

@@ -3,7 +3,7 @@
         <div class="row">
             <div class="col-md-12">
                 <h4>Instructions</h4>
-                <p>Associate the selected studies with timepoints in the clinical trial.</p>
+                <p>Associate the selected studies with timepoints in the clinical trial. Only 1 follow-up time point can be associated at the same time.</p>
                 <p>We have automatically retrieved all studies within 14 days (<strong>{{formatDA earliestDate}}</strong> to <strong>{{formatDA latestDate}}</strong>) of your selected studies, in case you forgot to
                 select a study.</p>
             </div>