Merge pull request #47 from HsuTzu26/master

Add WSI viewer config and fit its server URL
cylab-tw · Jan 11, 2025 · 42b4529 · 42b4529
2 parents 665c62e + 7711e16
commit 42b4529
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/search/data/config.json b/search/data/config.json
@@ -14,7 +14,8 @@
             "enableRetrieveURI": true,
             "includefield": false,
             "target": "../../bluelight/html/start.html",
-            "target-SM": "../../bluelight/html/start.html",
+            "target-SM": "https://ditto-wsiviewer.dicom.tw/viewer",
+            "server-SM": "RACCOONORG",
             "token": {
                 "apikey":"",
                 "bearer":""
@@ -34,7 +35,8 @@
             "enableRetrieveURI": true,
             "includefield": false,
             "target": "../../bluelight/html/start.html",
-            "target-SM": ".../../bluelight/html/start.html",
+            "target-SM": "https://ditto-wsiviewer.dicom.tw/viewer",
+            "server-SM": "RACCOONORG",
             "token": {
                 "apikey":"",
                 "bearer":""

diff --git a/search/scripts/onload.js b/search/scripts/onload.js
@@ -255,7 +255,8 @@ function createTable() {
       if (!this.Modality.includes("SM"))
         cell.alt = ConfigLog.QIDO.target + '?' + "StudyInstanceUID=" + this.Study.StudyUID;
       else
-        cell.alt = ConfigLog.QIDO.targetSM + '?' + "StudyInstanceUID=" + this.Study.StudyUID;
+        // cell.alt = ConfigLog.QIDO.targetSM + '?' + "StudyInstanceUID=" + this.Study.StudyUID;
+        cell.alt = ConfigLog.QIDO.targetSM + "?server=" + ConfigLog.QIDO.serverSM + '&' + "studyUid=" + this.Study.StudyUID;
 
       cell.onclick = function () { window.open(this.alt, '_blank'); }
       var cell = row1.insertCell(1); cell.innerHTML = "StudyInstanceUID=" + this.Study.StudyUID;

diff --git a/search/scripts/readsome.js b/search/scripts/readsome.js
@@ -141,6 +141,7 @@ function readConfigJson(url, onLosdSerch) {
     tempConfig.includefield = tempDicomResponse["includefield"];
     tempConfig.target = tempDicomResponse["target"];
     tempConfig.targetSM = tempDicomResponse["target-SM"];
+    tempConfig.serverSM = tempDicomResponse["server-SM"];
     tempConfig.enableRetrieveURI = tempDicomResponse["enableRetrieveURI"];
     tempConfig.token = tempDicomResponse["token"];
 
@@ -156,6 +157,7 @@ function readConfigJson(url, onLosdSerch) {
     tempConfig.includefield = tempDicomResponse["includefield"];
     tempConfig.target = tempDicomResponse["target"];
     tempConfig.targetSM = tempDicomResponse["target-SM"];
+    tempConfig.serverSM = tempDicomResponse["server-SM"];
     tempConfig.enableRetrieveURI = tempDicomResponse["enableRetrieveURI"];
     tempConfig.token = tempDicomResponse["token"];
 
@@ -171,6 +173,7 @@ function readConfigJson(url, onLosdSerch) {
     tempConfig.includefield = tempDicomResponse["includefield"];
     tempConfig.target = tempDicomResponse["target"];
     tempConfig.targetSM = tempDicomResponse["target-SM"];
+    tempConfig.serverSM = tempDicomResponse["server-SM"];
     tempConfig.enableRetrieveURI = tempDicomResponse["enableRetrieveURI"];
     tempConfig.token = tempDicomResponse["token"];