+ return (
+
{inconsistencyWarnings && inconsistencyWarnings.length != 0 ? (
Series Inconsistencies
- {getWarningContent(inconsistencyWarnings)}
+
+ {getWarningContent(inconsistencyWarnings)}
+
}
>
@@ -79,9 +83,9 @@ function ThumbnailFooter({
) : (
- )}
+ )}
- );
+ );
};
const getSeriesInformation = (
SeriesNumber,
@@ -92,21 +96,27 @@ function ThumbnailFooter({
if (!SeriesNumber && !InstanceNumber && !numImageFrames) {
return;
}
- const seriesInformation =
+ const seriesInformation = (
{getInfo(SeriesNumber, 'S:')}
{getInfo(InstanceNumber, 'I:')}
{getInfo(numImageFrames, '', 'image-frames')}
{getWarningInfo(SeriesNumber, inconsistencyWarnings)}
+ );
- return (seriesInformation);
+ return seriesInformation;
};
return (
{SeriesDescription}
- {getSeriesInformation(SeriesNumber, InstanceNumber, numImageFrames, inconsistencyWarnings)}
+ {getSeriesInformation(
+ SeriesNumber,
+ InstanceNumber,
+ numImageFrames,
+ inconsistencyWarnings
+ )}
);
}
@@ -124,14 +134,37 @@ function Thumbnail(props) {
SeriesDescription,
SeriesNumber,
hasWarnings,
- stackPercentComplete,
StudyInstanceUID,
onClick,
onDoubleClick,
onMouseDown,
supportsDrag,
+ showProgressBar,
} = props;
+ const [stackPercentComplete, setStackPercentComplete] = useState(0);
+ useEffect(() => {
+ const onProgressChange = ({ detail }) => {
+ const { progressId, progressData } = detail;
+ if (`StackProgress:${displaySetInstanceUID}` === progressId) {
+ const percent = progressData ? progressData.percentComplete : 0;
+ setStackPercentComplete(percent);
+ }
+ };
+
+ document.addEventListener(
+ StudyLoadingListener.events.OnProgress,
+ onProgressChange
+ );
+
+ return () => {
+ document.removeEventListener(
+ StudyLoadingListener.events.OnProgress,
+ onProgressChange
+ );
+ };
+ }, [displaySetInstanceUID]);
+
const [collectedProps, drag, dragPreview] = useDrag({
// `droppedItem` in `dropTarget`
// The only data it will have access to
@@ -164,6 +197,7 @@ function Thumbnail(props) {
imageId={imageId}
error={error}
stackPercentComplete={stackPercentComplete}
+ showProgressBar={showProgressBar}
/>
)}
{/* SHOW TEXT ALTERNATIVE */}
@@ -203,6 +237,7 @@ Thumbnail.propTypes = {
onDoubleClick: PropTypes.func,
onClick: PropTypes.func,
onMouseDown: PropTypes.func,
+ showProgressBar: PropTypes.bool,
};
Thumbnail.defaultProps = {
diff --git a/platform/viewer/public/config/default.js b/platform/viewer/public/config/default.js
index 7bc3bc78e..9ca1920db 100644
--- a/platform/viewer/public/config/default.js
+++ b/platform/viewer/public/config/default.js
@@ -5,6 +5,15 @@ window.config = {
showStudyList: true,
filterQueryParam: false,
disableServersCache: false,
+ studyPrefetcher: {
+ enabled: true,
+ order: 'closest',
+ displaySetCount: 3,
+ preventCache: false,
+ prefetchDisplaySetsTimeout: 300,
+ displayProgress: true,
+ includeActiveDisplaySet: true,
+ },
servers: {
dicomWeb: [
{
diff --git a/platform/viewer/public/config/netlify.js b/platform/viewer/public/config/netlify.js
index b85f5b0ac..497d1135b 100644
--- a/platform/viewer/public/config/netlify.js
+++ b/platform/viewer/public/config/netlify.js
@@ -1,6 +1,15 @@
window.config = {
routerBasename: '/pwa',
showStudyList: true,
+ studyPrefetcher: {
+ enabled: true,
+ order: 'closest',
+ displaySetCount: 3,
+ preventCache: false,
+ prefetchDisplaySetsTimeout: 300,
+ displayProgress: true,
+ includeActiveDisplaySet: true,
+ },
servers: {
dicomWeb: [
{
diff --git a/platform/viewer/src/components/StudyLoadingMonitor.js b/platform/viewer/src/components/StudyLoadingMonitor.js
index 75698dc24..88a9b0a6b 100644
--- a/platform/viewer/src/components/StudyLoadingMonitor.js
+++ b/platform/viewer/src/components/StudyLoadingMonitor.js
@@ -1,42 +1,23 @@
-import { Component } from "react";
-import PropTypes from "prop-types";
-import OHIF from "@ohif/core";
+import { useEffect } from 'react';
+import OHIF from '@ohif/core';
-class StudyLoadingMonitor extends Component {
- static propTypes = {
- studies: PropTypes.array.isRequired,
- setStudyLoadingProgress: PropTypes.func.isRequired,
- clearStudyLoadingProgress: PropTypes.func.isRequired
- };
+const { StudyLoadingListener } = OHIF.classes;
- componentDidMount() {
- // TODO: This is pretty ugly. The thing is that the StudyLoadingListener
- // needs to update the Redux store, but shouldn't know that it exists.
- // I am therefore passing in some functions to update the store instead,
- // but this should definitely be cleaned up somehow.
- const options = {
- _setProgressData: (progressId, progressData) => {
- this.props.setStudyLoadingProgress(progressId, progressData);
- },
- _clearProgressById: progressId => {
- this.props.clearStudyLoadingProgress(progressId);
- }
+const StudyLoadingMonitor = ({ studies }) => {
+ useEffect(() => {
+ const studyLoadingListener = StudyLoadingListener.getInstance();
+
+ if (studies && studies.length > 0) {
+ studyLoadingListener.clear();
+ studyLoadingListener.addStudies(studies);
+ }
+
+ return () => {
+ studyLoadingListener.clear();
};
+ }, [studies]);
- const { StudyLoadingListener } = OHIF.classes;
- this.studyLoadingListener = StudyLoadingListener.getInstance(options);
- this.studyLoadingListener.clear();
- this.studyLoadingListener.addStudies(this.props.studies);
- }
-
- render() {
- return null;
- }
-
- componentWillUnmount() {
- // Destroy stack loading listeners when we close the viewer
- this.studyLoadingListener.clear();
- }
-}
+ return null;
+};
export default StudyLoadingMonitor;
diff --git a/platform/viewer/src/components/StudyPrefetcher.css b/platform/viewer/src/components/StudyPrefetcher.css
new file mode 100644
index 000000000..fe9acbfef
--- /dev/null
+++ b/platform/viewer/src/components/StudyPrefetcher.css
@@ -0,0 +1,15 @@
+.StudyPrefetcher {
+ height: 5px;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ background-color: var(--default-color);
+}
+
+.StudyPrefetcher .item {
+ height: 5px;
+}
+
+.StudyPrefetcher .item.cached {
+ background-color: black;
+}
diff --git a/platform/viewer/src/components/StudyPrefetcher.js b/platform/viewer/src/components/StudyPrefetcher.js
index f6500776b..2a0bb4763 100644
--- a/platform/viewer/src/components/StudyPrefetcher.js
+++ b/platform/viewer/src/components/StudyPrefetcher.js
@@ -1,29 +1,93 @@
-import { Component } from "react";
-import PropTypes from "prop-types";
-import OHIF from "@ohif/core";
+import React, { useEffect } from 'react';
+import { classes, utils } from '@ohif/core';
+import PropTypes from 'prop-types';
+import cs from 'cornerstone-core';
-const { StudyPrefetcher } = OHIF.classes;
+import './StudyPrefetcher.css';
-class StudyPrefetcherComponent extends Component {
- static propTypes = {
- studies: PropTypes.array
- };
+const StudyPrefetcher = ({ studies, options }) => {
+ useEffect(() => {
+ const studyPrefetcher = classes.StudyPrefetcher.getInstance(
+ studies,
+ options
+ );
+ const studiesMetadata = studies.map(s =>
+ utils.studyMetadataManager.get(s.StudyInstanceUID)
+ );
+ studyPrefetcher.setStudies(studiesMetadata);
- componentDidMount() {
- const { studies } = this.props;
+ const onNewImage = ({ detail }) => {
+ /**
+ * When images are cached the viewport will load instantly and
+ * the display sets will not be available at this point in time.
+ *
+ * This code add display sets and updates the study prefetcher metadata.
+ */
+ const studiesMetadata = studies.map(s => {
+ const studyMetadata = utils.studyMetadataManager.get(
+ s.StudyInstanceUID
+ );
+ const displaySets = studyMetadata.getDisplaySets();
+ if (!displaySets || displaySets.length < 1) {
+ s.displaySets.forEach(ds => studyMetadata.addDisplaySet(ds));
+ }
+ return studyMetadata;
+ });
+ studyPrefetcher.setStudies(studiesMetadata);
- this.studyPrefetcher = StudyPrefetcher.getInstance();
- this.studyPrefetcher.setStudies(studies);
- }
+ const study = studyPrefetcher.getStudy(detail.image);
+ const series = studyPrefetcher.getSeries(study, detail.image);
+ const instance = studyPrefetcher.getInstance(series, detail.image);
- render() {
- return null;
- }
+ if (study.displaySets && study.displaySets.length > 0) {
+ const {
+ displaySetInstanceUID,
+ } = studyPrefetcher.getDisplaySetBySOPInstanceUID(
+ study.displaySets,
+ instance
+ );
+ studyPrefetcher.prefetch(detail.element, displaySetInstanceUID);
+ }
+ };
- componentWillUnmount() {
- // Stop prefetching when we close the viewer
- this.studyPrefetcher.destroy();
- }
-}
+ const onElementEnabled = ({ detail }) => {
+ detail.element.addEventListener(cs.EVENTS.NEW_IMAGE, onNewImage);
+ };
-export default StudyPrefetcherComponent;
+ cs.events.addEventListener(cs.EVENTS.ELEMENT_ENABLED, onElementEnabled);
+
+ return () => {
+ cs.events.removeEventListener(
+ cs.EVENTS.ELEMENT_ENABLED,
+ onElementEnabled
+ );
+ studyPrefetcher.destroy();
+ };
+ }, [options, studies]);
+
+ return null;
+};
+
+StudyPrefetcher.propTypes = {
+ studies: PropTypes.array.isRequired,
+ options: PropTypes.shape({
+ enabled: PropTypes.bool,
+ order: PropTypes.string,
+ displaySetCount: PropTypes.number,
+ preventCache: PropTypes.bool,
+ prefetchDisplaySetsTimeout: PropTypes.number,
+ includeActiveDisplaySet: PropTypes.bool,
+ }),
+};
+
+StudyPrefetcher.defaultProps = {
+ options: {
+ order: 'closest',
+ displaySetCount: 1,
+ preventCache: false,
+ prefetchDisplaySetsTimeout: 300,
+ includeActiveDisplaySet: false,
+ },
+};
+
+export default StudyPrefetcher;
diff --git a/platform/viewer/src/connectedComponents/ConnectedStudyBrowser.js b/platform/viewer/src/connectedComponents/ConnectedStudyBrowser.js
index 22efaeb12..0f6a129ce 100644
--- a/platform/viewer/src/connectedComponents/ConnectedStudyBrowser.js
+++ b/platform/viewer/src/connectedComponents/ConnectedStudyBrowser.js
@@ -1,44 +1,11 @@
import OHIF from '@ohif/core';
import { connect } from 'react-redux';
-import { StudyBrowser } from '@ohif/ui';
-import cloneDeep from 'lodash.clonedeep';
import findDisplaySetByUID from './findDisplaySetByUID';
import { servicesManager } from './../App.js';
-
-const { studyMetadataManager } = OHIF.utils;
+import { StudyBrowser } from '../../../ui/src/components/studyBrowser/StudyBrowser';
const { setActiveViewportSpecificData } = OHIF.redux.actions;
-// TODO
-// - Determine in which display set is active from Redux (activeViewportIndex and layout viewportData)
-// - Pass in errors and stack loading progress from Redux
-const mapStateToProps = (state, ownProps) => {
- // If we know that the stack loading progress details have changed,
- // we can try to update the component state so that the thumbnail
- // progress bar is updated
- const stackLoadingProgressMap = state.loading.progress;
- const studiesWithLoadingData = cloneDeep(ownProps.studies);
-
- studiesWithLoadingData.forEach(study => {
- study.thumbnails.forEach(data => {
- const { displaySetInstanceUID } = data;
- const stackId = `StackProgress:${displaySetInstanceUID}`;
- const stackProgressData = stackLoadingProgressMap[stackId];
-
- let stackPercentComplete = 0;
- if (stackProgressData) {
- stackPercentComplete = stackProgressData.percentComplete;
- }
-
- data.stackPercentComplete = stackPercentComplete;
- });
- });
-
- return {
- studies: studiesWithLoadingData,
- };
-};
-
const mapDispatchToProps = (dispatch, ownProps) => {
return {
onThumbnailClick: displaySetInstanceUID => {
@@ -50,7 +17,10 @@ const mapDispatchToProps = (dispatch, ownProps) => {
if (displaySet.isDerived) {
const { Modality } = displaySet;
if (Modality === 'SEG' && servicesManager) {
- const {LoggerService, UINotificationService} = servicesManager.services;
+ const {
+ LoggerService,
+ UINotificationService,
+ } = servicesManager.services;
const onDisplaySetLoadFailureHandler = error => {
LoggerService.error({ error, message: error.message });
UINotificationService.show({
@@ -61,20 +31,25 @@ const mapDispatchToProps = (dispatch, ownProps) => {
});
};
- const {referencedDisplaySet, activatedLabelmapPromise} = displaySet.getSourceDisplaySet(
+ const {
+ referencedDisplaySet,
+ activatedLabelmapPromise,
+ } = displaySet.getSourceDisplaySet(
ownProps.studyMetadata,
true,
onDisplaySetLoadFailureHandler
);
displaySet = referencedDisplaySet;
- activatedLabelmapPromise.then((activatedLabelmapIndex) => {
- const selectionFired = new CustomEvent("extensiondicomsegmentationsegselected", {
- "detail": {"activatedLabelmapIndex":activatedLabelmapIndex}
- });
+ activatedLabelmapPromise.then(activatedLabelmapIndex => {
+ const selectionFired = new CustomEvent(
+ 'extensiondicomsegmentationsegselected',
+ {
+ detail: { activatedLabelmapIndex: activatedLabelmapIndex },
+ }
+ );
document.dispatchEvent(selectionFired);
});
-
} else {
displaySet = displaySet.getSourceDisplaySet(ownProps.studyMetadata);
}
@@ -96,7 +71,7 @@ const mapDispatchToProps = (dispatch, ownProps) => {
};
const ConnectedStudyBrowser = connect(
- mapStateToProps,
+ null,
mapDispatchToProps
)(StudyBrowser);
diff --git a/platform/viewer/src/connectedComponents/ConnectedStudyLoadingMonitor.js b/platform/viewer/src/connectedComponents/ConnectedStudyLoadingMonitor.js
deleted file mode 100644
index 8bfffe88a..000000000
--- a/platform/viewer/src/connectedComponents/ConnectedStudyLoadingMonitor.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { connect } from "react-redux";
-import StudyLoadingMonitor from "../components/StudyLoadingMonitor.js";
-import OHIF from "@ohif/core";
-
-const {
- setStudyLoadingProgress,
- clearStudyLoadingProgress
-} = OHIF.redux.actions;
-
-const mapDispatchToProps = dispatch => {
- return {
- setStudyLoadingProgress: (progressId, progressData) => {
- dispatch(setStudyLoadingProgress(progressId, progressData));
- },
- clearStudyLoadingProgress: progressId => {
- dispatch(clearStudyLoadingProgress(progressId));
- }
- };
-};
-
-const ConnectedStudyLoadingMonitor = connect(
- null,
- mapDispatchToProps
-)(StudyLoadingMonitor);
-
-export default ConnectedStudyLoadingMonitor;
diff --git a/platform/viewer/src/connectedComponents/Viewer.js b/platform/viewer/src/connectedComponents/Viewer.js
index c4e2b25d2..e6152c872 100644
--- a/platform/viewer/src/connectedComponents/Viewer.js
+++ b/platform/viewer/src/connectedComponents/Viewer.js
@@ -1,11 +1,10 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
-import { useLogger } from '@ohif/ui';
-
import OHIF, { MODULE_TYPES, DICOMSR } from '@ohif/core';
import { withDialog } from '@ohif/ui';
import moment from 'moment';
+
import ConnectedHeader from './ConnectedHeader.js';
import ToolbarRow from './ToolbarRow.js';
import ConnectedStudyBrowser from './ConnectedStudyBrowser.js';
@@ -14,7 +13,6 @@ import SidePanel from './../components/SidePanel.js';
import ErrorBoundaryDialog from './../components/ErrorBoundaryDialog';
import { extensionManager } from './../App.js';
import { ReconstructionIssues } from './../../../core/src/enums.js';
-import dcmjs from 'dcmjs';
// Contexts
import WhiteLabelingContext from '../context/WhiteLabelingContext.js';
@@ -22,8 +20,8 @@ import UserManagerContext from '../context/UserManagerContext';
import AppContext from '../context/AppContext';
import './Viewer.css';
-import { finished } from 'stream';
-import { cornerstoneWADOImageLoader } from 'cornerstone-wado-image-loader';
+import StudyPrefetcher from '../components/StudyPrefetcher.js';
+import StudyLoadingMonitor from '../components/StudyLoadingMonitor';
class Viewer extends Component {
static propTypes = {
@@ -197,11 +195,17 @@ class Viewer extends Component {
]);
}
- const activeViewport = this.props.viewports[this.props.activeViewportIndex];
- const activeDisplaySetInstanceUID =
- activeViewport ? activeViewport.displaySetInstanceUID : undefined;
+ const activeViewport = this.props.viewports[
+ this.props.activeViewportIndex
+ ];
+ const activeDisplaySetInstanceUID = activeViewport
+ ? activeViewport.displaySetInstanceUID
+ : undefined;
this.setState({
- thumbnails: _mapStudiesToThumbnails(studies, activeDisplaySetInstanceUID),
+ thumbnails: _mapStudiesToThumbnails(
+ studies,
+ activeDisplaySetInstanceUID
+ ),
});
}
}
@@ -211,24 +215,31 @@ class Viewer extends Component {
studies,
isStudyLoaded,
activeViewportIndex,
- viewports
+ viewports,
} = this.props;
const activeViewport = viewports[activeViewportIndex];
- const activeDisplaySetInstanceUID =
- activeViewport ? activeViewport.displaySetInstanceUID : undefined;
+ const activeDisplaySetInstanceUID = activeViewport
+ ? activeViewport.displaySetInstanceUID
+ : undefined;
- const prevActiveViewport = prevProps.viewports[prevProps.activeViewportIndex];
- const prevActiveDisplaySetInstanceUID =
- prevActiveViewport ? prevActiveViewport.displaySetInstanceUID : undefined;
+ const prevActiveViewport =
+ prevProps.viewports[prevProps.activeViewportIndex];
+ const prevActiveDisplaySetInstanceUID = prevActiveViewport
+ ? prevActiveViewport.displaySetInstanceUID
+ : undefined;
- if (studies !== prevProps.studies ||
+ if (
+ studies !== prevProps.studies ||
activeViewportIndex !== prevProps.activeViewportIndex ||
activeDisplaySetInstanceUID !== prevActiveDisplaySetInstanceUID
- ) {
-
+ ) {
this.setState({
- thumbnails: _mapStudiesToThumbnails(studies, activeDisplaySetInstanceUID),
+ thumbnails: _mapStudiesToThumbnails(
+ studies,
+ activeDisplaySetInstanceUID
+ ),
+ activeDisplaySetInstanceUID,
});
}
if (isStudyLoaded && isStudyLoaded !== prevProps.isStudyLoaded) {
@@ -288,14 +299,12 @@ class Viewer extends Component {
)}
-
{/* TOOLBAR */}
-
- {/**/}
- {/**/}
-
+
+ {appContext => }
+
{/* VIEWPORTS + SIDEPANELS */}
{/* LEFT */}
@@ -348,10 +356,24 @@ class Viewer extends Component {
activeIndex={this.props.activeViewportIndex}
/>
) : (
-
+
+ {appContext => {
+ const { appConfig } = appContext;
+ const { studyPrefetcher } = appConfig;
+ const { thumbnails } = this.state;
+ return (
+
+ );
+ }}
+
)}
@@ -359,6 +381,22 @@ class Viewer extends Component {
{/* MAIN */}
+
+ {appContext => {
+ const { appConfig } = appContext;
+ const { studyPrefetcher } = appConfig;
+ const { studies } = this.props;
+ return (
+ studyPrefetcher &&
+ studyPrefetcher.enabled && (
+
+ )
+ );
+ }}
+
{
switch (warning) {
case ReconstructionIssues.DATASET_4D:
inconsistencyWarnings.push('The dataset is 4D.');
break;
case ReconstructionIssues.VARYING_IMAGESDIMENSIONS:
- inconsistencyWarnings.push('The dataset frames have different dimensions (rows, columns).');
+ inconsistencyWarnings.push(
+ 'The dataset frames have different dimensions (rows, columns).'
+ );
break;
case ReconstructionIssues.VARYING_IMAGESCOMPONENTS:
- inconsistencyWarnings.push('The dataset frames have different components (Sample per pixel).');
+ inconsistencyWarnings.push(
+ 'The dataset frames have different components (Sample per pixel).'
+ );
break;
case ReconstructionIssues.VARYING_IMAGESORIENTATION:
- inconsistencyWarnings.push('The dataset frames have different orientation.');
+ inconsistencyWarnings.push(
+ 'The dataset frames have different orientation.'
+ );
break;
case ReconstructionIssues.IRREGULAR_SPACING:
- inconsistencyWarnings.push('The dataset frames have different pixel spacing.');
+ inconsistencyWarnings.push(
+ 'The dataset frames have different pixel spacing.'
+ );
break;
case ReconstructionIssues.MULTIFFRAMES:
inconsistencyWarnings.push('The dataset is a multiframes.');
@@ -443,13 +495,22 @@ const _checkForSeriesInconsistencesWarnings = async function (displaySet, studie
break;
}
});
- inconsistencyWarnings.push('The datasets is not a reconstructable 3D volume. MPR mode is not available.');
+ inconsistencyWarnings.push(
+ 'The datasets is not a reconstructable 3D volume. MPR mode is not available.'
+ );
}
- if (displaySet.missingFrames &&
+ if (
+ displaySet.missingFrames &&
(!displaySet.reconstructionIssues ||
- (displaySet.reconstructionIssues && !displaySet.reconstructionIssues.find(warn => warn === ReconstructionIssues.DATASET_4D)))) {
- inconsistencyWarnings.push('The datasets is missing frames: ' + displaySet.missingFrames + '.');
+ (displaySet.reconstructionIssues &&
+ !displaySet.reconstructionIssues.find(
+ warn => warn === ReconstructionIssues.DATASET_4D
+ )))
+ ) {
+ inconsistencyWarnings.push(
+ 'The datasets is missing frames: ' + displaySet.missingFrames + '.'
+ );
}
} else {
const segMetadata = displaySet.metadata;
@@ -458,24 +519,31 @@ const _checkForSeriesInconsistencesWarnings = async function (displaySet, studie
return inconsistencyWarnings;
}
- const { referencedDisplaySet } = displaySet.getSourceDisplaySet(studies, false);
+ const { referencedDisplaySet } = displaySet.getSourceDisplaySet(
+ studies,
+ false
+ );
if (!referencedDisplaySet) {
displaySet.inconsistencyWarnings = inconsistencyWarnings;
return inconsistencyWarnings;
}
- const imageIds = referencedDisplaySet.images.map(image => image.getImageId());
+ const imageIds = referencedDisplaySet.images.map(image =>
+ image.getImageId()
+ );
if (!imageIds || imageIds.length === 0) {
displaySet.inconsistencyWarnings = inconsistencyWarnings;
return inconsistencyWarnings;
}
for (
- let i = 0, groupsLen = segMetadata.PerFrameFunctionalGroupsSequence.length;
+ let i = 0,
+ groupsLen = segMetadata.PerFrameFunctionalGroupsSequence.length;
i < groupsLen;
++i
) {
- const PerFrameFunctionalGroups = segMetadata.PerFrameFunctionalGroupsSequence[i];
+ const PerFrameFunctionalGroups =
+ segMetadata.PerFrameFunctionalGroupsSequence[i];
if (!PerFrameFunctionalGroups) {
continue;
}
@@ -485,29 +553,27 @@ const _checkForSeriesInconsistencesWarnings = async function (displaySet, studie
SourceImageSequence = segMetadata.SourceImageSequence[i];
} else if (PerFrameFunctionalGroups.DerivationImageSequence) {
SourceImageSequence =
- PerFrameFunctionalGroups.DerivationImageSequence
- .SourceImageSequence;
+ PerFrameFunctionalGroups.DerivationImageSequence.SourceImageSequence;
}
if (!SourceImageSequence) {
if (inconsistencyWarnings.length === 0) {
- const warningMessage = 'The segmentation ' +
+ const warningMessage =
+ 'The segmentation ' +
'has frames out of plane respect to the source images.';
- inconsistencyWarnings.push(warningMessage);
+ inconsistencyWarnings.push(warningMessage);
}
continue;
}
- const {
- ReferencedSOPInstanceUID,
- } = SourceImageSequence;
+ const { ReferencedSOPInstanceUID } = SourceImageSequence;
const imageId = imageIds.find(imageId => {
const sopCommonModule = cornerstone.metaData.get(
- "sopCommonModule",
- imageId
+ 'sopCommonModule',
+ imageId
);
if (!sopCommonModule) {
- return;
+ return;
}
return sopCommonModule.sopInstanceUID === ReferencedSOPInstanceUID;
@@ -517,33 +583,32 @@ const _checkForSeriesInconsistencesWarnings = async function (displaySet, studie
continue;
}
- const sourceImageMetadata = cornerstone.metaData.get(
- "instance",
- imageId
- );
+ const sourceImageMetadata = cornerstone.metaData.get('instance', imageId);
if (
segMetadata.Rows !== sourceImageMetadata.Rows ||
segMetadata.Columns !== sourceImageMetadata.Columns
) {
- const warningMessage = 'The segmentation ' +
+ const warningMessage =
+ 'The segmentation ' +
'has frames with different geometry ' +
'dimensions (Rows and Columns) respect to the source images.';
- inconsistencyWarnings.push(warningMessage);
+ inconsistencyWarnings.push(warningMessage);
break;
}
}
if (inconsistencyWarnings.length !== 0) {
- const warningMessage = 'The segmentation format is not supported yet. ' +
+ const warningMessage =
+ 'The segmentation format is not supported yet. ' +
'The segmentation data (segments) could not be loaded.';
- inconsistencyWarnings.push(warningMessage);
+ inconsistencyWarnings.push(warningMessage);
}
}
// cache the warnings
displaySet.inconsistencyWarnings = inconsistencyWarnings;
return inconsistencyWarnings;
-}
+};
/**
* Checks if display set is active, i.e. if the series is currently shown
@@ -562,30 +627,42 @@ const _checkForSeriesInconsistencesWarnings = async function (displaySet, studie
* @param {string} activeDisplaySetInstanceUID
* @returns {boolean} is active.
*/
- const _isDisplaySetActive = function(displaySet, studies, activeDisplaySetInstanceUID) {
+const _isDisplaySetActive = function(
+ displaySet,
+ studies,
+ activeDisplaySetInstanceUID
+) {
let active = false;
- const {
- displaySetInstanceUID,
- } = displaySet;
+ const { displaySetInstanceUID } = displaySet;
// TO DO: in the future, we could possibly support new modalities
// we should have a list of all modalities here, instead of having hard coded checks
- if (displaySet.Modality !== 'SEG' &&
+ if (
+ displaySet.Modality !== 'SEG' &&
displaySet.Modality !== 'RTSTRUCT' &&
- displaySet.Modality !== 'RTDOSE') {
+ displaySet.Modality !== 'RTDOSE'
+ ) {
active = activeDisplaySetInstanceUID === displaySetInstanceUID;
- } else if (displaySet.getSourceDisplaySet){
+ } else if (displaySet.getSourceDisplaySet) {
if (displaySet.Modality === 'SEG') {
- const { referencedDisplaySet } = displaySet.getSourceDisplaySet(studies, false);
- active = referencedDisplaySet ?
- activeDisplaySetInstanceUID === referencedDisplaySet.displaySetInstanceUID :
- false;
+ const { referencedDisplaySet } = displaySet.getSourceDisplaySet(
+ studies,
+ false
+ );
+ active = referencedDisplaySet
+ ? activeDisplaySetInstanceUID ===
+ referencedDisplaySet.displaySetInstanceUID
+ : false;
} else {
- const referencedDisplaySet = displaySet.getSourceDisplaySet(studies, false);
- active = referencedDisplaySet ?
- activeDisplaySetInstanceUID === referencedDisplaySet.displaySetInstanceUID :
- false;
+ const referencedDisplaySet = displaySet.getSourceDisplaySet(
+ studies,
+ false
+ );
+ active = referencedDisplaySet
+ ? activeDisplaySetInstanceUID ===
+ referencedDisplaySet.displaySetInstanceUID
+ : false;
}
}
@@ -629,11 +706,17 @@ const _mapStudiesToThumbnails = function(studies, activeDisplaySetInstanceUID) {
altImageText = displaySet.Modality ? displaySet.Modality : 'UN';
}
- const hasWarnings = _checkForSeriesInconsistencesWarnings(displaySet, studies);
- const active = _isDisplaySetActive(displaySet, studies, activeDisplaySetInstanceUID)
+ const hasWarnings = _checkForSeriesInconsistencesWarnings(
+ displaySet,
+ studies
+ );
return {
- active,
+ active: _isDisplaySetActive(
+ displaySet,
+ studies,
+ activeDisplaySetInstanceUID
+ ),
imageId,
altImageText,
displaySetInstanceUID,