Co-authored-by: James Petts <jamesapetts@gmail.com>
This commit is contained in:
1 parent
2d827c2a49
commit
62a2cd5ff3
6 files changed
+40
-5
No files matched your search
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
|
||||
import ViewerRetrieveStudyData from './ViewerRetrieveStudyData.js';
|
||||
import OHIF from '@ohif/core';
|
||||
|
||||
const { clearViewportSpecificData } = OHIF.redux.actions;
|
||||
const { clearViewportSpecificData, setStudyData } = OHIF.redux.actions;
|
||||
const isActive = a => a.active === true;
|
||||
|
||||
const mapStateToProps = (state, ownProps) => {
|
||||
@@ -14,6 +14,9 @@ const mapStateToProps = (state, ownProps) => {
|
||||
};
|
||||
const mapDispatchToProps = dispatch => {
|
||||
return {
|
||||
setStudyData: (StudyInstanceUID, data) => {
|
||||
dispatch(setStudyData(StudyInstanceUID, data));
|
||||
},
|
||||
clearViewportSpecificData: () => {
|
||||
dispatch(clearViewportSpecificData());
|
||||
},
|
||||
|
||||
@@ -154,11 +154,21 @@ const _sortStudyDisplaySet = (study, studyMetadata) => {
|
||||
studyMetadata.sortDisplaySets(study.displaySets);
|
||||
};
|
||||
|
||||
const _thinStudyData = study => {
|
||||
return {
|
||||
StudyInstanceUID: study.StudyInstanceUID,
|
||||
series: study.series.map(item => ({
|
||||
SeriesInstanceUID: item.SeriesInstanceUID
|
||||
})),
|
||||
}
|
||||
};
|
||||
|
||||
function ViewerRetrieveStudyData({
|
||||
server,
|
||||
studyInstanceUIDs,
|
||||
seriesInstanceUIDs,
|
||||
clearViewportSpecificData,
|
||||
setStudyData,
|
||||
}) {
|
||||
// hooks
|
||||
const [error, setError] = useState(false);
|
||||
@@ -220,6 +230,7 @@ function ViewerRetrieveStudyData({
|
||||
if (Array.isArray(studiesData) && studiesData.length > 0) {
|
||||
// Map studies to new format, update metadata manager?
|
||||
const studies = studiesData.map(study => {
|
||||
setStudyData(study.StudyInstanceUID, _thinStudyData(study));
|
||||
const studyMetadata = new OHIFStudyMetadata(
|
||||
study,
|
||||
study.StudyInstanceUID
|
||||
@@ -369,6 +380,7 @@ ViewerRetrieveStudyData.propTypes = {
|
||||
seriesInstanceUIDs: PropTypes.array,
|
||||
server: PropTypes.object,
|
||||
clearViewportSpecificData: PropTypes.func.isRequired,
|
||||
setStudyData: PropTypes.func.isRequired,
|
||||
};
|
||||
|
||||
export default ViewerRetrieveStudyData;
|
||||
Reference in new issue
Block a user