Merge branch 'master' into webgpu_update_june06

Author: martinken

Sources/Rendering/Core/ImageMapper/index.d.ts

@@ -47,10 +47,10 @@ export interface vtkImageMapper extends vtkAbstractMapper {
 	/**
 	 * Get the bounds for a given slice as [xmin, xmax, ymin, ymax,zmin, zmax].
 	 * @param {Number} [slice] The slice index.
-	 * @param {Number} [thickness] The slice thickness.
+	 * @param {Number} [halfThickness] Half the slice thickness in index space (unit voxel spacing).
 	 * @return {Number[]} The bounds for a given slice.
 	 */
-	getBoundsForSlice(slice?: number, thickness?: number): number[];
+	getBoundsForSlice(slice?: number, halfThickness?: number): number[];
 
 	/**
 	 *

Sources/Rendering/Core/ImageMapper/index.js

@@ -278,12 +278,12 @@ function vtkImageMapper(publicAPI, model) {
     return image.extentToBounds(ex);
   };
 
-  publicAPI.getBoundsForSlice = (slice = model.slice, thickness = 0) => {
+  publicAPI.getBoundsForSlice = (slice = model.slice, halfThickness = 0) => {
     const image = publicAPI.getInputData();
     if (!image) {
       return vtkMath.createUninitializedBounds();
     }
-    const extent = image.getExtent();
+    const extent = image.getSpatialExtent();
     const { ijkMode } = publicAPI.getClosestIJKAxis();
     let nSlice = slice;
     if (ijkMode !== model.slicingMode) {
@@ -292,16 +292,16 @@ function vtkImageMapper(publicAPI, model) {
     }
     switch (ijkMode) {
       case SlicingMode.I:
-        extent[0] = nSlice - thickness;
-        extent[1] = nSlice + thickness;
+        extent[0] = nSlice - halfThickness;
+        extent[1] = nSlice + halfThickness;
         break;
       case SlicingMode.J:
-        extent[2] = nSlice - thickness;
-        extent[3] = nSlice + thickness;
+        extent[2] = nSlice - halfThickness;
+        extent[3] = nSlice + halfThickness;
         break;
       case SlicingMode.K:
-        extent[4] = nSlice - thickness;
-        extent[5] = nSlice + thickness;
+        extent[4] = nSlice - halfThickness;
+        extent[5] = nSlice + halfThickness;
         break;
       default:
         break;