chore: Tag everything currently unused as legacy.
This commit is contained in:
1 parent
8392c1f97e
commit
414ebc6850
161 files changed
+128
-14712
No files matched your search
@@ -1,6 +1,4 @@
|
||||
import OHIFError from '../classes/OHIFError.js';
|
||||
import getImageId from './getImageId';
|
||||
import metadataProvider from '../classes/MetadataProvider.js';
|
||||
|
||||
let stackMap = {};
|
||||
let configuration = {};
|
||||
|
||||
@@ -5,11 +5,10 @@ import addServers from './addServers';
|
||||
import guid from './guid';
|
||||
import sortBy from './sortBy.js';
|
||||
import sortBySeriesDate from './sortBySeriesDate.js';
|
||||
import studyMetadataManager from './studyMetadataManager';
|
||||
import writeScript from './writeScript.js';
|
||||
import DicomLoaderService from './dicomLoaderService.js';
|
||||
import b64toBlob from './b64toBlob.js';
|
||||
import loadAndCacheDerivedDisplaySets from './loadAndCacheDerivedDisplaySets.js';
|
||||
//import loadAndCacheDerivedDisplaySets from './loadAndCacheDerivedDisplaySets.js';
|
||||
import * as urlUtil from './urlUtil';
|
||||
import makeDeferred from './makeDeferred';
|
||||
import makeCancelable from './makeCancelable';
|
||||
@@ -23,6 +22,10 @@ import * as hierarchicalListUtils from './hierarchicalListUtils';
|
||||
import * as progressTrackingUtils from './progressTrackingUtils';
|
||||
import isLowPriorityModality from './isLowPriorityModality';
|
||||
|
||||
// Commented out unused functionality.
|
||||
// Now that we have the DicomMetadataStore, we no longer need the studyMetadataManager
|
||||
// Need to implement new mechanism for dervived displaySets using the displaySetManager.
|
||||
|
||||
const utils = {
|
||||
guid,
|
||||
ObjectPath,
|
||||
@@ -35,10 +38,10 @@ const utils = {
|
||||
formatPN,
|
||||
b64toBlob,
|
||||
StackManager,
|
||||
studyMetadataManager,
|
||||
//studyMetadataManager,
|
||||
DicomLoaderService,
|
||||
urlUtil,
|
||||
loadAndCacheDerivedDisplaySets,
|
||||
//loadAndCacheDerivedDisplaySets,
|
||||
makeDeferred,
|
||||
makeCancelable,
|
||||
hotkeys,
|
||||
@@ -60,10 +63,9 @@ export {
|
||||
writeScript,
|
||||
b64toBlob,
|
||||
StackManager,
|
||||
studyMetadataManager,
|
||||
DicomLoaderService,
|
||||
urlUtil,
|
||||
loadAndCacheDerivedDisplaySets,
|
||||
//loadAndCacheDerivedDisplaySets,
|
||||
makeDeferred,
|
||||
makeCancelable,
|
||||
hotkeys,
|
||||
|
||||
@@ -1,111 +0,0 @@
|
||||
import studyMetadataManager from './studyMetadataManager';
|
||||
|
||||
/**
|
||||
* Study schema
|
||||
*
|
||||
* @typedef {Object} Study
|
||||
* @property {Array} seriesList -
|
||||
* @property {Object} seriesMap -
|
||||
* @property {Object} seriesLoader -
|
||||
* @property {string} wadoUriRoot -
|
||||
* @property {string} wadoRoot -
|
||||
* @property {string} qidoRoot -
|
||||
* @property {string} patientName -
|
||||
* @property {string} patientId -
|
||||
* @property {number} patientAge -
|
||||
* @property {number} patientSize -
|
||||
* @property {number} patientWeight -
|
||||
* @property {string} accessionNumber -
|
||||
* @property {string} studyDate -
|
||||
* @property {string} studyTime -
|
||||
* @property {string} modalities -
|
||||
* @property {string} studyDescription -
|
||||
* @property {string} imageCount -
|
||||
* @property {string} studyInstanceUid -
|
||||
* @property {string} institutionName -
|
||||
* @property {Array} displaySets -
|
||||
*/
|
||||
|
||||
/**
|
||||
* Factory function to load and cache derived display sets.
|
||||
*
|
||||
* @param {object} referencedDisplaySet Display set
|
||||
* @param {string} referencedDisplaySet.displaySetInstanceUID Display set instance uid
|
||||
* @param {string} referencedDisplaySet.seriesDate
|
||||
* @param {string} referencedDisplaySet.seriesTime
|
||||
* @param {string} referencedDisplaySet.seriesInstanceUid
|
||||
* @param {string} referencedDisplaySet.seriesNumber
|
||||
* @param {string} referencedDisplaySet.seriesDescription
|
||||
* @param {number} referencedDisplaySet.numImageFrames
|
||||
* @param {string} referencedDisplaySet.frameRate
|
||||
* @param {string} referencedDisplaySet.modality
|
||||
* @param {boolean} referencedDisplaySet.isMultiFrame
|
||||
* @param {number} referencedDisplaySet.instanceNumber
|
||||
* @param {boolean} referencedDisplaySet.isReconstructable
|
||||
* @param {string} referencedDisplaySet.studyInstanceUid
|
||||
* @param {Array} referencedDisplaySet.sopClassUids
|
||||
* @param {Study[]} studies Collection of studies
|
||||
* @returns void
|
||||
*/
|
||||
const loadAndCacheDerivedDisplaySets = (referencedDisplaySet, studies) => {
|
||||
const { StudyInstanceUID, SeriesInstanceUID } = referencedDisplaySet;
|
||||
|
||||
const promises = [];
|
||||
|
||||
const studyMetadata = studyMetadataManager.get(StudyInstanceUID);
|
||||
|
||||
if (!studyMetadata) {
|
||||
return promises;
|
||||
}
|
||||
|
||||
const derivedDisplaySets = studyMetadata.getDerivedDatasets({
|
||||
referencedSeriesInstanceUID: SeriesInstanceUID,
|
||||
});
|
||||
|
||||
if (!derivedDisplaySets.length) {
|
||||
return promises;
|
||||
}
|
||||
|
||||
// Filter by type
|
||||
const displaySetsPerModality = {};
|
||||
|
||||
derivedDisplaySets.forEach(displaySet => {
|
||||
const Modality = displaySet.Modality;
|
||||
|
||||
if (displaySetsPerModality[Modality] === undefined) {
|
||||
displaySetsPerModality[Modality] = [];
|
||||
}
|
||||
|
||||
displaySetsPerModality[Modality].push(displaySet);
|
||||
});
|
||||
|
||||
// For each type, see if any are loaded, if not load the most recent.
|
||||
Object.keys(displaySetsPerModality).forEach(key => {
|
||||
const displaySets = displaySetsPerModality[key];
|
||||
const isLoaded = displaySets.some(displaySet => displaySet.isLoaded);
|
||||
|
||||
if (isLoaded) {
|
||||
return;
|
||||
}
|
||||
|
||||
// find most recent and load it.
|
||||
let recentDateTime = 0;
|
||||
let recentDisplaySet = displaySets[0];
|
||||
|
||||
displaySets.forEach(displaySet => {
|
||||
const dateTime = Number(
|
||||
`${displaySet.SeriesDate}${displaySet.SeriesTime}`
|
||||
);
|
||||
if (dateTime > recentDateTime) {
|
||||
recentDateTime = dateTime;
|
||||
recentDisplaySet = displaySet;
|
||||
}
|
||||
});
|
||||
|
||||
promises.push(recentDisplaySet.load(referencedDisplaySet, studies));
|
||||
});
|
||||
|
||||
return promises;
|
||||
};
|
||||
|
||||
export default loadAndCacheDerivedDisplaySets;
|
||||
@@ -1,31 +0,0 @@
|
||||
import { TypeSafeCollection } from '../classes/TypeSafeCollection';
|
||||
|
||||
const studyMetadataList = new TypeSafeCollection();
|
||||
|
||||
function add(studyMetadata) {
|
||||
studyMetadataList.insert(studyMetadata);
|
||||
}
|
||||
|
||||
function get(studyInstanceUID) {
|
||||
return studyMetadataList.findBy({ studyInstanceUID });
|
||||
}
|
||||
|
||||
function all(options) {
|
||||
return studyMetadataList.all(options);
|
||||
}
|
||||
|
||||
function remove(studyInstanceUID) {
|
||||
studyMetadataList.remove({ studyInstanceUID });
|
||||
}
|
||||
|
||||
function purge() {
|
||||
studyMetadataList.removeAll();
|
||||
}
|
||||
|
||||
export default {
|
||||
add,
|
||||
get,
|
||||
all,
|
||||
remove,
|
||||
purge,
|
||||
};
|
||||
Reference in new issue
Block a user