Sorry, this page does not exist.
}
/>
diff --git a/OHIFViewer-react/src/FlexboxLayout/ConnectedLayoutManager.js b/OHIFViewer-react/src/FlexboxLayout/ConnectedLayoutManager.js
deleted file mode 100644
index 2728e054e..000000000
--- a/OHIFViewer-react/src/FlexboxLayout/ConnectedLayoutManager.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { connect } from 'react-redux';
-import { LayoutManager } from 'react-viewerbase';
-
-const mapStateToProps = state => {
- return {
- layout: state.viewports.layout,
- activeViewportIndex: state.viewports.activeViewportIndex
- };
-};
-
-const ConnectedLayoutManager = connect(
- mapStateToProps,
- null
-)(LayoutManager);
-
-export default ConnectedLayoutManager;
diff --git a/OHIFViewer-react/src/FlexboxLayout/ViewerMain.js b/OHIFViewer-react/src/FlexboxLayout/ViewerMain.js
deleted file mode 100644
index 919af763a..000000000
--- a/OHIFViewer-react/src/FlexboxLayout/ViewerMain.js
+++ /dev/null
@@ -1,132 +0,0 @@
-import { Component } from 'react';
-import React from 'react';
-import PropTypes from 'prop-types';
-import cornerstone from 'cornerstone-core';
-import cornerstoneTools from 'cornerstone-tools';
-import cornerstoneMath from "cornerstone-math";
-import { OHIF } from 'ohif-core';
-import ConnectedCornerstoneViewport from './ConnectedCornerstoneViewport.js';
-import ConnectedLayoutManager from './ConnectedLayoutManager.js';
-import './ViewerMain.css';
-
-// Attempt to fix weird undefined dep issue
-cornerstoneTools.external.cornerstoneMath = cornerstoneMath;
-
-const { StackManager } = OHIF.utils;
-
-function getCornerstoneStack(studies, viewportData) {
- const {
- displaySetInstanceUid,
- studyInstanceUid,
- } = viewportData;
-
- // Create shortcut to displaySet
- const study = studies.find(study => study.studyInstanceUid === studyInstanceUid);
-
- const displaySet = study.displaySets.find((set) => {
- return set.displaySetInstanceUid === displaySetInstanceUid;
- });
-
- // Get stack from Stack Manager
- return StackManager.findOrCreateStack(study, displaySet);
-}
-
-class ViewerMain extends Component {
- state = {
- displaySets: [],
- viewportData: [],
- };
-
- static propTypes = {
- studies: PropTypes.array.isRequired
- };
-
- componentDidMount() {
- // Add beforeUnload event handler to check for unsaved changes
- //window.addEventListener('beforeunload', unloadHandlers.beforeUnload);
-
- // Get all the display sets for the viewer studies
- const displaySets = [];
- const studies = this.props.studies;
- studies.forEach((study) => {
- study.displaySets.forEach(dSet => dSet.images.length && displaySets.push(dSet));
- });
-
- // TODO: re-add plugins back in
- // TODO: We shouldn't just hang display sets by default
- const viewportData = displaySets.map((dSet, index) => {
- return this.getCornerstoneViewport(dSet, index);
- });
-
- this.setState({
- displaySets,
- viewportData
- });
- }
-
- getCornerstoneViewport = (data, index) => {
- // Clone the stack here so we don't mutate it later
- const stack = Object.assign({}, getCornerstoneStack(this.props.studies, data));
- stack.currentImageIdIndex = 0;
- const viewportData = {
- stack,
- ...data,
- viewportIndex: index
- };
-
- return (
+
StudyInstanceUid: {this.props.studyInstanceUid}
+
SeriesInstanceUid: {this.props.seriesInstanceUid}
+