Merge pull request #16 from tunglt1810/feature/dicomloaderservice-cus…

…tom-mediatypes Add support for multiple displaySets returned by SopClassHandlerModules
tunglt1810 · Mar 26, 2021 · c4eff60 · c4eff60
2 parents 39a0306 + 957edb3
commit c4eff60
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ 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.2.2] - 2021-03-26
+### Added
+- Add support for multiple displaySets returned by SopClassHandlerModules - [@triet12369]
 ## [1.2.1] - 2021-03-25
 ### Added
 - Add support for custom mediaTypes in dicom loader service - [@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.2.1",
+  "version": "1.2.2",
   "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/metadata/StudyMetadata.js b/src/classes/metadata/StudyMetadata.js
@@ -130,15 +130,23 @@ export class StudyMetadata extends Metadata {
         const sopClassUIDs = getSopClassUIDs(series);
 
         if (sopClassHandlerModules && sopClassHandlerModules.length > 0) {
-            const displaySet = _getDisplaySetFromSopClassModule(sopClassHandlerModules, series, study, sopClassUIDs);
-
-            if (displaySet) {
-                displaySet.sopClassModule = true;
-
-                displaySet.isDerived ? this._addDerivedDisplaySet(displaySet) : displaySets.push(displaySet);
-                displaySet.combinedId = series.combinedId;
+            const sopClassDisplaySets = _getDisplaySetFromSopClassModule(sopClassHandlerModules, series, study, sopClassUIDs);
+            if (sopClassDisplaySets) {
+                for (let i = 0; i < sopClassDisplaySets.length; i++) {
+                    sopClassDisplaySets[i].sopClassModule = true;
+                    sopClassDisplaySets[i].isDerived ? this._addDerivedDisplaySet(sopClassDisplaySets[i]) : displaySets.push(sopClassDisplaySets[i]);
+                    // FIXME: need universal ID generation for displaySets
+                    sopClassDisplaySets[i].combinedId = `${series.combinedId}_${i}`;
+                }
                 return displaySets;
             }
+            // if (displaySet) {
+            //     displaySet.sopClassModule = true;
+
+            //     displaySet.isDerived ? this._addDerivedDisplaySet(displaySet) : displaySets.push(displaySet);
+            //     displaySet.combinedId = series.combinedId;
+            //     return displaySets;
+            // }
         }
 
         // WE NEED A BETTER WAY TO NOTE THAT THIS IS THE DEFAULT BEHAVIOR FOR LOADING
@@ -827,12 +835,21 @@ function _getDisplaySetFromSopClassModule(
         errorInterceptor
     });
 
-    let displaySet = plugin.getDisplaySetFromSeries(series, study, dicomWebClient, headers);
-    if (displaySet && !displaySet.Modality) {
-        const instance = series.getFirstInstance();
-        displaySet.Modality = instance.getTagValue('Modality');
-    }
-    return displaySet;
+    const addModalityToDisplaySet = (displaySet) => {
+        if (displaySet && !displaySet.Modality) {
+            const instance = series.getFirstInstance();
+            displaySet.Modality = instance.getTagValue('Modality');
+        }
+        return displaySet;
+    };
+
+    let displaySets = plugin.getDisplaySetFromSeries(series, study, dicomWebClient, headers);
+    if (displaySets.length) {
+        for (let i = 0; i < displaySets.length; i++) {
+            displaySets[i] = addModalityToDisplaySet(displaySets[i]);
+        }
+    } else if (displaySets) displaySets = [addModalityToDisplaySet(displaySets)];
+    return displaySets;
 }
 
 /**