fix: can change the number of loaded images

akeshavan · Jul 2, 2018 · 81fcd30 · 81fcd30
1 parent 741dd72
commit 81fcd30
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 8 deletions.
diff --git a/imports/ui/qc.js b/imports/ui/qc.js
@@ -67,19 +67,20 @@ var addPapaya = function(data, entry_type, template_instance, callback){
     //if (papayaContainers.length == 0){
     //Meteor.call("get_generator", entry_type, function(err, res){
     var res = _.find(Meteor.settings.public.modules, function(x){return x.entry_type == entry_type})
+    var nOverlays = res['num_overlays'] || 2;
         var params = {}
         params["images"] = []
         var loadableImages = []
         Session.set("loadableImages", loadableImages)
-        for (i=0;i<data.check_masks.length;i++){ //never load more than 2 images
+        for (i=0;i<data.check_masks.length;i++){ //never load more than nOverlays images
             var url = res["staticURL"]+data["check_masks"][i]
             console.log("url is", url)
-            if (i>=2){
+            if (i>=nOverlays){
                 loadableImages.push(url)
-
             }
             else{
                 params["images"].push(url)
+                console.log('params of images is', params['images'])
             }
 
         }
@@ -102,7 +103,7 @@ var addPapaya = function(data, entry_type, template_instance, callback){
             var cmap = res.colormaps
             if (cmap){
                 var idxs = Object.keys(cmap)
-                for (i=0;i<idxs.length;i++){
+                for (i=0;i<params['images'].length;i++){
                     var idx = idxs[i]
                     console.log("index is", idx)
                     var opts = cmap[idx]
@@ -670,7 +671,7 @@ Template.view_images.events({
           update["confidence"] = parseInt($("#conf")[0].value)
         } catch (e) {
 
-        } 
+        }
 
         vote_entry = {quality_check: update.quality_check,
                       checkedBy: update.checkedBy,

diff --git a/settings.dev.json b/settings.dev.json
@@ -5,6 +5,48 @@
     "use_custom": true,
     "needs_consent": true,
     "modules": [
+      {
+        "name": "mindboggle",
+        "entry_type": "mindboggle",
+        "fields": [
+          {
+            "function_name": "get_qc_viewer",
+            "id": "name",
+            "name": "Image File"
+          },
+          {
+            "function_name": "get_qc_ave_field",
+            "id": "average_vote",
+            "name": "QC vote"
+          },
+          {
+            "function_name": null,
+            "id": "num_votes",
+            "name": "# votes"
+          },
+          {
+            "function_name": null,
+            "id": "quality_check.notes_QC",
+            "name": "Notes"
+          }
+        ],
+        "metric_names": [],
+        "graph_type": null,
+        "staticURL": "",
+        "usePeerJS": false,
+        "logPainter": false,
+        "logContours": true,
+        "logPoints": true,
+        "colormaps": {
+          "1": {
+            "name": "custom.Freesurfer",
+            "alpha": 0.5,
+            "min": 0,
+            "max": 2000
+          }
+        },
+        "qc_options": {"pass": 1, "fail": 1, "needs_edits": 0, "edited": 0, "assignTo": 0, "notes": 1, "confidence": 0}
+      },
       {
         "name": "T1w",
         "entry_type": "T1w",
@@ -31,13 +73,14 @@
           }
         ],
         "metric_names": ["Age","EHQ_Total","Sex","average_vote","num_votes"],
+        "num_overlays": 3,
         "graph_type": "histogram",
         "staticURL": "https://dxugxjm290185.cloudfront.net/hbn/",
         "usePeerJS": false,
         "logPainter": false,
-        "logContours": false,
+        "logContours": true,
         "logPoints": true,
-        "qc_options": {"pass": 1, "fail": 1, "needs_edits": 0, "edited": 0, "assignTo": 0, "notes": 1, "confidence": 1}
+        "qc_options": {"pass": 1, "fail": 1, "needs_edits": 0, "edited": 0, "assignTo": 0, "notes": 1, "confidence": 0}
       },
       {
         "name": "T2w",
@@ -64,7 +107,8 @@
             "name": "Notes"
           }
         ],
-        "graph_type": null,
+        "graph_type": "histogram",
+        "metric_names": ["average_vote","num_votes"],
         "staticURL": "https://dxugxjm290185.cloudfront.net/hbn/",
         "usePeerJS": false,
         "logPainter": false,

diff --git a/settings_freesurfer.json b/settings_freesurfer.json
@@ -45,6 +45,7 @@
           }
         ],
         "graph_type": "histogram",
+        "num_overlays": 1,
         "colormaps": {
           "0":{"name": "Grayscale",
               "alpha": 1,