Merge pull request #62 from dvisionlab/cropFix

Crop fix
dvisionlab · Jul 23, 2021 · ecb43f1 · ecb43f1
2 parents 9ab4518 + a4816ce
commit ecb43f1
Show file tree

Hide file tree

Showing 5 changed files with 6,100 additions and 15 deletions.
diff --git a/dist/diglettk.js b/dist/diglettk.js
diff --git a/docs/examples/diglettk.js b/docs/examples/diglettk.js
diff --git a/docs/examples/vr.html b/docs/examples/vr.html
@@ -140,6 +140,7 @@ <h3 style="margin-top: 20px; margin-bottom: 10px;">Code Example</h3>
             let data = larvitar.buildData(serie, false);
             console.log(serie)
             const image = diglettk.buildVtkVolume(header, data);
+            image.setOrigin([0,0,0]) // little hack to temporarily fix https://github.com/Kitware/vtk-js/issues/2008
             // run vr
             vr = new diglettk.VRView(element);
             // set an image

diff --git a/src/utils/utils.js b/src/utils/utils.js
@@ -4,6 +4,8 @@ import vtkPlane from "vtk.js/Sources/Common/DataModel/Plane";
 import vtkVolume from "vtk.js/Sources/Rendering/Core/Volume";
 import vtkVolumeMapper from "vtk.js/Sources/Rendering/Core/VolumeMapper";
 
+import { vec3, quat, mat4 } from "gl-matrix";
+
 export function buildVtkVolume(header, data) {
   const dims = [
     header.volume.cols,
@@ -304,3 +306,30 @@ export function getVideoCardInfo() {
         error: "no WEBGL_debug_renderer_info"
       };
 }
+
+export function getCroppingPlanes(imageData, ijkPlanes) {
+  const rotation = quat.create();
+  mat4.getRotation(rotation, imageData.getIndexToWorld());
+
+  const rotateVec = vec => {
+    const out = [0, 0, 0];
+    vec3.transformQuat(out, vec, rotation);
+    return out;
+  };
+
+  const [iMin, iMax, jMin, jMax, kMin, kMax] = ijkPlanes;
+  const origin = imageData.indexToWorld([iMin, jMin, kMin]);
+  // opposite corner from origin
+  const corner = imageData.indexToWorld([iMax, jMax, kMax]);
+  return [
+    // X min/max
+    vtkPlane.newInstance({ normal: rotateVec([1, 0, 0]), origin }),
+    vtkPlane.newInstance({ normal: rotateVec([-1, 0, 0]), origin: corner }),
+    // Y min/max
+    vtkPlane.newInstance({ normal: rotateVec([0, 1, 0]), origin }),
+    vtkPlane.newInstance({ normal: rotateVec([0, -1, 0]), origin: corner }),
+    // X min/max
+    vtkPlane.newInstance({ normal: rotateVec([0, 0, 1]), origin }),
+    vtkPlane.newInstance({ normal: rotateVec([0, 0, -1]), origin: corner })
+  ];
+}
diff --git a/src/vrView.js b/src/vrView.js
@@ -20,7 +20,7 @@ import vtkActor from "vtk.js/Sources/Rendering/Core/Actor";
 import vtkSphereSource from "vtk.js/Sources/Filters/Sources/SphereSource";
 import vtkCoordinate from "vtk.js/Sources/Rendering/Core/Coordinate";
 
-import { createVolumeActor } from "./utils/utils";
+import { createVolumeActor, getCroppingPlanes } from "./utils/utils";
 import { applyStrategy } from "./utils/strategies";
 
 import { createPreset } from "./utils/colormaps";
@@ -404,28 +404,26 @@ export class VRView {
    * Setup crop widget
    */
   setupCropWidget() {
-    // setup widget manager and widget
     const widgetManager = vtkWidgetManager.newInstance();
-    // widgetManager.setUseSvgLayer(false);
     widgetManager.setRenderer(this.renderer);
 
-    // widget factory
     const widget = vtkImageCroppingWidget.newInstance();
-    // instance of a widget associated with a renderer
     const viewWidget = widgetManager.addWidget(widget);
 
-    // setup crop filter
-    const cropFilter = vtkImageCropFilter.newInstance();
-    // listen to cropping widget state to inform the crop filter
     const cropState = widget.getWidgetState().getCroppingPlanes();
     cropState.onModified(() => {
-      cropFilter.setCroppingPlanes(cropState.getPlanes());
+      const planes = getCroppingPlanes(image, cropState.getPlanes());
+      mapper.removeAllClippingPlanes();
+      planes.forEach(plane => {
+        mapper.addClippingPlane(plane);
+      });
+      mapper.modified();
     });
 
     // wire up the reader, crop filter, and mapper
     let mapper = this.actor.getMapper();
     let image = mapper.getInputData();
-    cropFilter.setCroppingPlanes(...image.getExtent());
+
     widget.copyImageDataDescription(image);
 
     widget.set({
@@ -434,9 +432,6 @@ export class VRView {
       cornerHandlesEnabled: true
     });
 
-    cropFilter.setInputData(image);
-    mapper.setInputConnection(cropFilter.getOutputPort());
-
     widgetManager.enablePicking();
 
     this._widgetManager = widgetManager;