Mercurial > hg > orthanc-dicomweb

changeset 5:3ec1e035c84f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reorganization
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 14 Mar 2015 16:43:38 +0100
parents a373f73e30b8
children e0ec2d417534
files Samples/JavaScript/index.html Samples/JavaScript/orthanc.js Samples/JavaScript/qido-rs.js Samples/JavaScript/stow-rs.js
diffstat 4 files changed, 166 insertions(+), 148 deletions(-) [+]
line wrap: on
line diff
--- a/Samples/JavaScript/index.html	Sat Mar 14 16:39:00 2015 +0100
+++ b/Samples/JavaScript/index.html	Sat Mar 14 16:43:38 2015 +0100
@@ -50,6 +50,7 @@
     </ul>
 
     <script src="jquery-1.11.2.min.js" type="text/javascript"></script>
-    <script src="orthanc.js" type="text/javascript"></script>
+    <script src="qido-rs.js" type="text/javascript"></script>
+    <script src="stow-rs.js" type="text/javascript"></script>
   </body>
 </html>
--- a/Samples/JavaScript/orthanc.js	Sat Mar 14 16:39:00 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-/**
- * Orthanc - A Lightweight, RESTful DICOM Store
- * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
- * Department, University Hospital of Liege, Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- **/
-
-
-
-
-
-
-// http://www.artandlogic.com/blog/2013/11/jquery-ajax-blobs-and-array-buffers/
-
-
-
-
-var BOUNDARY = 'BOUNDARY_123456789';
-
-
-function GetTag(answer, tag)
-{
-  if (!(tag in answer) ||
-      !("Value" in answer[tag]) ||
-      answer[tag].length == 0) {
-    return '';
-  } else {
-    return answer[tag]["Value"][0];
-  }
-}
-
-
-function StringToArrayBuffer(str) 
-{
-  // http://updates.html5rocks.com/2012/06/How-to-convert-ArrayBuffer-to-and-from-String
-  var bufView = new Uint8Array(str.length);
-
-  for (var i=0, strLen=str.length; i < strLen; i++) {
-    bufView[i] = str.charCodeAt(i);
-  }
-
-  return bufView;
-}
-
-function ConstructMultipart(body, contentType) 
-{
-  var header = '--' + BOUNDARY + '\nContent-Type: ' + contentType + '\n\n';
-  var trailer = '\n--' + BOUNDARY + '--\n';
-  
-  header = StringToArrayBuffer(header);
-  trailer = StringToArrayBuffer(trailer);
-
-  // Concatenate the header, the body and the trailer
-  // http://stackoverflow.com/a/14071518/881731
-  var b = new Uint8Array(header.byteLength + body.byteLength + trailer.byteLength);
-  b.set(header);
-  b.set(new Uint8Array(body), header.byteLength);
-  b.set(trailer, header.byteLength + body.byteLength);
-
-  return b;
-}
-
-
-
-$(document).ready(function() {
-  // STOW-RS to upload one DICOM file
-  $('#stow').submit(function() {
-
-    var fileInput = document.getElementById('stow-file');
-    var file = fileInput.files[0];
-    reader = new FileReader();
-    reader.onload = function() {
-      $.ajax({
-        type: 'POST',
-        headers: {
-          'Accept' : 'application/json',
-          'Content-type' : 'multipart/related; type=application/dicom; boundary=' + BOUNDARY,
-        },
-        url: '../stow-rs/studies',
-        data: ConstructMultipart(reader.result, 'application/dicom'),
-        processData: false, // Very important!
-        dataType: 'json',
-        success: function(resp) {
-          alert('Upload was a success!');
-        },
-        error: function() {
-          alert('Cannot process this query');
-        }
-      });
-    };
-
-    reader.readAsArrayBuffer(file);
-
-    // Prevent default action
-    return false;
-  });
-
-
-  // QIDO-RS to search for series
-  $('#qido-series').submit(function() {
-    var data = {};
-    $('input[name]', this).each(function() {
-      data[$(this).attr('name')] = $(this).val();
-    });
-
-    $.ajax({
-      headers: {
-        'Accept' : 'application/json'
-      },
-      data: data,
-      cache: true,  // If set to false, the "_" GET argument is added, resulting in a bad QIDO-RS request
-      dataType: 'json',
-      url: '../qido-rs/series',
-      success: function(answer) {
-        $('#qido-series-results').empty();
-        for (var i = 0; i < answer.length; i++) {
-          var patientId = GetTag(answer[i], '00100020');
-          var patientName = GetTag(answer[i], '00100010');
-          var studyDescription = GetTag(answer[i], '00081030');
-          var seriesDescription = GetTag(answer[i], '0008103E');
-          $('#qido-series-results').append(
-            '<li>' + patientId + ' - ' + patientName + ' - ' +
-              studyDescription + ' - ' + seriesDescription +
-              '</li>');
-        }
-      },
-      error: function() {
-        alert('Cannot process this query');
-      }
-    });
-
-    // Prevent default action
-    return false;
-  });
-});
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Samples/JavaScript/qido-rs.js	Sat Mar 14 16:43:38 2015 +0100
@@ -0,0 +1,70 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+function GetTag(answer, tag)
+{
+  if (!(tag in answer) ||
+      !("Value" in answer[tag]) ||
+      answer[tag].length == 0) {
+    return '';
+  } else {
+    return answer[tag]["Value"][0];
+  }
+}
+
+
+$(document).ready(function() {
+  // QIDO-RS to search for series
+  $('#qido-series').submit(function() {
+    var data = {};
+    $('input[name]', this).each(function() {
+      data[$(this).attr('name')] = $(this).val();
+    });
+
+    $.ajax({
+      headers: {
+        'Accept' : 'application/json'
+      },
+      data: data,
+      cache: true,  // If set to false, the "_" GET argument is added, resulting in a bad QIDO-RS request
+      dataType: 'json',
+      url: '../qido-rs/series',
+      success: function(answer) {
+        $('#qido-series-results').empty();
+        for (var i = 0; i < answer.length; i++) {
+          var patientId = GetTag(answer[i], '00100020');
+          var patientName = GetTag(answer[i], '00100010');
+          var studyDescription = GetTag(answer[i], '00081030');
+          var seriesDescription = GetTag(answer[i], '0008103E');
+          $('#qido-series-results').append(
+            '<li>' + patientId + ' - ' + patientName + ' - ' +
+              studyDescription + ' - ' + seriesDescription +
+              '</li>');
+        }
+      },
+      error: function() {
+        alert('Cannot process this query');
+      }
+    });
+
+    // Prevent default action
+    return false;
+  });
+});
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Samples/JavaScript/stow-rs.js	Sat Mar 14 16:43:38 2015 +0100
@@ -0,0 +1,94 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+
+// http://www.artandlogic.com/blog/2013/11/jquery-ajax-blobs-and-array-buffers/
+
+
+
+
+var BOUNDARY = 'BOUNDARY_123456789';
+
+
+function StringToArrayBuffer(str) 
+{
+  // http://updates.html5rocks.com/2012/06/How-to-convert-ArrayBuffer-to-and-from-String
+  var bufView = new Uint8Array(str.length);
+
+  for (var i=0, strLen=str.length; i < strLen; i++) {
+    bufView[i] = str.charCodeAt(i);
+  }
+
+  return bufView;
+}
+
+
+function ConstructMultipart(body, contentType) 
+{
+  var header = '--' + BOUNDARY + '\nContent-Type: ' + contentType + '\n\n';
+  var trailer = '\n--' + BOUNDARY + '--\n';
+  
+  header = StringToArrayBuffer(header);
+  trailer = StringToArrayBuffer(trailer);
+
+  // Concatenate the header, the body and the trailer
+  // http://stackoverflow.com/a/14071518/881731
+  var b = new Uint8Array(header.byteLength + body.byteLength + trailer.byteLength);
+  b.set(header);
+  b.set(new Uint8Array(body), header.byteLength);
+  b.set(trailer, header.byteLength + body.byteLength);
+
+  return b;
+}
+
+
+$(document).ready(function() {
+  // STOW-RS to upload one DICOM file
+  $('#stow').submit(function() {
+
+    var fileInput = document.getElementById('stow-file');
+    var file = fileInput.files[0];
+    reader = new FileReader();
+    reader.onload = function() {
+      $.ajax({
+        type: 'POST',
+        headers: {
+          'Accept' : 'application/json',
+          'Content-type' : 'multipart/related; type=application/dicom; boundary=' + BOUNDARY,
+        },
+        url: '../stow-rs/studies',
+        data: ConstructMultipart(reader.result, 'application/dicom'),
+        processData: false, // Very important!
+        dataType: 'json',
+        success: function(resp) {
+          alert('Upload was a success!');
+        },
+        error: function() {
+          alert('Cannot process this query');
+        }
+      });
+    };
+
+    reader.readAsArrayBuffer(file);
+
+    // Prevent default action
+    return false;
+  });
+});