Merge pull request #10 from tunglt1810/feature/html-viewer

support display Overlay data
tunglt1810 · Nov 24, 2020 · 001a331 · 001a331
2 parents 9c08eea + 9715af3
commit 001a331
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.1.5] - 2020-10-19
+### Fixed
+- Fixed MetadataProvider for Overlay Plane Module - [@triet12369]
+- Remove checks for non-image series in StudyMetadata -[@triet12369]
+- Replace BulkDataURI with correct url in Overlay series [@triet12369]
+
 ## [1.1.4] - 2020-10-19
 ### Fixed
 - Bind this to cache full callback in StudyPrefetcher - [@triet12369]

diff --git a/dist/index.umd.js b/dist/index.umd.js
diff --git a/dist/index.umd.js.map b/dist/index.umd.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "viewer-core",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Generic business logic for web-based medical imaging applications - edited by Tung LT",
   "author": "OHIF Core Team",
   "editor": "Tung LT",

diff --git a/src/classes/MetadataProvider.js b/src/classes/MetadataProvider.js
@@ -62,9 +62,11 @@ class MetadataProvider {
         Object.assign(instance, naturalizedDataset);
 
         // TODO: comment by TungLT
-        // if (options.server) {
-        // await this._checkBulkDataAndInlineBinaries(instance, options.server);
-        // }
+        // Mod by Triet
+        // uncomment to enable image overlay
+        if (options.server) {
+            await this._checkBulkDataAndInlineBinaries(instance, options.server);
+        }
 
         return instance;
     }
@@ -336,8 +338,7 @@ class MetadataProvider {
 
                 break;
             case WADO_IMAGE_LOADER_TAGS.OVERLAY_PLANE_MODULE:
-                metadata = {};
-
+                const overlays = [];
                 for (
                     let overlayGroup = 0x00;
                     overlayGroup <= 0x1e;
@@ -367,7 +368,7 @@ class MetadataProvider {
                     const ROIStandardDeviationTag = `${groupStr}1303`;
                     const OverlayOrigin = instance[OverlayOriginTag];
 
-                    metadata.overlay = {
+                    const overlay = {
                         rows: instance[OverlayRowsTag],
                         columns: instance[OverlayColumnsTag],
                         type: instance[OverlayType],
@@ -378,10 +379,16 @@ class MetadataProvider {
                         label: instance[OverlayLabelTag],
                         roiArea: instance[ROIAreaTag],
                         roiMean: instance[ROIMeanTag],
-                        roiStandardDeviation: instance[ROIStandardDeviationTag]
+                        roiStandardDeviation: instance[ROIStandardDeviationTag],
                     };
+
+                    overlays.push(overlay);
                 }
 
+                metadata = {
+                    overlays
+                };
+
                 break;
 
             case WADO_IMAGE_LOADER_TAGS.PATIENT_MODULE:

diff --git a/src/classes/metadata/StudyMetadata.js b/src/classes/metadata/StudyMetadata.js
@@ -151,10 +151,12 @@ export class StudyMetadata extends Metadata {
         const stackableInstances = [];
         series.forEachInstance((instance) => {
             // All imaging modalities must have a valid value for SOPClassUID (x00080016) or Rows (x00280010)
-            if (!isImage(instance.getTagValue('SOPClassUID')) && !instance.getTagValue('Rows')) {
-                return;
-            }
-
+            // Mod by Triet
+            // Disable isImage checking to support showing HTML series
+            // if (!isImage(instance.getTagValue('SOPClassUID')) && !instance.getTagValue('Rows')) {
+            //     return;
+            // }
+
             let displaySet;
 
             if (isMultiFrame(instance)) {
@@ -283,7 +285,6 @@ export class StudyMetadata extends Metadata {
 
             displaySets.push(...displaySetsForSeries);
         });
-
         return sortDisplaySetList(displaySets);
     }
 

diff --git a/src/utils/metadataProvider/fetchOverlayData.js b/src/utils/metadataProvider/fetchOverlayData.js
@@ -49,8 +49,9 @@ export default async function fetchOverlayData(instance, server) {
 async function _getOverlayData(tag, server) {
     const {BulkDataURI} = tag;
 
-    let uri = BulkDataURI;
-
+    let uri = BulkDataURI.slice(BulkDataURI.indexOf('/studies'), BulkDataURI.length);
+    // replace BulkDataURI with correct host
+
     // TODO: Workaround for dcm4chee behind SSL-terminating proxy returning
     // incorrect bulk data URIs
     if (server.wadoRoot.indexOf('https') === 0 && !uri.includes('https')) {
@@ -63,7 +64,7 @@ async function _getOverlayData(tag, server) {
     };
     const dicomWeb = new api.DICOMwebClient(config);
     const options = {
-        BulkDataURI: uri
+        BulkDataURI: `${server.wadoRoot}${uri}`
     };
 
     return dicomWeb