Fix contour annotations RTSS saving (#5545)
* [WIP] Fix contour annotations RTSS saving * fix: Export image sop image reference provider * Fixes for download with filename * Updates to fix metadata issues with CS3D * Updates to save menu * Fixing some additional re-save metadata * Add support for saving with predecessor image sequence * PR comment fixes * fix: Load RTSS after save * fix segmentation save * fix load of mixed seg/rt studies * Use frame module to get information on the frame shown * Fix study browser to use instances.length when numImageFrames not present * fix: Load of display set split from multiple non-FOR referenes * Fix RT and SEG applying to wrong series because of using referenced series sequence without checkout sop instances * Fix save seg * Update to released CS3D versions * test: Add revokeObjectURL to test download blob * Add hard dependency on mode-basic to fix build order issues * fix: build * Try to fix build segmentation * PR comments * PR comment update
This commit is contained in:
1 parent
9c5043ca2c
commit
57205703bb
68 files changed
+962
-648
No files matched your search
@@ -50,6 +50,12 @@ const _model = {
|
||||
studies: [],
|
||||
};
|
||||
|
||||
let metaDataProvider;
|
||||
|
||||
function _setMetaDataProvider(metaData) {
|
||||
metaDataProvider = metaData;
|
||||
}
|
||||
|
||||
function _getStudyInstanceUIDs() {
|
||||
return _model.studies.map(aStudy => aStudy.StudyInstanceUID);
|
||||
}
|
||||
@@ -102,7 +108,17 @@ function _getInstance(StudyInstanceUID, SeriesInstanceUID, SOPInstanceUID) {
|
||||
return series.getInstance(SOPInstanceUID);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the frame module from the OHIF metadata provider, and then
|
||||
* uses the study/series/instance uids to get the instance data.
|
||||
*/
|
||||
function _getInstanceByImageId(imageId) {
|
||||
const metadataResult = metaDataProvider?.get('frameModule', imageId);
|
||||
if (metadataResult) {
|
||||
const { studyInstanceUID, seriesInstanceUID, sopInstanceUID } = metadataResult;
|
||||
return _getInstance(studyInstanceUID, seriesInstanceUID, sopInstanceUID);
|
||||
}
|
||||
console.warn('No metadata result found for', imageId, 'looking through instances');
|
||||
for (const study of _model.studies) {
|
||||
for (const series of study.series) {
|
||||
for (const instance of series.instances) {
|
||||
@@ -186,7 +202,8 @@ const BaseImplementation = {
|
||||
study = _model.studies[_model.studies.length - 1];
|
||||
}
|
||||
|
||||
naturalizedDataset = numberOfFrames > 1 ? addProxyFields(naturalizedDataset) : naturalizedDataset;
|
||||
naturalizedDataset =
|
||||
numberOfFrames > 1 ? addProxyFields(naturalizedDataset) : naturalizedDataset;
|
||||
|
||||
study.addInstanceToSeries(naturalizedDataset);
|
||||
},
|
||||
@@ -289,6 +306,7 @@ const BaseImplementation = {
|
||||
getInstance: _getInstance,
|
||||
getInstanceByImageId: _getInstanceByImageId,
|
||||
updateMetadataForSeries: _updateMetadataForSeries,
|
||||
setMetaDataProvider: _setMetaDataProvider,
|
||||
};
|
||||
const DicomMetadataStore = Object.assign(
|
||||
// get study
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { ExtensionManager } from '../../extensions';
|
||||
import { DisplaySet, InstanceMetadata } from '../../types';
|
||||
import { DisplaySet, InstanceMetadata, ReferencedSeriesSequence } from '../../types';
|
||||
import { PubSubService } from '../_shared/pubSubServiceInterface';
|
||||
import EVENTS from './EVENTS';
|
||||
|
||||
@@ -115,16 +115,52 @@ export default class DisplaySetService extends PubSubService {
|
||||
return this.activeDisplaySets;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the set of display sets with this series instance UID
|
||||
*
|
||||
* <b>WARNING: Do not use this method when you have a referenced series sequence
|
||||
* as this method does NOT check sop instances. Instead, use getDisplaySetsForReference
|
||||
* to get those with the correct sop instances in them.</b>
|
||||
*/
|
||||
public getDisplaySetsForSeries = (seriesInstanceUID: string): DisplaySet[] => {
|
||||
return [...displaySetCache.values()].filter(
|
||||
displaySet => displaySet.SeriesInstanceUID === seriesInstanceUID
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* Given a reference to a series/sop, returns the set of display sets
|
||||
* containing an instance from the references.
|
||||
*/
|
||||
public getDisplaySetsForReferences = (
|
||||
references: ReferencedSeriesSequence | ReferencedSeriesSequence[]
|
||||
): DisplaySet[] => {
|
||||
const mapSeriesReferences = new Map<string, Set<string>>();
|
||||
const referenceArr = Array.isArray(references) ? references : [references];
|
||||
for (const seriesRef of referenceArr) {
|
||||
const { SeriesInstanceUID, ReferencedInstanceSequence } = seriesRef;
|
||||
if (!mapSeriesReferences.has(SeriesInstanceUID)) {
|
||||
mapSeriesReferences.set(SeriesInstanceUID, new Set<string>());
|
||||
}
|
||||
const sops = mapSeriesReferences.get(SeriesInstanceUID);
|
||||
for (const sopReference of ReferencedInstanceSequence) {
|
||||
sops.add(sopReference.ReferencedSOPInstanceUID);
|
||||
}
|
||||
}
|
||||
|
||||
return [...displaySetCache.values()].filter(displaySet => {
|
||||
const sopReferences = mapSeriesReferences.get(displaySet.SeriesInstanceUID);
|
||||
if (!sopReferences || !displaySet.instances) {
|
||||
return;
|
||||
}
|
||||
return displaySet.instances.some(instance => sopReferences.has(instance.SOPInstanceUID));
|
||||
});
|
||||
};
|
||||
|
||||
public getDisplaySetForSOPInstanceUID(
|
||||
sopInstanceUID: string,
|
||||
seriesInstanceUID: string,
|
||||
frameNumber?: number
|
||||
_frameNumber?: number
|
||||
): DisplaySet {
|
||||
const displaySets = seriesInstanceUID
|
||||
? this.getDisplaySetsForSeries(seriesInstanceUID)
|
||||
|
||||
@@ -434,10 +434,13 @@ class MeasurementService extends PubSubService {
|
||||
|
||||
const internalUID = data.uid || guid();
|
||||
|
||||
const annotationData = data.annotation.data;
|
||||
const {
|
||||
annotation: { predecessorImageId, data: annotationData },
|
||||
} = data;
|
||||
|
||||
const newMeasurement = {
|
||||
finding: annotationData.finding,
|
||||
predecessorImageId,
|
||||
findingSites: annotationData.findingSites,
|
||||
site: annotationData.findingSites?.[0],
|
||||
...measurement,
|
||||
@@ -643,8 +646,12 @@ class MeasurementService extends PubSubService {
|
||||
if (referencedImageId) {
|
||||
measurement.referencedImageId = referencedImageId;
|
||||
const instance = DicomMetadataStore.getInstanceByImageId(referencedImageId);
|
||||
measurement.referenceStudyUID = instance.StudyInstanceUID;
|
||||
measurement.referenceSeriesUID = instance.SeriesInstanceUID;
|
||||
if (!instance) {
|
||||
console.warn("Didn't find instance for", referencedImageId);
|
||||
} else {
|
||||
measurement.referenceStudyUID = instance.StudyInstanceUID;
|
||||
measurement.referenceSeriesUID = instance.SeriesInstanceUID;
|
||||
}
|
||||
}
|
||||
|
||||
if (displaySetInstanceUID) {
|
||||
@@ -683,8 +690,7 @@ class MeasurementService extends PubSubService {
|
||||
removeMany(measurementUIDs: string[]): void {
|
||||
const measurements = [];
|
||||
for (const measurementUID of measurementUIDs) {
|
||||
const measurement =
|
||||
this.measurements.get(measurementUID)
|
||||
const measurement = this.measurements.get(measurementUID);
|
||||
|
||||
if (!measurementUID || !measurement) {
|
||||
console.debug(`No uid provided, or unable to find measurement by uid.`);
|
||||
@@ -727,8 +733,7 @@ class MeasurementService extends PubSubService {
|
||||
*/
|
||||
|
||||
public jumpToMeasurement(viewportId: string, measurementUID: string): void {
|
||||
const measurement =
|
||||
this.measurements.get(measurementUID)
|
||||
const measurement = this.measurements.get(measurementUID);
|
||||
|
||||
if (!measurement) {
|
||||
log.warn(`No measurement uid, or unable to find by uid.`);
|
||||
@@ -850,8 +855,7 @@ class MeasurementService extends PubSubService {
|
||||
};
|
||||
|
||||
public toggleLockMeasurement(measurementUID: string): void {
|
||||
const measurement =
|
||||
this.measurements.get(measurementUID)
|
||||
const measurement = this.measurements.get(measurementUID);
|
||||
|
||||
if (!measurement) {
|
||||
console.debug(`No measurement found for uid: ${measurementUID}`);
|
||||
@@ -868,8 +872,7 @@ class MeasurementService extends PubSubService {
|
||||
}
|
||||
|
||||
public toggleVisibilityMeasurement(measurementUID: string, visibility?: boolean): void {
|
||||
const measurement =
|
||||
this.measurements.get(measurementUID)
|
||||
const measurement = this.measurements.get(measurementUID);
|
||||
|
||||
if (!measurement) {
|
||||
console.debug(`No measurement found for uid: ${measurementUID}`);
|
||||
@@ -893,8 +896,7 @@ class MeasurementService extends PubSubService {
|
||||
}
|
||||
|
||||
public updateColorMeasurement(measurementUID: string, color: number[]): void {
|
||||
const measurement =
|
||||
this.measurements.get(measurementUID)
|
||||
const measurement = this.measurements.get(measurementUID);
|
||||
|
||||
if (!measurement) {
|
||||
console.debug(`No measurement found for uid: ${measurementUID}`);
|
||||
|
||||
Reference in new issue
Block a user