Update rotation handling to include absolute and relative rotations,

package.json

@@ -81,7 +81,7 @@
     "style-loader": "^0.23.1",
     "stylelint": "^10.1.0",
     "stylelint-config-recommended": "^2.2.0",
-    "vtk.js": "^11.7.2",
+    "vtk.js": "^11.11.1",
     "webpack": "4.34.0",
     "webpack-cli": "^3.3.4",
     "webpack-dev-server": "^3.8.0",

src/Custom/VTKMPRViewport.js

@@ -134,7 +134,7 @@ export default class VtkMpr extends Component {
     // must be added AFTER the data volume is added so that this can be rendered in front
     this.renderer.addVolume(this.labelPipeline.actor);
 
-    istyle.setVolumeMapper(this.pipeline.mapper);
+    istyle.setVolumeActor(this.pipeline.actor);
     istyle.setSliceNormal([0, 0, 1]);
     const range = istyle.getSliceRange();
     istyle.setSlice((range[0] + range[1]) / 2);

src/VTKViewport/Manipulators/vtkMouseRangeRotateManipulator.js

@@ -20,7 +20,7 @@ function vtkMouseRangeRotateManipulator(publicAPI, model) {
       dThetaY => {
         let thetaY = dThetaY % 360;
 
-        model.viewportData.rotate(0, thetaY);
+        model.viewportData.rotateRelative(0, thetaY);
 
         // onInteractiveRotationChanged();
       }

src/VTKViewport/View2D.js

@@ -23,7 +23,6 @@ export default class View2D extends Component {
     onPaint: PropTypes.func,
     onPaintStart: PropTypes.func,
     onPaintEnd: PropTypes.func,
-    interactorStyleVolumeMapper: PropTypes.object,
     dataDetails: PropTypes.object,
     onCreated: PropTypes.func,
     onDestroyed: PropTypes.func,
@@ -172,10 +171,6 @@ export default class View2D extends Component {
       renderer.getActiveCamera().setClippingRange(...r);
     });*/
 
-    const istyleVolumeMapper =
-      this.props.interactorStyleVolumeMapper ||
-      this.props.volumes[0].getMapper();
-
     // Set orientation based on props
     if (this.props.orientation) {
       const { orientation } = this.props;
@@ -191,7 +186,7 @@ export default class View2D extends Component {
     camera.setParallelProjection(true);
     this.renderer.resetCamera();
 
-    istyle.setVolumeMapper(istyleVolumeMapper);
+    istyle.setVolumeActor(this.props.volumes[0]);
     const range = istyle.getSliceRange();
     istyle.setSlice((range[0] + range[1]) / 2);
 
@@ -315,14 +310,12 @@ export default class View2D extends Component {
       istyle.setViewport(currentViewport);
     }
 
-    istyle.getVolumeMapper();
-
-    if (istyle.getVolumeMapper() !== volumes[0]) {
+    if (istyle.getVolumeActor() !== volumes[0]) {
       if (slabThickness && istyle.setSlabThickness) {
         istyle.setSlabThickness(slabThickness);
       }
 
-      istyle.setVolumeMapper(volumes[0]);
+      istyle.setVolumeActor(volumes[0]);
     }
 
     // Add appropriate callbacks

src/VTKViewport/ViewportData.js

@@ -32,45 +32,51 @@ export default class {
     } else {
       this._state = JSON.parse(JSON.stringify(state));
     }
+
+    // copy the state to a cache, so we can modify internally,
+    // but remember the original values for absolute rotations
+    this._state.cache = {
+      ...this._state,
+    };
   }
 
   getEventWindow = () => {
     return this.eventWindow;
   };
 
-  rotate = (dThetaX, dThetaY) => {
+  _rotate = (viewUp, sliceNormal, dThetaX, dThetaY) => {
     validateNumber(dThetaX);
     validateNumber(dThetaY);
 
     let xAxis = [];
-    vec3.cross(xAxis, this._state.viewUp, this._state.sliceNormal);
+    vec3.cross(xAxis, viewUp, sliceNormal);
     vec3.normalize(xAxis, xAxis);
 
-    let yAxis = this._state.viewUp;
+    let yAxis = viewUp;
     // rotate around the vector of the cross product of the
     // plane and viewup as the X component
 
-    const sliceNormal = [];
-    const sliceViewUp = [];
+    const nSliceNormal = [];
+    const nViewUp = [];
 
     const planeMat = mat4.create();
 
-    //Rotate around the vertical (slice-up) vector
+    // Rotate around the vertical (slice-up) vector
     mat4.rotate(planeMat, planeMat, degrees2radians(dThetaY), yAxis);
 
-    //Rotate around the horizontal (screen-x) vector
+    // Rotate around the horizontal (screen-x) vector
     mat4.rotate(planeMat, planeMat, degrees2radians(dThetaX), xAxis);
 
-    vec3.transformMat4(sliceNormal, this._state.sliceNormal, planeMat);
-    vec3.transformMat4(sliceViewUp, this._state.viewUp, planeMat);
+    vec3.transformMat4(nSliceNormal, sliceNormal, planeMat);
+    vec3.transformMat4(nViewUp, viewUp, planeMat);
 
-    this._state.sliceNormal = sliceNormal;
-    this._state.viewUp = sliceViewUp;
+    this._state.cache.sliceNormal = nSliceNormal;
+    this._state.cache.viewUp = nViewUp;
 
     var event = new CustomEvent(EVENTS.VIEWPORT_ROTATED, {
       detail: {
-        sliceNormal,
-        sliceViewUp,
+        sliceNormal: nSliceNormal,
+        sliceViewUp: nViewUp,
         dThetaX,
         dThetaY,
       },
@@ -81,6 +87,18 @@ export default class {
     this.eventWindow.dispatchEvent(event);
   };
 
+  rotateAbsolute = (dThetaX, dThetaY) => {
+    this._rotate(this._state.viewUp, this._state.sliceNormal, dThetaX, dThetaY);
+  };
+  rotateRelative = (dThetaX, dThetaY) => {
+    this._rotate(
+      this._state.cache.viewUp,
+      this._state.cache.sliceNormal,
+      dThetaX,
+      dThetaY
+    );
+  };
+
   setOrientation = (sliceNormal, viewUp = [0, 1, 0]) => {
     this._state.sliceNormal = sliceNormal;
     this._state.viewUp = viewUp;
@@ -94,6 +112,14 @@ export default class {
     return this._state.sliceNormal;
   };
 
+  getCurrentViewUp = () => {
+    return this._state.cache.viewUp;
+  };
+
+  getCurrentSliceNormal = () => {
+    return this._state.cache.sliceNormal;
+  };
+
   getReadOnlyViewPort = () => {
     const readOnlyState = JSON.parse(JSON.stringify(this._state));
 

src/VTKViewport/vtkInteractorStyleMPRCrosshairs.js

@@ -24,23 +24,6 @@ function vtkInteractorStyleMPRCrosshairs(publicAPI, model) {
   // Set our className
   model.classHierarchy.push('vtkInteractorStyleMPRCrosshairs');
 
-  model.trackballManipulator = vtkMouseCameraTrackballRotateManipulator.newInstance(
-    {
-      button: 1,
-    }
-  );
-  model.panManipulator = vtkMouseCameraTrackballPanManipulator.newInstance({
-    button: 1,
-    shift: true,
-  });
-  model.zoomManipulator = vtkMouseCameraTrackballZoomManipulator.newInstance({
-    button: 3,
-  });
-  model.scrollManipulator = vtkMouseRangeManipulator.newInstance({
-    scrollEnabled: true,
-    dragEnabled: false,
-  });
-
   function updateScrollManipulator() {
     const range = publicAPI.getSliceRange();
     model.scrollManipulator.removeScrollListener();
@@ -53,15 +36,6 @@ function vtkInteractorStyleMPRCrosshairs(publicAPI, model) {
     );
   }
 
-  function setManipulators() {
-    publicAPI.removeAllMouseManipulators();
-    publicAPI.addMouseManipulator(model.trackballManipulator);
-    publicAPI.addMouseManipulator(model.panManipulator);
-    publicAPI.addMouseManipulator(model.zoomManipulator);
-    publicAPI.addMouseManipulator(model.scrollManipulator);
-    updateScrollManipulator();
-  }
-
   function moveCrosshairs(callData) {
     const { apis, apiIndex } = model;
     const pos = [callData.position.x, callData.position.y];
@@ -148,7 +122,7 @@ function vtkInteractorStyleMPRCrosshairs(publicAPI, model) {
   const superHandleLeftButtonPress = publicAPI.handleLeftButtonPress;
   publicAPI.handleLeftButtonPress = callData => {
     if (!callData.shiftKey && !callData.controlKey) {
-      if (model.volumeMapper) {
+      if (model.volumeActor) {
         moveCrosshairs(callData);
         publicAPI.startWindowLevel();
       }
@@ -157,24 +131,6 @@ function vtkInteractorStyleMPRCrosshairs(publicAPI, model) {
     }
   };
 
-  const superSetVolumeMapper = publicAPI.setVolumeMapper;
-  publicAPI.setVolumeMapper = mapper => {
-    if (superSetVolumeMapper(mapper)) {
-      const renderer = model.interactor.getCurrentRenderer();
-      const camera = renderer.getActiveCamera();
-      if (mapper) {
-        // prevent zoom manipulator from messing with our focal point
-        camera.setFreezeFocalPoint(true);
-        updateScrollManipulator();
-        // NOTE: Disabling this because it makes it more difficult to switch
-        // interactor styles. Need to find a better way to do this!
-        //publicAPI.setSliceNormal(...publicAPI.getSliceNormal());
-      } else {
-        camera.setFreezeFocalPoint(false);
-      }
-    }
-  };
-
   publicAPI.superHandleLeftButtonRelease = publicAPI.handleLeftButtonRelease;
   publicAPI.handleLeftButtonRelease = () => {
     switch (model.state) {
@@ -194,8 +150,6 @@ function vtkInteractorStyleMPRCrosshairs(publicAPI, model) {
   publicAPI.setApiIndex = apiIndex => {
     model.apiIndex = apiIndex;
   };
-
-  setManipulators();
 }
 
 // ----------------------------------------------------------------------------
@@ -212,7 +166,7 @@ export function extend(publicAPI, model, initialValues = {}) {
   // Inheritance
   vtkInteractorStyleMPRSlice.extend(publicAPI, model, initialValues);
 
-  macro.setGet(publicAPI, model, ['volumeMapper', 'callback']);
+  macro.setGet(publicAPI, model, ['callback']);
 
   // Object specific methods
   vtkInteractorStyleMPRCrosshairs(publicAPI, model);

src/VTKViewport/vtkInteractorStyleMPRRotate.js

@@ -1,12 +1,8 @@
 import macro from 'vtk.js/Sources/macro';
 import vtkInteractorStyleMPRSlice from './vtkInteractorStyleMPRSlice.js';
 import Constants from 'vtk.js/Sources/Rendering/Core/InteractorStyle/Constants';
-import { vec3, mat4 } from 'gl-matrix';
-import { degrees2radians } from '../lib/math/angles.js';
-import ViewportData from './ViewportData.js';
 
 const { States } = Constants;
-const MAX_SAFE_INTEGER = 2147483647;
 
 // ----------------------------------------------------------------------------
 // Global methods
@@ -48,7 +44,7 @@ function vtkInteractorStyleMPRRotate(publicAPI, model) {
     const dThetaY = -((pos[0] - model.rotateStartPos[0]) * xSensitivity);
     const viewport = publicAPI.getViewport();
 
-    viewport.rotate(dThetaX, dThetaY);
+    viewport.rotateRelative(dThetaX, dThetaY);
 
     model.rotateStartPos[0] = Math.round(pos[0]);
     model.rotateStartPos[1] = Math.round(pos[1]);
@@ -59,7 +55,7 @@ function vtkInteractorStyleMPRRotate(publicAPI, model) {
     model.rotateStartPos[0] = Math.round(callData.position.x);
     model.rotateStartPos[1] = Math.round(callData.position.y);
     if (!callData.shiftKey && !callData.controlKey) {
-      const property = model.volumeMapper.getProperty();
+      const property = model.volumeActor.getProperty();
       if (property) {
         publicAPI.startRotate();
       }
@@ -68,20 +64,6 @@ function vtkInteractorStyleMPRRotate(publicAPI, model) {
     }
   };
 
-  const superSetVolumeMapper = publicAPI.setVolumeMapper;
-  publicAPI.setVolumeMapper = mapper => {
-    if (superSetVolumeMapper(mapper)) {
-      const renderer = model.interactor.getCurrentRenderer();
-      const camera = renderer.getActiveCamera();
-      if (mapper) {
-        // prevent zoom manipulator from messing with our focal point
-        camera.setFreezeFocalPoint(true);
-      } else {
-        camera.setFreezeFocalPoint(false);
-      }
-    }
-  };
-
   publicAPI.superHandleLeftButtonRelease = publicAPI.handleLeftButtonRelease;
   publicAPI.handleLeftButtonRelease = () => {
     switch (model.state) {
@@ -114,10 +96,7 @@ export function extend(publicAPI, model, initialValues = {}) {
   // Inheritance
   vtkInteractorStyleMPRSlice.extend(publicAPI, model, initialValues);
 
-  macro.setGet(publicAPI, model, [
-    'volumeMapper',
-    'onInteractiveRotateChanged',
-  ]);
+  macro.setGet(publicAPI, model, ['onInteractiveRotateChanged']);
 
   // Object specific methods
   vtkInteractorStyleMPRRotate(publicAPI, model);