diff --git a/OHIFViewer-react/package.json b/OHIFViewer-react/package.json index 4e2465d97..b31124371 100644 --- a/OHIFViewer-react/package.json +++ b/OHIFViewer-react/package.json @@ -18,7 +18,7 @@ "prop-types": "^15.6.2", "query-string": "^6.2.0", "react": "^16.4.1", - "react-cornerstone-viewport": "^0.1.3", + "react-cornerstone-viewport": "^0.1.4", "react-dom": "^16.4.1", "react-redux": "^6.0.0", "react-router": "^4.3.1", diff --git a/OHIFViewer-react/src/FlexboxLayout/ConnectedCornerstoneViewport.js b/OHIFViewer-react/src/FlexboxLayout/ConnectedCornerstoneViewport.js index 0deca841a..0b2a9c89c 100644 --- a/OHIFViewer-react/src/FlexboxLayout/ConnectedCornerstoneViewport.js +++ b/OHIFViewer-react/src/FlexboxLayout/ConnectedCornerstoneViewport.js @@ -8,6 +8,7 @@ const mapStateToProps = state => { const activeButton = state.tools.buttons.find(tool => tool.active === true); return { + layout: state.viewports.layout, activeViewportIndex: state.viewports.activeViewportIndex, activeTool: activeButton && activeButton.command }; diff --git a/OHIFViewer-react/src/FlexboxLayout/ViewerMain.js b/OHIFViewer-react/src/FlexboxLayout/ViewerMain.js index 79d60ce9a..1b053713b 100644 --- a/OHIFViewer-react/src/FlexboxLayout/ViewerMain.js +++ b/OHIFViewer-react/src/FlexboxLayout/ViewerMain.js @@ -118,7 +118,6 @@ class ViewerMain extends Component { } render() { - // TODO: Connect LayoutManager to redux return (