Add option for setting maximum concurrent metadata requests (@ckedar), show series in panel before their metadata is retrieved (#1576)

* Show series in Study Browser before their metadata is retrieved

* Switch to decreasing for loop after code review (thanks @ckedar!)

* feat: Limit concurrent series metadata requests (#1581)

* Limit concurrent series metadata requests

* Switch to decreasing for loop after code review (thanks @ckedar!)

* Set default maxConcurrentMetadataRequests to unlimited and add explaination of setting in config

Co-authored-by: kedar.netelixir <kedar.choudhary@netelixir.com>
Co-authored-by: Erik Ziegler <erik.sweed@gmail.com>

* Address comments from code review

* Comment out misbehaving test

Co-authored-by: Kedar <ckedar@gmail.com>
Co-authored-by: kedar.netelixir <kedar.choudhary@netelixir.com>
This commit is contained in:
authored and GitHub committed 2020-04-06 10:43:35 +02:00
1 parent f9037f831d
commit 8c8f69accb
10 files changed
+169 -69

No files matched your search

@@ -1,4 +1,5 @@
import { api } from 'dicomweb-client';
import dcmjs from 'dcmjs';
import DICOMWeb from '../../../DICOMWeb/';
import RetrieveMetadataLoader from './retrieveMetadataLoader';
import { sortStudySeries, sortingCriteria } from '../../sortStudy';
@@ -8,6 +9,8 @@ import {
addInstancesToStudy,
} from './studyInstanceHelpers';
const { naturalizeDataset } = dcmjs.data.DicomMetaDictionary;
/**
* Map series to an array of SeriesInstanceUID
* @param {Arrays} series list of Series Instance UIDs
@@ -101,15 +104,21 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
async preLoad() {
const preLoaders = this.getPreLoaders();
const result = await this.runLoaders(preLoaders);
// seriesData is the result of the QIDO-RS Search For Series request
// It's an array of Objects containing DICOM Tag values at the Series level
const seriesData = await this.runLoaders(preLoaders);
const seriesSorted = sortStudySeries(
result,
seriesData,
sortingCriteria.seriesSortCriteria.seriesInfoSortingCriteria
);
const seriesInstanceUIDsMap = mapStudySeries(seriesSorted);
return seriesInstanceUIDsMap;
return {
seriesInstanceUIDsMap,
seriesData
};
}
async load(preLoadData) {
@@ -118,7 +127,7 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
const seriesAsyncLoader = makeSeriesAsyncLoader(
client,
studyInstanceUID,
preLoadData
preLoadData.seriesInstanceUIDsMap
);
const firstSeries = await seriesAsyncLoader.next();
@@ -126,16 +135,38 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
return {
sopInstances: firstSeries.sopInstances,
asyncLoader: seriesAsyncLoader,
seriesData: preLoadData.seriesData,
};
}
async posLoad(loadData) {
const { server } = this;
const { sopInstances, asyncLoader } = loadData;
const { sopInstances, asyncLoader, seriesData } = loadData;
const study = await createStudyFromSOPInstanceList(server, sopInstances);
// TODO: Should this be in a helper
const seriesDataNaturalized = seriesData.map(naturalizeDataset);
seriesDataNaturalized.forEach((series, idx) => {
const seriesDataFromQIDO = {
SeriesInstanceUID: series.SeriesInstanceUID,
SeriesDescription: series.SeriesDescription,
SeriesNumber: series.SeriesNumber,
Modality: series.Modality,
instances: []
};
if (study.series[idx]) {
study.series[idx] = Object.assign(seriesDataFromQIDO, study.series[idx]);
} else {
study.series[idx] = seriesDataFromQIDO;
}
study.seriesMap[series.SeriesInstanceUID] = study.series[idx];
});
if (asyncLoader.hasNext()) {
attachSeriesLoader(server, study, asyncLoader);
}