Revert "Viewport (#10)" (#14)

This reverts commit 23d41fc.

Author: evren217

example/src/App.js

@@ -16,11 +16,6 @@ export default class App extends Component {
       }
     }
 
-    const viewport = {
-      invert: true,
-      voi: {}
-    };
-
     const style = {
       'height': '512px'
     };
@@ -39,9 +34,8 @@ export default class App extends Component {
           <div className='col-xs-12 col-lg-6' style={style}>
             <CornerstoneViewport
               viewportData={exampleData}
-              cornerstone={cornerstone}
+              cornerstone={cornerstone} 
               cornerstoneTools={cornerstoneTools}
-              viewport={viewport}
               />
           </div>
         </div>

src/CornerstoneViewport/CornerstoneViewport.js

@@ -59,7 +59,6 @@ class CornerstoneViewport extends Component {
       isPlaying: false,
       cineFrameRate: 24
     },
-    viewport: null,
     availableTools: [
       { name: 'Pan', mouseButtonMasks: [1, 4] },
       {
@@ -95,7 +94,6 @@ class CornerstoneViewport extends Component {
     onMeasurementsChanged: PropTypes.func,
     onElementEnabled: PropTypes.func,
     isActive: PropTypes.bool.isRequired,
-    viewport: PropTypes.object,
     layout: PropTypes.object,
     children: PropTypes.node,
     onDoubleClick: PropTypes.func,
@@ -129,8 +127,7 @@ class CornerstoneViewport extends Component {
       isLoading: false,
       numImagesLoaded: 0,
       error: null,
-      viewport:
-        props.viewport || cornerstone.getDefaultViewport(null, undefined)
+      viewport: cornerstone.getDefaultViewport(null, undefined)
     };
 
     const { loadHandlerManager } = cornerstoneTools;
@@ -424,16 +421,8 @@ class CornerstoneViewport extends Component {
           return;
         }
 
-        const defaultViewport = cornerstone.getDefaultViewportForImage(
-          element,
-          image
-        );
-
-        const viewport = Object.assign(
-          {},
-          defaultViewport,
-          this.state.viewport
-        );
+        // Set Soft Tissue preset for all images by default
+        const viewport = cornerstone.getDefaultViewportForImage(element, image);
 
         // Display the first image
         cornerstone.displayImage(element, image, viewport);
@@ -724,101 +713,6 @@ class CornerstoneViewport extends Component {
         );
       }
     }
-
-    // TODO? Should we shallow equality check these?
-    if (this.props.viewport !== prevProps.viewport) {
-      // Update the internal representation of the viewport parameters
-      let viewport = Object.assign(
-        {},
-        this.state.viewport,
-        this.props.viewport
-      );
-
-      // Handle reset and fitToWindow cases
-      // If viewport.scale === null or voi === null, call getDefaultViewportForImage
-      // and use these values prior to calling setViewport
-
-      const defaultViewport = cornerstone.getDefaultViewportForImage(
-        this.element,
-        cornerstone.getImage(this.element)
-      );
-      if (viewport.voi === null) {
-        viewport.voi = defaultViewport.voi;
-      }
-
-      if (viewport.zoomScale !== null) {
-        const maximumScale = 10;
-        const minimumScale = 0.05;
-
-        if (viewport.zoomScale === 0) {
-          viewport.scale = defaultViewport.scale;
-        } else if (viewport.zoomScale < 0) {
-          viewport.scale = Math.max(
-            viewport.scale + viewport.zoomScale,
-            minimumScale
-          );
-        } else {
-          viewport.scale = Math.min(
-            viewport.scale + viewport.zoomScale,
-            maximumScale
-          );
-        }
-      }
-
-      if (viewport.resetViewport) {
-        viewport = defaultViewport;
-      }
-
-      if (viewport.clearTools) {
-        const toolStateManager =
-          cornerstoneTools.globalImageIdSpecificToolStateManager;
-        toolStateManager.clear(this.element);
-        cornerstone.updateImage(this.element);
-      }
-
-      if (viewport.scrollUp) {
-        let stack = this.state.stack;
-        stack.currentImageIdIndex = Math.min(
-          this.state.numImagesLoaded,
-          ++stack.currentImageIdIndex
-        );
-
-        scrollToIndex(this.element, stack.currentImageIdIndex);
-        this.setState({ stack });
-      }
-
-      if (viewport.scrollDown) {
-        let stack = this.state.stack;
-        stack.currentImageIdIndex = Math.max(0, --stack.currentImageIdIndex);
-        scrollToIndex(this.element, stack.currentImageIdIndex);
-        this.setState({ stack });
-      }
-
-      if (viewport.scrollFirstImage) {
-        let stack = this.state.stack;
-        stack.currentImageIdIndex = 0;
-        scrollToIndex(this.element, stack.currentImageIdIndex);
-        this.setState({ stack });
-      }
-
-      if (viewport.scrollLastImage) {
-        let stack = this.state.stack;
-        const numImagesLoaded = this.state.stack.imageIds.length - 1;
-        scrollToIndex(this.element, numImagesLoaded);
-        this.setState({ stack });
-      }
-
-      if (viewport.nextPanel) {
-        const enabledElements = cornerstone.getEnabledElements();
-        this.element = enabledElements;
-      }
-
-      this.setState({
-        viewport
-      });
-
-      cornerstone.setViewport(this.element, viewport);
-    }
   }
 
   setActiveTool = activeTool => {