Update ohif-cornerstone-extension to use latest ohif-core

This commit is contained in:
Erik Ziegler committed 2019-02-13 14:18:36 +01:00
1 parent b0a5d07498
commit dd26fcb1cd
4 files changed
+70 -25

No files matched your search

@@ -9,12 +9,6 @@ import handleSegmentationStorage from './handleSegmentationStorage.js';
const { StackManager } = OHIF.utils;
// Create the synchronizer used to update reference lines
OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer(
'cornerstonenewimage',
cornerstoneTools.updateImageSynchronizer
);
// Metadata configuration
const metadataProvider = new OHIF.cornerstone.MetadataProvider();
@@ -162,7 +156,9 @@ class OHIFCornerstoneViewport extends Component {
const { displaySetInstanceUid } = displaySet;
const prevDisplaySet = prevProps.viewportData.displaySet;
if (displaySet.displaySetInstanceUid !== prevDisplaySet.displaySetInstanceUid) {
if (
displaySet.displaySetInstanceUid !== prevDisplaySet.displaySetInstanceUid
) {
this.setStateFromProps();
}
}
@@ -173,18 +169,22 @@ class OHIFCornerstoneViewport extends Component {
// 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 React.cloneElement(child, { viewportIndex: this.props.viewportIndex, key: index})
return React.cloneElement(child, {
viewportIndex: this.props.viewportIndex,
key: index
});
});
}
return (<>
{this.state.viewportData && (
<ConnectedCornerstoneViewport
viewportData={this.state.viewportData}
viewportIndex={this.props.viewportIndex}
/>
)}
{childrenWithProps}
return (
<>
{this.state.viewportData && (
<ConnectedCornerstoneViewport
viewportData={this.state.viewportData}
viewportIndex={this.props.viewportIndex}
/>
)}
{childrenWithProps}
</>
);
}
@@ -2,7 +2,6 @@ import cornerstone from 'cornerstone-core';
import cornerstoneMath from 'cornerstone-math';
import cornerstoneTools from 'cornerstone-tools';
import Hammer from 'hammerjs';
import OHIF from 'ohif-core';
// For debugging
window.cornerstoneTools = cornerstoneTools;
@@ -12,8 +11,6 @@ cornerstoneTools.external.Hammer = Hammer;
cornerstoneTools.external.cornerstoneMath = cornerstoneMath;
cornerstoneTools.init();
OHIF.external.cornerstoneTools = cornerstoneTools;
// Set the tool font and font size
// context.font = "[style] [variant] [weight] [size]/[line height] [font family]";
const fontFamily =