fix(VtkTwoView): layer opacity driven only by slice mesh opacity

Kitware · Oct 11, 2023 · 3ec7ba3 · 3ec7ba3
1 parent 6b26933
commit 3ec7ba3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 49 deletions.
diff --git a/src/components/VtkTwoView.vue b/src/components/VtkTwoView.vue
@@ -225,7 +225,6 @@ import useViewSliceStore, {
 import CropTool from './tools/crop/CropTool.vue';
 import { ToolContainer, VTKTwoViewWidgetManager } from '../constants';
 import { useProxyManager } from '../composables/proxyManager';
-import { getShiftedOpacityFromPreset } from '../utils/vtk-helpers';
 import { useLayersStore } from '../store/datasets-layers';
 import { useViewCameraStore } from '../store/view-configs/camera';
 import useLayerColoringStore from '../store/view-configs/layers';
@@ -703,55 +702,10 @@ export default defineComponent({
               lut.setDataRange(...ctFunc.mappingRange);
 
               const pwf = proxyManager.getPiecewiseFunction(arrayName);
-              pwf.setMode(opFunc.mode);
+              pwf.setMode(vtkPiecewiseFunctionProxy.Mode.Points);
               pwf.setDataRange(...opFunc.mappingRange);
-
-              const factor = blendConfig.opacity * 2;
-              const floor = Math.max(0, (blendConfig.opacity - 0.5) * 2);
-              switch (opFunc.mode) {
-                case vtkPiecewiseFunctionProxy.Mode.Gaussians: {
-                  const mapped = opFunc.gaussians.map((g) => {
-                    return {
-                      ...g,
-                      height: g.height * factor,
-                      yBias: blendConfig.opacity * 2,
-                    };
-                  });
-                  pwf.setGaussians(mapped);
-                  break;
-                }
-                case vtkPiecewiseFunctionProxy.Mode.Points: {
-                  const opacityPoints = getShiftedOpacityFromPreset(
-                    opFunc.preset,
-                    opFunc.mappingRange,
-                    opFunc.shift
-                  );
-                  if (!opacityPoints) {
-                    throw new Error(`Could not find preset ${opFunc.preset}`);
-                  }
-                  const mapped = opacityPoints.map(([x, y]) => [
-                    x,
-                    y * factor + floor,
-                  ]);
-                  pwf.setPoints(mapped);
-                  break;
-                }
-                case vtkPiecewiseFunctionProxy.Mode.Nodes: {
-                  const mappedNodes = opFunc.nodes.map((n) => {
-                    return {
-                      ...n,
-                      y: n.y * factor + floor,
-                    } as const;
-                  });
-                  pwf.setNodes(mappedNodes);
-                  break;
-                }
-                default:
-                  throw new Error(
-                    // @ts-expect-error should handle all modes
-                    `invalid opacity function mode ${opFunc.mode}`
-                  );
-              }
+              pwf.setPoints([[0, 1]]); // only slice mesh controls opacity
+              rep.setOpacity(blendConfig.opacity);
 
               // control color range manually
               rep.setRescaleOnColorBy(false);

diff --git a/src/store/view-configs/layers.ts b/src/store/view-configs/layers.ts
@@ -49,6 +49,7 @@ export const defaultLayersConfig = (): LayersConfig => ({
     preset: '',
     mappingRange: [0, 1],
   },
+  // opacity function not used in VtkTwoView
   opacityFunction: {
     mode: vtkPiecewiseFunctionProxy.Mode.Gaussians,
     gaussians: [],