Instance metadata/metadata providers overhaul (#1481)

* Instance metadata plus metadata provider overhaul.

Fix consumption of wado-uri urls

fallbacks + datatype agnosticism.

WIP DICOMify things.

fix various issues with naturalized variable naming migration.

Remove metadata provider.

Fix consumption of multiframe images and addition of CWIL metadata.

Fix strange build issues.

Fix CWIL style windowWidth to array from naturalized DICOM.

Fix PT, CT, CR and DX issues for cornerstone + DX issues for vtkjs.

Move color palette fetching down to the natuaralized JSON level.

Remove unused StudyMetadataSummary

Remove redundant dicom metadata dictionary.

Working local + json routes.

Fix SR read.

Finished first round of testing + cleaned up debugging etc.

* data => metadata for instance naturalizedJSON

* Update dcmjs version

* Correct github isssues.

* Fix erroneously replaced files.

* Danny's recommended changes.

* Instance metadata plus metadata provider overhaul.

Fix consumption of wado-uri urls

fallbacks + datatype agnosticism.

WIP DICOMify things.

fix various issues with naturalized variable naming migration.

Remove metadata provider.

Fix consumption of multiframe images and addition of CWIL metadata.

Fix strange build issues.

Fix CWIL style windowWidth to array from naturalized DICOM.

Fix PT, CT, CR and DX issues for cornerstone + DX issues for vtkjs.

Move color palette fetching down to the natuaralized JSON level.

Remove unused StudyMetadataSummary

Remove redundant dicom metadata dictionary.

Working local + json routes.

Fix SR read.

Finished first round of testing + cleaned up debugging etc.

* data => metadata for instance naturalizedJSON

* Update dcmjs version

* Correct github isssues.

* Fix erroneously replaced files.

* Danny's recommended changes.

* Update JSON CI

* Update casing of import.

* Fix jump for SR.

* Fix unit tests for measurements service

* Fix json CI test.

* fix: update yarn lock

* Fix local non-encapsulated pdf view

* CI updated to new sucess message.

Co-authored-by: Danny <danny.ri.brown@gmail.com>
This commit is contained in:
James PettsandDanny authored and GitHub committed 2020-03-09 19:03:23 +00:00
1 parent 8833731ad3
commit 1d85f7a74e
142 files changed
+5322 -8570

No files matched your search

@@ -17,8 +17,8 @@ const mapStateToProps = (state, ownProps) => {
studiesWithLoadingData.forEach(study => {
study.thumbnails.forEach(data => {
const { displaySetInstanceUid } = data;
const stackId = `StackProgress:${displaySetInstanceUid}`;
const { displaySetInstanceUID } = data;
const stackId = `StackProgress:${displaySetInstanceUID}`;
const stackProgressData = stackLoadingProgressMap[stackId];
let stackPercentComplete = 0;
@@ -37,9 +37,9 @@ const mapStateToProps = (state, ownProps) => {
const mapDispatchToProps = (dispatch, ownProps) => {
return {
onThumbnailClick: displaySetInstanceUid => {
onThumbnailClick: displaySetInstanceUID => {
const displaySet = ownProps.studyMetadata[0].displaySets.find(
ds => ds.displaySetInstanceUid === displaySetInstanceUid
ds => ds.displaySetInstanceUID === displaySetInstanceUID
);
dispatch(setActiveViewportSpecificData(displaySet));
@@ -23,16 +23,16 @@ class Viewer extends Component {
static propTypes = {
studies: PropTypes.arrayOf(
PropTypes.shape({
studyInstanceUid: PropTypes.string.isRequired,
studyDate: PropTypes.string,
StudyInstanceUID: PropTypes.string.isRequired,
StudyDate: PropTypes.string,
displaySets: PropTypes.arrayOf(
PropTypes.shape({
displaySetInstanceUid: PropTypes.string.isRequired,
seriesDescription: PropTypes.string,
seriesNumber: PropTypes.number,
instanceNumber: PropTypes.number,
displaySetInstanceUID: PropTypes.string.isRequired,
SeriesDescription: PropTypes.string,
SeriesNumber: PropTypes.number,
InstanceNumber: PropTypes.number,
numImageFrames: PropTypes.number,
modality: PropTypes.string.isRequired,
Modality: PropTypes.string.isRequired,
images: PropTypes.arrayOf(
PropTypes.shape({
getImageId: PropTypes.func.isRequired,
@@ -42,7 +42,7 @@ class Viewer extends Component {
),
})
),
studyInstanceUids: PropTypes.array,
studyInstanceUIDs: PropTypes.array,
activeServer: PropTypes.shape({
type: PropTypes.string,
wadoRoot: PropTypes.string,
@@ -105,12 +105,12 @@ class Viewer extends Component {
if (this.props.studies) {
latestDate = new Date('1000-01-01').toISOString();
this.props.studies.forEach(study => {
const studyDate = moment(study.studyDate, 'YYYYMMDD').toISOString();
if (studyDate < earliestDate) {
earliestDate = studyDate;
const StudyDate = moment(study.StudyDate, 'YYYYMMDD').toISOString();
if (StudyDate < earliestDate) {
earliestDate = StudyDate;
}
if (studyDate > latestDate) {
latestDate = studyDate;
if (StudyDate > latestDate) {
latestDate = StudyDate;
}
});
}
@@ -120,8 +120,8 @@ class Viewer extends Component {
{
timepointType: 'baseline',
timepointId: 'TimepointId',
studyInstanceUids: this.props.studyInstanceUids,
patientId: filter.patientId,
studyInstanceUIDs: this.props.studyInstanceUIDs,
PatientID: filter.PatientID,
earliestDate,
latestDate,
isLocked: false,
@@ -144,7 +144,7 @@ class Viewer extends Component {
return Promise.resolve();
};
disassociateStudy = (timepointIds, studyInstanceUid) => {
disassociateStudy = (timepointIds, StudyInstanceUID) => {
OHIF.log.info('disassociateStudy');
return Promise.resolve();
};
@@ -179,11 +179,11 @@ class Viewer extends Component {
this.measurementApi = measurementApi;
if (studies) {
const patientId = studies[0] && studies[0].patientId;
const PatientID = studies[0] && studies[0].PatientID;
timepointApi.retrieveTimepoints({ patientId });
timepointApi.retrieveTimepoints({ PatientID });
if (isStudyLoaded) {
this.measurementApi.retrieveMeasurements(patientId, [
this.measurementApi.retrieveMeasurements(PatientID, [
currentTimepointId,
]);
}
@@ -201,11 +201,11 @@ class Viewer extends Component {
});
}
if (isStudyLoaded && isStudyLoaded !== prevProps.isStudyLoaded) {
const patientId = studies[0] && studies[0].patientId;
const PatientID = studies[0] && studies[0].PatientID;
const { currentTimepointId } = this;
this.timepointApi.retrieveTimepoints({ patientId });
this.measurementApi.retrieveMeasurements(patientId, [currentTimepointId]);
this.timepointApi.retrieveTimepoints({ PatientID });
this.measurementApi.retrieveMeasurements(PatientID, [currentTimepointId]);
}
}
@@ -331,21 +331,21 @@ export default withDialog(Viewer);
*/
const _mapStudiesToThumbnails = function(studies) {
return studies.map(study => {
const { studyInstanceUid } = study;
const { StudyInstanceUID } = study;
const thumbnails = study.displaySets.map(displaySet => {
const {
displaySetInstanceUid,
seriesDescription,
seriesNumber,
instanceNumber,
displaySetInstanceUID,
SeriesDescription,
SeriesNumber,
InstanceNumber,
numImageFrames,
} = displaySet;
let imageId;
let altImageText;
if (displaySet.modality && displaySet.modality === 'SEG') {
if (displaySet.Modality && displaySet.Modality === 'SEG') {
// TODO: We want to replace this with a thumbnail showing
// the segmentation map on the image, but this is easier
// and better than what we have right now.
@@ -355,22 +355,22 @@ const _mapStudiesToThumbnails = function(studies) {
imageId = displaySet.images[imageIndex].getImageId();
} else {
altImageText = displaySet.modality ? displaySet.modality : 'UN';
altImageText = displaySet.Modality ? displaySet.Modality : 'UN';
}
return {
imageId,
altImageText,
displaySetInstanceUid,
seriesDescription,
seriesNumber,
instanceNumber,
displaySetInstanceUID,
SeriesDescription,
SeriesNumber,
InstanceNumber,
numImageFrames,
};
});
return {
studyInstanceUid,
StudyInstanceUID,
thumbnails,
};
});
@@ -10,7 +10,7 @@ import './ViewerLocalFileData.css';
import { withTranslation } from 'react-i18next';
const { OHIFStudyMetadata } = metadata;
const { studyMetadataManager, updateMetaDataManager } = utils;
const { studyMetadataManager } = utils;
const dropZoneLinkDialog = (onDrop, i18n, dir) => {
return (
@@ -69,7 +69,7 @@ class ViewerLocalFileData extends Component {
const updatedStudies = studies.map(study => {
const studyMetadata = new OHIFStudyMetadata(
study,
study.studyInstanceUid
study.StudyInstanceUID
);
const sopClassHandlerModules =
extensionManager.modules['sopClassHandlerModule'];
@@ -82,8 +82,6 @@ class ViewerLocalFileData extends Component {
studyMetadata.forEachDisplaySet(displayset => {
displayset.localFile = true;
});
// Updates WADO-RS metaDataManager
updateMetaDataManager(study);
studyMetadataManager.add(studyMetadata);
@@ -120,9 +118,9 @@ class ViewerLocalFileData extends Component {
{this.state.studies ? (
<ConnectedViewer
studies={this.state.studies}
studyInstanceUids={
studyInstanceUIDs={
this.state.studies &&
this.state.studies.map(a => a.studyInstanceUid)
this.state.studies.map(a => a.StudyInstanceUID)
}
/>
) : (
@@ -37,9 +37,9 @@ class ViewerMain extends Component {
return displaySets;
}
findDisplaySet(studies, studyInstanceUid, displaySetInstanceUid) {
findDisplaySet(studies, StudyInstanceUID, displaySetInstanceUID) {
const study = studies.find(study => {
return study.studyInstanceUid === studyInstanceUid;
return study.StudyInstanceUID === StudyInstanceUID;
});
if (!study) {
@@ -47,7 +47,7 @@ class ViewerMain extends Component {
}
return study.displaySets.find(displaySet => {
return displaySet.displaySetInstanceUid === displaySetInstanceUid;
return displaySet.displaySetInstanceUID === displaySetInstanceUID;
});
}
@@ -89,13 +89,13 @@ class ViewerMain extends Component {
const viewportPane = viewportSpecificData[i];
const isNonEmptyViewport =
viewportPane &&
viewportPane.studyInstanceUid &&
viewportPane.displaySetInstanceUid;
viewportPane.StudyInstanceUID &&
viewportPane.displaySetInstanceUID;
if (isNonEmptyViewport) {
dirtyViewportPanes.push({
studyInstanceUid: viewportPane.studyInstanceUid,
displaySetInstanceUid: viewportPane.displaySetInstanceUid,
StudyInstanceUID: viewportPane.StudyInstanceUID,
displaySetInstanceUID: viewportPane.displaySetInstanceUID,
});
continue;
@@ -105,7 +105,7 @@ class ViewerMain extends Component {
displaySets.find(
ds =>
!dirtyViewportPanes.some(
v => v.displaySetInstanceUid === ds.displaySetInstanceUid
v => v.displaySetInstanceUID === ds.displaySetInstanceUID
)
) || displaySets[displaySets.length - 1];
@@ -113,11 +113,11 @@ class ViewerMain extends Component {
}
dirtyViewportPanes.forEach((vp, i) => {
if (vp && vp.studyInstanceUid) {
if (vp && vp.StudyInstanceUID) {
this.setViewportData({
viewportIndex: i,
studyInstanceUid: vp.studyInstanceUid,
displaySetInstanceUid: vp.displaySetInstanceUid,
StudyInstanceUID: vp.StudyInstanceUID,
displaySetInstanceUID: vp.displaySetInstanceUID,
});
}
});
@@ -125,13 +125,13 @@ class ViewerMain extends Component {
setViewportData = ({
viewportIndex,
studyInstanceUid,
displaySetInstanceUid,
StudyInstanceUID,
displaySetInstanceUID,
}) => {
const displaySet = this.findDisplaySet(
this.props.studies,
studyInstanceUid,
displaySetInstanceUid
StudyInstanceUID,
displaySetInstanceUID
);
this.props.setViewportSpecificData(viewportIndex, displaySet);
@@ -9,7 +9,7 @@ import { useSnackbarContext } from '@ohif/ui';
const { OHIFStudyMetadata, OHIFSeriesMetadata } = metadata;
const { retrieveStudiesMetadata, deleteStudyMetadataPromise } = studies;
const { studyMetadataManager, updateMetaDataManager, makeCancelable } = utils;
const { studyMetadataManager, makeCancelable } = utils;
// Contexts
import AppContext from '../context/AppContext';
@@ -61,7 +61,7 @@ const _promoteStudyDisplaySet = (study, studyMetadata, filters) => {
const { seriesInstanceUID } = filters;
const _seriesLookup = (valueToCompare, displaySet) => {
return displaySet.seriesInstanceUid === valueToCompare;
return displaySet.SeriesInstanceUID === valueToCompare;
};
const promotedResponse = _promoteToFront(
studyMetadata.getDisplaySets(),
@@ -91,10 +91,10 @@ const _isQueryParamApplied = (study, filters = {}, isFilterStrategy) => {
return applied;
}
const { seriesList = [], displaySets = [] } = study;
const firstSeries = isFilterStrategy ? seriesList[0] : displaySets[0];
const { series = [], displaySets = [] } = study;
const firstSeries = isFilterStrategy ? series[0] : displaySets[0];
if (!firstSeries || firstSeries.seriesInstanceUid !== seriesInstanceUID) {
if (!firstSeries || firstSeries.SeriesInstanceUID !== seriesInstanceUID) {
applied = false;
}
@@ -105,7 +105,7 @@ const _showUserMessage = (queryParamApplied, message, dialog = {}) => {
return;
}
const { show: showUserMessage = () => { } } = dialog;
const { show: showUserMessage = () => {} } = dialog;
showUserMessage({
message,
});
@@ -123,15 +123,13 @@ const _addSeriesToStudy = (studyMetadata, series) => {
false
);
study.displaySets = studyMetadata.getDisplaySets();
_updateMetaDataManager(study, series.seriesInstanceUid);
_updateStudyMetadataManager(study, studyMetadata);
};
const _updateMetaDataManager = (study, studyMetadata, series) => {
updateMetaDataManager(study, series);
const _updateStudyMetadataManager = (study, studyMetadata) => {
const { StudyInstanceUID } = study;
const { studyInstanceUid } = study;
if (!studyMetadataManager.get(studyInstanceUid)) {
if (!studyMetadataManager.get(StudyInstanceUID)) {
studyMetadataManager.add(studyMetadata);
}
};
@@ -172,8 +170,8 @@ const _loadRemainingSeries = studyMetadata => {
function ViewerRetrieveStudyData({
server,
studyInstanceUids,
seriesInstanceUids,
studyInstanceUIDs,
seriesInstanceUIDs,
clearViewportSpecificData,
}) {
// hooks
@@ -235,14 +233,14 @@ function ViewerRetrieveStudyData({
const studies = studiesData.map(study => {
const studyMetadata = new OHIFStudyMetadata(
study,
study.studyInstanceUid
study.StudyInstanceUID
);
_updateStudyDisplaySets(study, studyMetadata);
_updateMetaDataManager(study, studyMetadata);
_updateStudyMetadataManager(study, studyMetadata);
// Attempt to load remaning series if any
cancelableSeriesPromises[study.studyInstanceUid] = makeCancelable(
cancelableSeriesPromises[study.StudyInstanceUID] = makeCancelable(
_loadRemainingSeries(studyMetadata)
)
.then(result => {
@@ -268,9 +266,9 @@ function ViewerRetrieveStudyData({
try {
const filters = {};
// Use the first, discard others
const seriesInstanceUID = seriesInstanceUids && seriesInstanceUids[0];
const seriesInstanceUID = seriesInstanceUIDs && seriesInstanceUIDs[0];
const retrieveParams = [server, studyInstanceUids];
const retrieveParams = [server, studyInstanceUIDs];
if (seriesInstanceUID) {
filters.seriesInstanceUID = seriesInstanceUID;
@@ -280,7 +278,7 @@ function ViewerRetrieveStudyData({
}
}
cancelableStudiesPromises[studyInstanceUids] = makeCancelable(
cancelableStudiesPromises[studyInstanceUIDs] = makeCancelable(
retrieveStudiesMetadata(...retrieveParams)
)
.then(result => {
@@ -303,31 +301,34 @@ function ViewerRetrieveStudyData({
};
const purgeCancellablePromises = () => {
for (let studyInstanceUids in cancelableStudiesPromises) {
if ('cancel' in cancelableStudiesPromises[studyInstanceUids]) {
cancelableStudiesPromises[studyInstanceUids].cancel();
for (let studyInstanceUIDs in cancelableStudiesPromises) {
if ('cancel' in cancelableStudiesPromises[studyInstanceUIDs]) {
cancelableStudiesPromises[studyInstanceUIDs].cancel();
}
}
for (let studyInstanceUids in cancelableSeriesPromises) {
if ('cancel' in cancelableSeriesPromises[studyInstanceUids]) {
cancelableSeriesPromises[studyInstanceUids].cancel();
deleteStudyMetadataPromise(studyInstanceUids);
studyMetadataManager.remove(studyInstanceUids);
for (let studyInstanceUIDs in cancelableSeriesPromises) {
if ('cancel' in cancelableSeriesPromises[studyInstanceUIDs]) {
cancelableSeriesPromises[studyInstanceUIDs].cancel();
deleteStudyMetadataPromise(studyInstanceUIDs);
studyMetadataManager.remove(studyInstanceUIDs);
}
}
};
const prevStudyInstanceUids = usePrevious(studyInstanceUids);
const prevStudyInstanceUIDs = usePrevious(studyInstanceUIDs);
useEffect(() => {
const hasStudyInstanceUidsChanged = !(prevStudyInstanceUids && prevStudyInstanceUids.every(e => studyInstanceUids.includes(e)));
const hasStudyInstanceUIDsChanged = !(
prevStudyInstanceUIDs &&
prevStudyInstanceUIDs.every(e => studyInstanceUIDs.includes(e))
);
if (hasStudyInstanceUidsChanged) {
if (hasStudyInstanceUIDsChanged) {
studyMetadataManager.purge();
purgeCancellablePromises();
}
}, [studyInstanceUids]);
}, [studyInstanceUIDs]);
useEffect(() => {
cancelableSeriesPromises = {};
@@ -347,14 +348,14 @@ function ViewerRetrieveStudyData({
<ConnectedViewer
studies={studies}
isStudyLoaded={isStudyLoaded}
studyInstanceUids={studyInstanceUids}
studyInstanceUIDs={studyInstanceUIDs}
/>
);
}
ViewerRetrieveStudyData.propTypes = {
studyInstanceUids: PropTypes.array.isRequired,
seriesInstanceUids: PropTypes.array,
studyInstanceUIDs: PropTypes.array.isRequired,
seriesInstanceUIDs: PropTypes.array,
server: PropTypes.object,
clearViewportSpecificData: PropTypes.func.isRequired,
};