Pull in main

This commit is contained in:
James A. Petts committed 2020-07-01 11:12:41 +02:00
commit d956c3008c
53 files changed
+771 -310

No files matched your search

@@ -1,9 +1,7 @@
import id from './id';
import { utils, classes } from '@ohif/core';
import addMeasurement from './utils/addMeasurement.js';
import { adapters } from 'dcmjs';
const cornerstoneAdapters = adapters.Cornerstone;
import addMeasurement from './utils/addMeasurement';
import isRehydratable from './utils/isRehydratable';
const { ImageSet } = classes;
@@ -95,7 +93,12 @@ function _getDisplaySetsFromSeries(
sopClassUids,
};
if (_isRehydratable(displaySet, MeasurementService)) {
const mappings = MeasurementService.getSourceMappings(
'CornerstoneTools',
'4'
);
if (isRehydratable(displaySet, mappings)) {
displaySet.isLocked = false;
displaySet.isHydrated = false;
} else {