[ADD] dicom loader

examples/volume-viewer-demo.html

@@ -173,6 +173,7 @@
           <option value="functional_minc">MINC Functional</option>
           <option value="NIfTI-1">NIfTI-1</option>
           <option value="MGH">FreeSurfer/MGH</option>
+          <option value="DICOM">DICOM</option>
           <option value="file">Load your own volume!</option>
         </select>
         <span class="control-heading">Panel size:</span>
@@ -212,6 +213,23 @@ <h3><u>For MGH file:</u></h3>
             <span class="button">Load</span>
           </div>
 
+          <h3><u>For DICOM folder:</u></h3>
+          <div>
+            <span class="control-heading">DICOM folder: </span>
+            <input type="file" webkitdirectory directory multiple name="dicom-folder" id="dicom-folder">
+          </div>
+          <div id="volume-folder-dicom-submit">
+            <span class="button">Load</span>
+          </div>
+
+          <h3><u>For DICOM file:</u></h3>
+          <div>
+            <span class="control-heading">DICOM file: </span>
+            <input type="file" name="dicom-file" id="dicom-file">
+          </div>
+          <div id="volume-file-dicom-submit">
+            <span class="button">Load</span>
+          </div>
         </div>
 
         <div class="instructions">Shift-click to drag. Hold ctrl to measure distance.</div>
@@ -229,6 +247,7 @@ <h3><u>For MGH file:</u></h3>
   <script src="js/brainbrowser/lib/utils.js"></script>
   <script src="js/brainbrowser/lib/events.js"></script>
   <script src="js/brainbrowser/lib/loader.js"></script>
+  <script src="js/brainbrowser/lib/daikon.js"></script>
   <script src="js/brainbrowser/lib/color-map.js"></script>
   <script src="js/brainbrowser/volume-viewer.js"></script>
   <script src="js/brainbrowser/volume-viewer/lib/display.js"></script>
@@ -242,6 +261,7 @@ <h3><u>For MGH file:</u></h3>
   <script src="js/brainbrowser/volume-viewer/volume-loaders/mgh.js"></script>
   <script src="js/brainbrowser/volume-viewer/volume-loaders/hdf5.js"></script>
   <script src="js/brainbrowser/volume-viewer/volume-loaders/netcdf.js"></script>
+  <script src="js/brainbrowser/volume-viewer/volume-loaders/dicom.js"></script>
   <script src="volume-viewer-demo.config.js"></script>
   <script src="volume-viewer-demo.js"></script>
 </body>

examples/volume-viewer-demo.js

@@ -23,6 +23,10 @@
 /*
 * Author: Tarek Sherif <tsherif@gmail.com> (http://tareksherif.ca/)
 * Author: Nicolas Kassis
+*
+* Dicom support added by:
+*   Author: Natacha Beck
+* Dicom example files came from Papaya (https://github.com/rii-mango/Papaya/tree/master/tests/data/dicom)
 */
 
 // This script is meant to be a demonstration of how to
@@ -150,6 +154,34 @@ $(function() {
             }
           }
         });
+      } else if ($(this).val() === "DICOM"){
+        viewer.clearVolumes();
+        viewer.loadVolumes({
+          volumes: [
+            {
+              type: "dicom",
+              dicom_url: "models/dicom1/",
+              template: {
+                element_id: "volume-ui-template",
+                viewer_insert_class: "volume-viewer-display"
+              }
+            },
+            {
+              type: 'dicom',
+              dicom_url: "models/dicom2/",
+              template: {
+                element_id: "volume-ui-template",
+                viewer_insert_class: "volume-viewer-display"
+              }
+            }
+          ],
+          overlay: {
+            template: {
+              element_id: "overlay-ui-template",
+              viewer_insert_class: "overlay-viewer-display"
+            }
+          }
+        });
       } else {
         $("#volume-file").show();
         viewer.clearVolumes();
@@ -299,6 +331,31 @@ $(function() {
       });
     });
 
+    function loadDicomVolume(fileInput) {
+      viewer.clearVolumes();
+      viewer.loadVolume({
+        type: "dicom",
+        dicom_file: fileInput.files,
+        template: {
+          element_id: "volume-ui-template",
+          viewer_insert_class: "volume-viewer-display"
+        }
+      }, function() {
+        $(".slice-display").css("display", "inline");
+        $(".volume-controls").css("width", "auto");
+      });
+    };
+
+    $("#volume-folder-dicom-submit").click(function() {
+      var folderInput = document.getElementById("dicom-folder");
+      loadDicomVolume(folderInput);
+    });
+
+    $("#volume-file-dicom-submit").click(function() {
+      var fileInput = document.getElementById("dicom-file");
+      loadDicomVolume(fileInput);
+    });
+
     $(document).keypress(function(e) {
       if (e.keyCode === 114) {
         // Reset displays if user presses 'r' key.

package.json

@@ -3,8 +3,8 @@
   "version": "2.5.5",
   "license": "GNU Affero GPL 3.0",
   "devDependencies": {
-    "bower": "~1.7.9",
-    "grunt": "~0.4.1",
+    "bower": "~1.8.8",
+    "grunt": "^1.3.0",
     "grunt-contrib-jshint": "~0.6.4",
     "grunt-contrib-uglify": "~0.2.4",
     "grunt-contrib-concat": "~0.3.0",