fix: Revert "refactor: Reduce bundle size (#1575)" (#1622)

This reverts commit 81dcbe294d.
This commit is contained in:
Danny Brown authored and GitHub committed 2020-04-09 07:06:41 -04:00
1 parent 70672ed663
commit d21af3f133
20 files changed
+136 -174

No files matched your search

@@ -1,7 +1,7 @@
import cornerstone from 'cornerstone-core';
import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
import { api } from 'dicomweb-client';
import DICOMWeb from '../DICOMWeb';
import { getCornerstoneWADOImageLoader } from './cornerstoneWADOImageLoader';
const getImageId = imageObj => {
if (!imageObj) {
@@ -86,7 +86,7 @@ const getImageLoaderType = imageId => {
};
class DicomLoaderService {
async getLocalData(dataset, studies) {
getLocalData(dataset, studies) {
if (dataset && dataset.localFile) {
// Use referenced imageInstance
const imageInstance = getImageInstance(dataset);
@@ -98,7 +98,6 @@ class DicomLoaderService {
}
if (!someInvalidStrings(imageId)) {
const cornerstoneWADOImageLoader = await getCornerstoneWADOImageLoader();
return cornerstoneWADOImageLoader.wadouri.loadFileRequest(imageId);
}
}
@@ -177,16 +176,16 @@ class DicomLoaderService {
}
}
async *getLoaderIterator(dataset, studies) {
yield await this.getLocalData(dataset, studies);
*getLoaderIterator(dataset, studies) {
yield this.getLocalData(dataset, studies);
yield this.getDataByImageType(dataset);
yield this.getDataByDatasetType(dataset);
}
async findDicomDataPromise(dataset, studies) {
findDicomDataPromise(dataset, studies) {
const loaderIterator = this.getLoaderIterator(dataset, studies);
// it returns first valid retriever method.
for await (const loader of loaderIterator) {
for (const loader of loaderIterator) {
if (loader) {
return loader;
}