* Remove debounce and use react-cornerstone-viewport native debounce time * fix: 🐛 Infinite frame index change when quickly jumping between This change removes the debounced callback function from the app and instead uses the native debounce time from react-cornerstone-viewport. This change allows the application to set its state in a more controled way. ✅ Closes: #1733 * Bump rcv version Co-authored-by: James Petts <jamesapetts@gmail.com>
255 lines
6.1 KiB
JavaScript
255 lines
6.1 KiB
JavaScript
import React, { Component } from 'react';
|
|
|
|
import ConnectedCornerstoneViewport from './ConnectedCornerstoneViewport';
|
|
import OHIF from '@ohif/core';
|
|
import PropTypes from 'prop-types';
|
|
import cornerstone from 'cornerstone-core';
|
|
|
|
const { StackManager } = OHIF.utils;
|
|
|
|
class OHIFCornerstoneViewport extends Component {
|
|
state = {
|
|
viewportData: null,
|
|
};
|
|
|
|
static defaultProps = {
|
|
customProps: {},
|
|
};
|
|
|
|
static propTypes = {
|
|
studies: PropTypes.object,
|
|
displaySet: PropTypes.object,
|
|
viewportIndex: PropTypes.number,
|
|
children: PropTypes.node,
|
|
customProps: PropTypes.object,
|
|
};
|
|
|
|
static id = 'OHIFCornerstoneViewport';
|
|
|
|
static init() {
|
|
console.log('OHIFCornerstoneViewport init()');
|
|
}
|
|
|
|
static destroy() {
|
|
console.log('OHIFCornerstoneViewport destroy()');
|
|
StackManager.clearStacks();
|
|
}
|
|
|
|
/**
|
|
* Obtain the CornerstoneTools Stack for the specified display set.
|
|
*
|
|
* @param {Object[]} studies
|
|
* @param {String} StudyInstanceUID
|
|
* @param {String} displaySetInstanceUID
|
|
* @param {String} [SOPInstanceUID]
|
|
* @param {Number} [frameIndex=1]
|
|
* @return {Object} CornerstoneTools Stack
|
|
*/
|
|
static getCornerstoneStack(
|
|
studies,
|
|
StudyInstanceUID,
|
|
displaySetInstanceUID,
|
|
SOPInstanceUID,
|
|
frameIndex = 0
|
|
) {
|
|
if (!studies || !studies.length) {
|
|
throw new Error('Studies not provided.');
|
|
}
|
|
|
|
if (!StudyInstanceUID) {
|
|
throw new Error('StudyInstanceUID not provided.');
|
|
}
|
|
|
|
if (!displaySetInstanceUID) {
|
|
throw new Error('StudyInstanceUID not provided.');
|
|
}
|
|
|
|
// Create shortcut to displaySet
|
|
const study = studies.find(
|
|
study => study.StudyInstanceUID === StudyInstanceUID
|
|
);
|
|
|
|
if (!study) {
|
|
throw new Error('Study not found.');
|
|
}
|
|
|
|
const displaySet = study.displaySets.find(set => {
|
|
return set.displaySetInstanceUID === displaySetInstanceUID;
|
|
});
|
|
|
|
if (!displaySet) {
|
|
throw new Error('Display Set not found.');
|
|
}
|
|
|
|
// Get stack from Stack Manager
|
|
const storedStack = StackManager.findOrCreateStack(study, displaySet);
|
|
|
|
// Clone the stack here so we don't mutate it
|
|
const stack = Object.assign({}, storedStack);
|
|
stack.currentImageIdIndex = frameIndex;
|
|
|
|
if (SOPInstanceUID) {
|
|
const index = stack.imageIds.findIndex(imageId => {
|
|
const imageIdSOPInstanceUID = cornerstone.metaData.get(
|
|
'SOPInstanceUID',
|
|
imageId
|
|
);
|
|
|
|
return imageIdSOPInstanceUID === SOPInstanceUID;
|
|
});
|
|
|
|
if (index > -1) {
|
|
stack.currentImageIdIndex = index;
|
|
} else {
|
|
console.warn(
|
|
'SOPInstanceUID provided was not found in specified DisplaySet'
|
|
);
|
|
}
|
|
}
|
|
|
|
return stack;
|
|
}
|
|
|
|
getViewportData = async (
|
|
studies,
|
|
StudyInstanceUID,
|
|
displaySetInstanceUID,
|
|
SOPInstanceUID,
|
|
frameIndex
|
|
) => {
|
|
let viewportData;
|
|
|
|
const stack = OHIFCornerstoneViewport.getCornerstoneStack(
|
|
studies,
|
|
StudyInstanceUID,
|
|
displaySetInstanceUID,
|
|
SOPInstanceUID,
|
|
frameIndex
|
|
);
|
|
|
|
viewportData = {
|
|
StudyInstanceUID,
|
|
displaySetInstanceUID,
|
|
stack,
|
|
};
|
|
|
|
return viewportData;
|
|
};
|
|
|
|
setStateFromProps() {
|
|
const { studies, displaySet } = this.props.viewportData;
|
|
const {
|
|
StudyInstanceUID,
|
|
displaySetInstanceUID,
|
|
sopClassUIDs,
|
|
SOPInstanceUID,
|
|
frameIndex,
|
|
} = displaySet;
|
|
|
|
if (!StudyInstanceUID || !displaySetInstanceUID) {
|
|
return;
|
|
}
|
|
|
|
if (sopClassUIDs && sopClassUIDs.length > 1) {
|
|
console.warn(
|
|
'More than one SOPClassUID in the same series is not yet supported.'
|
|
);
|
|
}
|
|
|
|
this.getViewportData(
|
|
studies,
|
|
StudyInstanceUID,
|
|
displaySetInstanceUID,
|
|
SOPInstanceUID,
|
|
frameIndex
|
|
).then(viewportData => {
|
|
this.setState({
|
|
viewportData,
|
|
});
|
|
});
|
|
}
|
|
|
|
componentDidMount() {
|
|
this.setStateFromProps();
|
|
}
|
|
|
|
componentDidUpdate(prevProps) {
|
|
const { displaySet } = this.props.viewportData;
|
|
const prevDisplaySet = prevProps.viewportData.displaySet;
|
|
|
|
if (
|
|
displaySet.displaySetInstanceUID !==
|
|
prevDisplaySet.displaySetInstanceUID ||
|
|
displaySet.SOPInstanceUID !== prevDisplaySet.SOPInstanceUID ||
|
|
displaySet.frameIndex !== prevDisplaySet.frameIndex
|
|
) {
|
|
this.setStateFromProps();
|
|
}
|
|
}
|
|
|
|
render() {
|
|
let childrenWithProps = null;
|
|
|
|
if (!this.state.viewportData) {
|
|
return null;
|
|
}
|
|
const { viewportIndex } = this.props;
|
|
const {
|
|
imageIds,
|
|
currentImageIdIndex,
|
|
// If this comes from the instance, would be a better default
|
|
// `FrameTime` in the instance
|
|
// frameRate = 0,
|
|
} = this.state.viewportData.stack;
|
|
|
|
// TODO: Does it make more sense to use Context?
|
|
if (this.props.children && this.props.children.length) {
|
|
childrenWithProps = this.props.children.map((child, index) => {
|
|
return (
|
|
child &&
|
|
React.cloneElement(child, {
|
|
viewportIndex: this.props.viewportIndex,
|
|
key: index,
|
|
})
|
|
);
|
|
});
|
|
}
|
|
|
|
const newImageHandler = ({ currentImageIdIndex, sopInstanceUid }) => {
|
|
const { displaySet } = this.props.viewportData;
|
|
const { StudyInstanceUID } = displaySet;
|
|
|
|
if (currentImageIdIndex > 0) {
|
|
this.props.onNewImage({
|
|
StudyInstanceUID,
|
|
SOPInstanceUID: sopInstanceUid,
|
|
frameIndex: currentImageIdIndex,
|
|
activeViewportIndex: viewportIndex,
|
|
});
|
|
}
|
|
};
|
|
|
|
return (
|
|
<>
|
|
<ConnectedCornerstoneViewport
|
|
viewportIndex={viewportIndex}
|
|
imageIds={imageIds}
|
|
imageIdIndex={currentImageIdIndex}
|
|
onNewImage={newImageHandler}
|
|
onNewImageDebounceTime={700}
|
|
// ~~ Connected (From REDUX)
|
|
// frameRate={frameRate}
|
|
// isPlaying={false}
|
|
// isStackPrefetchEnabled={true}
|
|
// onElementEnabled={() => {}}
|
|
// setViewportActive{() => {}}
|
|
{...this.props.customProps}
|
|
/>
|
|
{childrenWithProps}
|
|
</>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default OHIFCornerstoneViewport;
|