WIP

extensions/default/src/DicomWebDataSource/index.js

@@ -8,9 +8,9 @@ import {
 } from './qido.js';
 import { dicomMetadataStore, IWebApiDataSource, utils } from '@ohif/core';
 import * as dcmjs from 'dcmjs';
-import exampleInstances from './exampleInstances.js';
-//import { retrieveStudyMetadata } from './retrieveStudyMetadata.js';
+import { retrieveStudyMetadata } from './retrieveStudyMetadata.js';
 
+const { naturalizeDataset } = dcmjs.data.DicomMetaDictionary;
 const { urlUtil } = utils;
 
 /**
@@ -96,22 +96,40 @@ function createDicomWebApi(dicomWebConfig) {
             );
           }
 
-          // const promises = StudyInstanceUIDs.map(StudyInstanceUID =>
-          //   retrieveStudyMetadata(
-          //     wadoDicomWebClient,
-          //     StudyInstanceUID,
-          //     enableStudyLazyLoad
-          //   )
-          // );
+          const storeInstances = instances => {
+            const naturalizedInstances = instances.map(naturalizeDataset);
+
+            dicomMetadataStore.addInstances(naturalizedInstances);
+            callback(naturalizedInstances);
+          };
+
+          const studyPromises = StudyInstanceUIDs.map(StudyInstanceUID =>
+            retrieveStudyMetadata(
+              wadoDicomWebClient,
+              StudyInstanceUID,
+              enableStudyLazyLoad
+            )
+          );
+
+          studyPromises.forEach(studyPromise => {
+            studyPromise.then(seriesPromises => {
+              seriesPromises.forEach(seriesPromise => {
+                seriesPromise.then(instances => {
+                  debugger;
+                  storeInstances(instances);
+                });
+              });
+            });
+          });
 
           // TEMP use dummy data.
-          const { naturalizeDataset } = dcmjs.data.DicomMetaDictionary;
-          const instances = exampleInstances.map(naturalizeDataset);
+          //const { naturalizeDataset } = dcmjs.data.DicomMetaDictionary;
+          //const instances = exampleInstances.map(naturalizeDataset);
 
           // TEMP
 
-          dicomMetadataStore.addInstances(instances);
-          callback(instances);
+          //dicomMetadataStore.addInstances(instances);
+          //callback(instances);
         },
       },
     },