Revert "React viewport (#439)" (#487)

This reverts commit b24a502433.

extensions/ohif-cornerstone-extension/src/ConnectedCornerstoneViewport.js

@@ -30,8 +30,7 @@ const mapStateToProps = (state, ownProps) => {
     ...dataFromStore,
     enableStackPrefetch: isActive,
     //stack: viewportSpecificData.stack,
-    cineToolData: viewportSpecificData.cine,
+    cineToolData: viewportSpecificData.cine
-    viewport: viewportSpecificData.viewport
   };
 };
 

src/connectedComponents/ConnectedViewerMain.js

@@ -1,44 +1,33 @@
-import { connect } from 'react-redux'
+import { connect } from 'react-redux';
-import ViewerMain from './ViewerMain'
+import ViewerMain from './ViewerMain';
-import OHIF from 'ohif-core'
+import OHIF from 'ohif-core';
 
-const {
+const { setViewportSpecificData, clearViewportSpecificData } = OHIF.redux.actions;
-  setViewportSpecificData,
-  clearViewportSpecificData,
-  setToolActive,
-  setActiveViewportSpecificData,
-} = OHIF.redux.actions
 
 const mapStateToProps = state => {
-  const { activeViewportIndex, layout, viewportSpecificData } = state.viewports
+    const { activeViewportIndex, layout, viewportSpecificData } = state.viewports;
 
-  return {
+    return {
-    activeViewportIndex,
+        activeViewportIndex,
-    layout,
+        layout,
-    viewportSpecificData,
+        viewportSpecificData
-  }
+    }
-}
+};
 
 const mapDispatchToProps = dispatch => {
-  return {
+    return {
-    setViewportSpecificData: (viewportIndex, data) => {
+        setViewportSpecificData: (viewportIndex, data) => {
-      dispatch(setViewportSpecificData(viewportIndex, data))
+            dispatch(setViewportSpecificData(viewportIndex, data));
-    },
+        },
-    clearViewportSpecificData: () => {
+        clearViewportSpecificData: () => {
-      dispatch(clearViewportSpecificData())
+            dispatch(clearViewportSpecificData());
-    },
+        }
-    setToolActive: tool => {
+    };
-      dispatch(setToolActive(tool))
+};
-    },
-    setActiveViewportSpecificData: viewport => {
-      dispatch(setActiveViewportSpecificData(viewport))
-    },
-  }
-}
 
 const ConnectedViewerMain = connect(
-  mapStateToProps,
+    mapStateToProps,
-  mapDispatchToProps
+    mapDispatchToProps
-)(ViewerMain)
+)(ViewerMain);
 
-export default ConnectedViewerMain
+export default ConnectedViewerMain;

src/connectedComponents/ConnectedViewerRetrieveStudyData.js

@@ -1,19 +1,19 @@
-import { connect } from 'react-redux'
+import { connect } from 'react-redux';
-import ViewerRetrieveStudyData from './ViewerRetrieveStudyData.js'
+import ViewerRetrieveStudyData from './ViewerRetrieveStudyData.js';
 
-const isActive = a => a.active === true
+const isActive = (a) => a.active === true;
 
 const mapStateToProps = state => {
-  const activeServer = state.servers.servers.find(isActive)
+    const activeServer = state.servers.servers.find(isActive);
 
-  return {
+    return {
-    server: activeServer,
+        server: activeServer,
-  }
+    };
-}
+};
 
 const ConnectedViewerRetrieveStudyData = connect(
-  mapStateToProps,
+    mapStateToProps,
-  null
+    null
-)(ViewerRetrieveStudyData)
+)(ViewerRetrieveStudyData);
 
-export default ConnectedViewerRetrieveStudyData
+export default ConnectedViewerRetrieveStudyData;

src/connectedComponents/ViewerMain.js

@@ -1,61 +1,52 @@
-import { Component } from 'react'
+import { Component } from 'react';
-import React from 'react'
+import React from 'react';
-import PropTypes from 'prop-types'
+import PropTypes from 'prop-types';
-import { OHIF } from 'ohif-core'
+import { OHIF } from 'ohif-core';
-import ConnectedLayoutManager from './ConnectedLayoutManager.js'
+import ConnectedLayoutManager from './ConnectedLayoutManager.js';
-import './ViewerMain.css'
+import './ViewerMain.css';
 
 class ViewerMain extends Component {
   static propTypes = {
     studies: PropTypes.array.isRequired,
     setViewportSpecificData: PropTypes.func.isRequired,
-    clearViewportSpecificData: PropTypes.func.isRequired,
+    clearViewportSpecificData: PropTypes.func.isRequired
-    setToolActive: PropTypes.func.isRequired,
+  };
-    setActiveViewportSpecificData: PropTypes.func.isRequired,
-  }
 
   constructor(props) {
-    super(props)
+    super(props);
-
+    OHIF.hotkeysUtil.setup('viewer');
-    // OHIF.hotkeysUtil.setup('viewer')
-    const hotkeysUtil = new OHIF.HotkeysUtil('viewer', {
-      setViewportSpecificData: props.setViewportSpecificData,
-      clearViewportSpecificData: props.clearViewportSpecificData,
-      setToolActive: props.setToolActive,
-      setActiveViewportSpecificData: props.setActiveViewportSpecificData,
-    })
 
     this.state = {
-      displaySets: [],
+      displaySets: []
     }
   }
 
   getDisplaySets(studies) {
-    const displaySets = []
+    const displaySets = [];
     studies.forEach(study => {
       study.displaySets.forEach(dSet => {
         if (!dSet.plugin) {
-          dSet.plugin = 'cornerstone'
+          dSet.plugin = 'cornerstone';
         }
-        displaySets.push(dSet)
+        displaySets.push(dSet);
-      })
+      });
-    })
+    });
 
-    return displaySets
+    return displaySets;
   }
 
   findDisplaySet(studies, studyInstanceUid, displaySetInstanceUid) {
     const study = studies.find(study => {
-      return study.studyInstanceUid === studyInstanceUid
+      return study.studyInstanceUid === studyInstanceUid;
-    })
+    });
 
     if (!study) {
-      return
+      return;
     }
 
     return study.displaySets.find(displaySet => {
-      return displaySet.displaySetInstanceUid === displaySetInstanceUid
+      return displaySet.displaySetInstanceUid === displaySetInstanceUid;
-    })
+    });
   }
 
   componentDidMount() {
@@ -63,50 +54,41 @@ class ViewerMain extends Component {
     //window.addEventListener('beforeunload', unloadHandlers.beforeUnload);
 
     // Get all the display sets for the viewer studies
-    const displaySets = this.getDisplaySets(this.props.studies)
+    const displaySets = this.getDisplaySets(this.props.studies);
 
     this.setState({
-      displaySets,
+      displaySets
-    })
+    });
   }
 
   getViewportData = () => {
-    const viewportData = []
+    const viewportData = [];
-    const { layout, viewportSpecificData } = this.props
+    const { layout, viewportSpecificData } = this.props;
 
-    for (
+    for (let viewportIndex = 0; viewportIndex < layout.viewports.length; viewportIndex++) {
-      let viewportIndex = 0;
+      let displaySet = viewportSpecificData[viewportIndex];
-      viewportIndex < layout.viewports.length;
-      viewportIndex++
-    ) {
-      let displaySet = viewportSpecificData[viewportIndex]
 
       // If the viewport is empty, get one available in study
       if (!displaySet || !displaySet.displaySetInstanceUid) {
-        const { displaySets } = this.state
+        const { displaySets } = this.state;
-        displaySet = displaySets.find(
+        displaySet = displaySets.find(ds => !viewportData.some(v => v.displaySetInstanceUid === ds.displaySetInstanceUid));
-          ds =>
-            !viewportData.some(
-              v => v.displaySetInstanceUid === ds.displaySetInstanceUid
-            )
-        )
       }
 
-      viewportData.push(displaySet)
+      viewportData.push(displaySet);
     }
 
-    return viewportData
+    return viewportData;
-  }
+  };
 
   setViewportData = ({ viewportIndex, item }) => {
     const displaySet = this.findDisplaySet(
       this.props.studies,
       item.studyInstanceUid,
       item.displaySetInstanceUid
-    )
+    );
 
-    this.props.setViewportSpecificData(viewportIndex, displaySet)
+    this.props.setViewportSpecificData(viewportIndex, displaySet);
-  }
+  };
 
   render() {
     return (
@@ -117,15 +99,15 @@ class ViewerMain extends Component {
           setViewportData={this.setViewportData}
         />
       </div>
-    )
+    );
   }
 
   componentWillUnmount() {
     // Clear the entire viewport specific data
-    const { viewportSpecificData } = this.props
+    const { viewportSpecificData } = this.props;
-    Object.keys(viewportSpecificData).forEach(viewportIndex => {
+    Object.keys(viewportSpecificData).forEach((viewportIndex) => {
-      this.props.clearViewportSpecificData(viewportIndex)
+      this.props.clearViewportSpecificData(viewportIndex);
-    })
+    });
 
     // Remove beforeUnload event handler...
     //window.removeEventListener('beforeunload', unloadHandlers.beforeUnload);
@@ -144,4 +126,4 @@ class ViewerMain extends Component {
   }
 }
 
-export default ViewerMain
+export default ViewerMain;

src/studylist/ConnectedStudyList.js

@@ -1,21 +1,21 @@
-import { connect } from 'react-redux'
+import { connect } from 'react-redux';
 
-import StudyListWithData from './StudyListWithData.js'
+import StudyListWithData from './StudyListWithData.js';
 
-const isActive = a => a.active === true
+const isActive = (a) => a.active === true;
 
 const mapStateToProps = state => {
-  const activeServer = state.servers.servers.find(isActive)
+    const activeServer = state.servers.servers.find(isActive);
 
-  return {
+    return {
-    server: activeServer,
+        server: activeServer,
-    user: state.oidc.user,
+        user: state.oidc.user,
-  }
+    };
-}
+};
 
 const ConnectedStudyList = connect(
-  mapStateToProps,
+    mapStateToProps,
-  null
+    null
-)(StudyListWithData)
+)(StudyListWithData);
 
-export default ConnectedStudyList
+export default ConnectedStudyList;