Measurements and Timepoint interaction in Lesion Table and tools

Packages/lesiontracker/components/lesionDialog/lesionDialog.js

@@ -1,15 +1,15 @@
 Template.lesionDialog.onRendered(function () {
-    // Show Lesion Dialog
-    $(document).on("ShowLesionDialog", function (e, eventData, activeLesionMeasurementData) {
-
-        var locationUID = measurementManagerDAL.isLesionNumberAdded(activeLesionMeasurementData.lesionNumber);
-
-        if(locationUID != null) {
-
-            activeLesionMeasurementData.locationUID = locationUID;
-            measurementManagerDAL.updateTimepointData(activeLesionMeasurementData);
-        }else{
+    // This event determines whether or not to show the lesion dialog
+    // If there already exists a lesion with this specific lesion number,
+    // related to the chosen location.
 
+    $(document).on("ShowLesionDialog", function (e, eventData, lesionData) {
+        var locationUID = measurementManagerDAL.isLesionNumberAdded(lesionData.lesionNumber);
+        
+        if (locationUID) {
+            lesionData.locationUID = locationUID;
+            measurementManagerDAL.updateTimepointData(lesionData);
+        } else {
             // Show Dialog
             var dialogPointsOnPage = eventData.currentPoints.page;
             $("#modal-dialog-container").css({
@@ -19,7 +19,6 @@ Template.lesionDialog.onRendered(function () {
 
             $("#lesionDialog").modal("show");
         }
-
     });
 });
 

Packages/lesiontracker/components/lesionLocationDialog/lesionLocationDialog.js

@@ -1,22 +1,36 @@
 var lastAddedLesionData;
 
 //fill selectLesionLocation element
-var lesionLocationsArray = [
-    {location:"Brain Brainstem",hasDescription:false, description:""},
-    {location:"Brain Cerebellum Left",hasDescription:false, description:""},
-    {location:"Brain Cerebrum Left",hasDescription:false, description:""},
-    {location:"Brain Cerebrum Right",hasDescription:false, description:""},
-    {location:"Brain Multiple Sites",hasDescription:false, description:""}
-];
+var lesionLocationsArray = [{
+    location: "Brain Brainstem",
+    hasDescription: false,
+    description: ""
+}, {
+    location: "Brain Cerebellum Left",
+    hasDescription: false,
+    description: ""
+}, {
+    location: "Brain Cerebrum Left",
+    hasDescription: false,
+    description: ""
+}, {
+    location: "Brain Cerebrum Right",
+    hasDescription: false,
+    description: ""
+}, {
+    location: "Brain Multiple Sites",
+    hasDescription: false,
+    description: ""
+}];
 
-Template.lesionLocationDialog.onRendered(function () {
+Template.lesionLocationDialog.onRendered(function() {
     console.log(this.data);
 
-    function fillSelectLesionLocation () {
+    function fillSelectLesionLocation() {
         var el = $("#selectLesionLocation");
         el.find('option:not(:first)').remove();
         $.each(lesionLocationsArray, function(key, value) {
-            el.append("<option value='" + key+ "'>" + value.location + "</option>");
+            el.append("<option value='" + key + "'>" + value.location + "</option>");
         });
     }
 
@@ -25,7 +39,7 @@ Template.lesionLocationDialog.onRendered(function () {
 
     // Observe Measurements Collection Changes
     Measurements.find().observe({
-        added: function (lesionData) {
+        added: function(lesionData) {
             lastAddedLesionData = lesionData;
         },
         changed: function(lesionData) {
@@ -35,44 +49,44 @@ Template.lesionLocationDialog.onRendered(function () {
 });
 
 Template.lesionLocationDialog.events({
-    'click button#btnCloseLesionPopup': function (e) {
+    'click button#btnCloseLesionPopup': function(e) {
         $("#lesionDialog").modal("hide");
         // TODO: Remove lastAddedLesionData from canvas
         // TODO: Remove lastAddedLesionData from collection
-
     },
 
-    'change select#selectLesionLocation': function (e) {
+    'change select#selectLesionLocation': function(e) {
         var el = $(e.target);
         var selectedLocationIndex = el.val();
-        if(selectedLocationIndex !== "-1"){
-
-            // Get selected location data
-            var locationObj = lesionLocationsArray[selectedLocationIndex];
-
-            // Gets active lesion measurement data that is latest added data
-            var activeLesionMeasurementData = Session.get("lesionMeasurementData");
-
-            // Adds location data to trialPatientLocations array and returns locationUID
-            var locationUID = measurementManagerDAL.addNewLocation(locationObj);
-
-            // Linkk locationUID with activeLesionMeasurementData
-            activeLesionMeasurementData.locationUID = locationUID;
-
-            // Adds lesion data to timepoints array
-            measurementManagerDAL.addLesionData(activeLesionMeasurementData);
-
-            // Trigger location selected event
-            $(document).trigger("lesionLocationSelected",locationObj);
-
-            // Set activeModule parameters in index.html
-            $("#lesionDialog").modal("hide");
-
-            // Select first option
-            el.val($("#selectLesionLocation option:first").val());
-
-            // Set lesion location selected session to prevent open
-            Session.set("lesionLocationSelected", true);
+        if (selectedLocationIndex < 0) {
+            return;
         }
+
+        // Get selected location data
+        var locationObj = lesionLocationsArray[selectedLocationIndex];
+
+        // Gets active lesion measurement data that is latest added data
+        var activeLesionMeasurementData = Session.get("lesionMeasurementData");
+
+        // Adds location data to trialPatientLocations array and returns locationUID
+        var locationUID = measurementManagerDAL.addNewLocation(locationObj);
+
+        // Linkk locationUID with activeLesionMeasurementData
+        activeLesionMeasurementData.locationUID = locationUID;
+
+        // Adds lesion data to timepoints array
+        measurementManagerDAL.addLesionData(activeLesionMeasurementData);
+
+        // Trigger location selected event
+        $(document).trigger("lesionLocationSelected", locationObj);
+
+        // Set activeModule parameters in index.html
+        $("#lesionDialog").modal("hide");
+
+        // Select first option
+        el.val($("#selectLesionLocation option:first").val());
+
+        // Set lesion location selected session to prevent open
+        Session.set("lesionLocationSelected", true);
     }
 });

Packages/lesiontracker/components/lesionTable/lesionTable.html

@@ -7,21 +7,17 @@
                     <th id="thLocation">Location</th>
                     <th id="thTarget">Target</th>
                     <!--Each time point name as a column-->
-                    {{ #each tabTimepoints }}
-                        {{ #each timepoints }}
-                             {{ >lesionTableTimepointHeader }}
-                        {{ /each }}
+                    {{ #each timepoints }}
+                         {{ >lesionTableTimepointHeader }}
                     {{ /each }}
                     <th id="thSpacer"> </th>
                 </tr>
             </thead>
             <tbody>
+                <!--Each measurement as row-->
                 {{ #each measurement }}
                     {{ >lesionTableRow }}
                 {{ /each }}
-
-                <!--Each measurement as row-->
-                <!--Each time point as a column-->
             </tbody>
         </table>
     </div>

Packages/lesiontracker/components/lesionTable/lesionTable.js

@@ -1,103 +1,78 @@
 Measurements = new Meteor.Collection(null);
-TabsTimepoints = new Meteor.Collection(null);
+Timepoints = new Meteor.Collection(null);
+
+// Activate selected lesions when lesion table row is clicked
+function updateLesions(e) {
+    // lesionNumber of measurement = id of row
+    var lesionNumber = parseInt($(e.currentTarget).attr("id"), 10);
+
+    // Find data for specific lesion
+    var measurementData = Measurements.find({
+        lesionNumber: lesionNumber
+    }).fetch()[0];
+
+    var timepoints = measurementData.timepoints;
+
+    $(".imageViewerViewport").each(function(index, element) {
+        // Get the timepointID related to the image viewer viewport
+        // from the DOM itself. This will be changed later when a
+        // real association between viewports and timepoints is created.
+        var timepointID = $(element).data('timepointID');
+        var timepointObject = timepoints[timepointID];
+
+        // Defines event data
+        var eventData = {
+            enabledElement: cornerstone.getEnabledElement(element),
+            lesionData: {
+                lesionNumber: lesionNumber,
+                imageId: timepointObject.imageId
+            },
+            type: "active"
+        };
+
+        if (timepointObject.longestDiameter === "") {
+            eventData.type = "inactive";
+        }
+
+        $(element).trigger("LesionToolModified", eventData);
+    });
+}
+
+Template.lesionTable.onRendered(function() {
+    // For the moment we will associate the timepoint
+    // with the viewport element by storing the timepointID
+    // inside the element's DOM data. This is temporary.
+    $(".imageViewerViewport").each(function(index, element) {
+        var timepointID = uuid.v4();
+
+        var timepointName = "Baseline";
+        if (index > 0) {
+            timepointName = "Current"; //"Follow Up "+i;
+        }
+
+
+        // FUTURE = On load series data into viewport, create a new timepoint
+        // unless it already exists
+        Timepoints.insert({
+            timepointID: timepointID,
+            timepointName: timepointName
+        });
+
+        $(element).data('timepointID', timepointID);
+    });
+});
 
 Template.lesionTable.helpers({
     'measurement': function() {
-        var contentId = this.contentId;
-        return Measurements.find({contentId: contentId});
+        return Measurements.find();
     },
-    'tabTimepoints': function() {
-        var contentId = this.contentId;
-        return TabsTimepoints.find({contentId: contentId});
-    },
-    'lesionData': function() {
-        var array = [];
-        var lesions = this.lesionData;
-        Object.keys(lesions).forEach(function(key) {
-            array.push(lesions[key]);
-        });
-        return array;
+    'timepoints': function() {
+        return Timepoints.find();
     }
 });
 
-Template.lesionTable.onRendered(function() {
-
-    var contentId = this.data.contentId;
-    var viewportColumns = ViewerData[contentId].viewportColumns;
-    var viewportRows = ViewerData[contentId].viewportRows;
-
-    var totalViewports = viewportColumns * viewportRows;
-    
-    var timepointsArray = [];
-    for(var i=0; i< totalViewports;  i++) {
-        var timepointID = contentId.toString() + i.toString();
-        var timepointName = "Baseline";
-        if (i > 0) {
-            timepointName = "Current"; //"Follow Up "+i;
-        }
-        var timepointObject = {timepointID: timepointID, timepointName: timepointName};
-        timepointsArray.push(timepointObject);
-
-    }
-
-    // Prevent duplicate data when onRendered is called
-    var tabTimepoint = TabsTimepoints.find({contentId: contentId}).fetch();
-    if (tabTimepoint !== undefined && tabTimepoint.length > 0) {
-        // Update timepoints
-        TabsTimepoints.update(
-            { contentId: contentId},
-            {
-                $set: {
-                    timepoints: timepointsArray
-                }
-            }, {multi: true}
-        );
-    } else {
-
-        // Insert new timepoints array
-        TabsTimepoints.insert({contentId: contentId, timepoints: timepointsArray});
-    }
-
-});
-
-// Activate selected lesions when lesion table row is clicked
-function updateLesions (e) {
-
-    // lesionNumber of measurement = id of row
-    var lesionNumber = parseInt($(e.currentTarget).attr("id"));
-    var contentId = Session.get("activeContentId");
-    var measurementData = Measurements.find({contentId:contentId,"lesionData.lesionNumber":lesionNumber}).fetch();
-    var timepoints = measurementData[0].lesionData.timepoints;
-    var imageViewportElements = $("#"+contentId).find(".imageViewerViewport");
-
-    for( var i=0; i< imageViewportElements.length; i++) {
-        var timepointObject = timepoints[i];
-        var timepointKey = Object.keys(timepointObject);
-        var imageId = timepointObject[timepointKey].imageId;
-        var longestDiameter = timepointObject[timepointKey].longestDiameter;
-        var imageViewportElement = imageViewportElements[i];
-        var eventObject = {};
-
-        if(longestDiameter != "") {
-            eventObject = {
-                enabledElement: cornerstone.getEnabledElement(imageViewportElement),
-                lesionData: {lesionNumber: lesionNumber, imageId: imageId},
-                type: "active"
-            };
-        } else {
-            eventObject = {
-                enabledElement: cornerstone.getEnabledElement(imageViewportElement),
-                lesionData: {lesionNumber: lesionNumber, imageId: imageId},
-                type: "inactive"
-            };
-        }
-        $(imageViewportElement).trigger("LesionToolModified", eventObject);
-    }
-}
-
 Template.lesionTable.events({
     'click table#tblLesion tbody tr': function(e) {
         updateLesions(e);
     }
-});
-
+});

Packages/lesiontracker/components/lesionTableRow/lesionTableRow.html

@@ -1,11 +1,11 @@
 <template name="lesionTableRow">
-    <tr id="{{lesionData.lesionNumber}}" class="lesionTableRow">
-        <td class='lesionNumber'>{{lesionData.lesionNumber}}</td>
-        <td class='location'>{{lesionData.location}}</td>
-        <td class='target'>{{#if lesionData.isTarget}} Y {{else}} N {{/if}}</td>
+    <tr id="{{lesionNumber}}" class="lesionTableRow">
+        <td class='lesionNumber'>{{lesionNumber}}</td>
+        <td class='location'>{{location}}</td>
+        <td class='target'>{{#if isTarget}} Y {{else}} N {{/if}}</td>
         <!--Each time point as a column-->
         {{# each timepoints }}
-            {{> lesionTableTimepointCell }}
+            {{> lesionTableTimepointCell}}
         {{/ each }}
     </tr>
 </template>

Packages/lesiontracker/components/lesionTableRow/lesionTableRow.js

@@ -1,5 +1,5 @@
 Template.lesionTableRow.helpers({
     'timepoints': function() {
-        return this.lesionData.timepoints;
+        return Timepoints.find();
     }
 });

Packages/lesiontracker/components/lesionTableTimepointCell/lesionTableTimepointCell.js

@@ -1,6 +1,7 @@
 Template.lesionTableTimepointCell.helpers({
     'longestDiameter': function() {
-        var longestDiameter = this[Object.keys(this)[0]].longestDiameter;
-        return longestDiameter;
+        // Search Measurements by lesion and timepoint
+        var lesionData = Template.parentData(1);
+        return lesionData.timepoints[this.timepointID].longestDiameter;
     }
 });

Packages/lesiontracker/components/lesionTableTimepointHeader/lesionTableTimepointHeader.js

@@ -1,5 +0,0 @@
-Template.lesionTableTimepointHeader.helpers({
-    'timepoints': function (){
-        return this.timepoints;
-    }
-});