TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Display series specified by URL query parameters in viewer (#3000)

Browse Source 
* Changed the static wado filter to allow filtering for series before start make requests of the entire metadata

* fixed first filter to use studyFilterKeys

Co-authored-by: Thomas Forster <thomasforster@ip-192-168-68-104.eu-west-2.compute.internal>
This commit is contained in:
TFRadicalImaging 2022-11-01 19:25:49 -03:00 committed by GitHub
parent 2507a4b546
commit 6698300ace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/default/src/DicomWebDataSource/utils/StaticWadoClient.js
View File

@ -42,7 +42,16 @@ export default class StaticWadoClient extends api.DICOMwebClient {
if (!queryParams) return searchResult; if (!queryParams) return searchResult;
const filtered = searchResult.filter(study => { const filtered = searchResult.filter(study => {
for (const key of Object.keys(StaticWadoClient.studyFilterKeys)) { for (const key of Object.keys(StaticWadoClient.studyFilterKeys)) {
if (!this.filterItem(key, queryParams, study)) return false; if (
!this.filterItem(
key,
queryParams,
study,
StaticWadoClient.studyFilterKeys
)
) {
return false;
}
} }
return true; return true;
}); });
@ -56,8 +65,17 @@ export default class StaticWadoClient extends api.DICOMwebClient {
const { queryParams } = options; const { queryParams } = options;
if (!queryParams) return searchResult; if (!queryParams) return searchResult;
const filtered = searchResult.filter(study => { const filtered = searchResult.filter(study => {
for (const key of Object.keys(StaticWadoClient.studyFilterKeys)) { for (const key of Object.keys(StaticWadoClient.seriesFilterKeys)) {
if (!this.filterItem(key, queryParams, study)) return false; if (
!this.filterItem(
key,
queryParams,
study,
StaticWadoClient.seriesFilterKeys
)
) {
return false;
}
} }
return true; return true;
}); });
@ -121,10 +139,11 @@ export default class StaticWadoClient extends api.DICOMwebClient {
* @param {*} key * @param {*} key
* @param {*} queryParams * @param {*} queryParams
* @param {*} study * @param {*} study
* @param {*} sourceFilterMap
* @returns * @returns
*/ */
filterItem(key, queryParams, study) { filterItem(key, queryParams, study, sourceFilterMap) {
const altKey = StaticWadoClient.studyFilterKeys[key] || key; const altKey = sourceFilterMap[key] || key;
if (!queryParams) return true; if (!queryParams) return true;
const testValue = queryParams[key] || queryParams[altKey]; const testValue = queryParams[key] || queryParams[altKey];
if (!testValue) return true; if (!testValue) return true;