refactor(gaussianSmooth): simplfy process interface

Author: PaulHax

src/components/ProcessControls.vue

@@ -19,7 +19,6 @@ import { computed } from 'vue';
 import {
   ProcessType,
   useProcessStore,
-  type ProcessAlgorithm,
 } from '../store/tools/process';
 import ProcessTypeSelector from './ProcessTypeSelector.vue';
 import ProcessWorkflow from './ProcessWorkflow.vue';
@@ -34,16 +33,6 @@ const gaussianSmoothStore = useGaussianSmoothStore();
 
 const activeProcessType = computed(() => processStore.activeProcessType);
 
-// Create algorithm adapters for the ProcessWorkflow component
-const fillBetweenAlgorithm: ProcessAlgorithm = {
-  compute: async (segImage, activeSegment) => {
-    return fillBetweenStore.computeAlgorithm(segImage, activeSegment);
-  },
-};
-
-const gaussianSmoothAlgorithm: ProcessAlgorithm = {
-  compute: async (segImage, activeSegment) => {
-    return gaussianSmoothStore.computeAlgorithm(segImage, activeSegment);
-  },
-};
+const fillBetweenAlgorithm = fillBetweenStore.computeAlgorithm;
+const gaussianSmoothAlgorithm = gaussianSmoothStore.computeAlgorithm;
 </script>

src/core/tools/paint/gaussianSmooth.worker.ts

@@ -1,5 +1,6 @@
 import * as Comlink from 'comlink';
 import { TypedArray } from '@kitware/vtk.js/types';
+import { createTypedArrayLike } from '@/src/utils';
 
 export interface GaussianSmoothParams {
   sigma: number;
@@ -237,7 +238,7 @@ function copySubVolumeBack(
 
         if (origLabel === label || origLabel === 0) {
           // eslint-disable-next-line no-param-reassign
-          (originalData as any)[origIndex] = subValue > 127.5 ? label : 0;
+          originalData[origIndex] = subValue > 127.5 ? label : 0;
         }
         subIndex++;
       }
@@ -274,9 +275,7 @@ export function gaussianSmoothLabelMapWorker(input: {
   }
 
   if (originalLabelCount === 0) {
-    const outputData = new (originalData.constructor as any)(
-      originalData.length
-    );
+    const outputData = createTypedArrayLike(originalData, originalData.length);
     for (let i = 0; i < originalData.length; i++) {
       outputData[i] = originalData[i];
     }
@@ -291,9 +290,7 @@ export function gaussianSmoothLabelMapWorker(input: {
 
   const bounds = calculateBoundingBox(originalData, dimensions, label);
   if (!bounds) {
-    const outputData = new (originalData.constructor as any)(
-      originalData.length
-    );
+    const outputData = createTypedArrayLike(originalData, originalData.length);
     for (let i = 0; i < originalData.length; i++) {
       outputData[i] = originalData[i];
     }
@@ -320,7 +317,7 @@ export function gaussianSmoothLabelMapWorker(input: {
     1.5
   );
 
-  const outputData = new (originalData.constructor as any)(originalData.length);
+  const outputData = createTypedArrayLike(originalData, originalData.length);
   for (let i = 0; i < originalData.length; i++) {
     outputData[i] = originalData[i];
   }

src/store/tools/gaussianSmooth.ts

@@ -1,6 +1,5 @@
 import { defineStore } from 'pinia';
 import { ref } from 'vue';
-import { TypedArray } from '@kitware/vtk.js/types';
 import * as Comlink from 'comlink';
 import vtkLabelMap from '@/src/vtk/LabelMap';
 import { gaussianSmoothLabelMapWorker } from '@/src/core/tools/paint/gaussianSmooth.worker';
@@ -62,7 +61,7 @@ export const useGaussianSmoothStore = defineStore('gaussianSmooth', () => {
   async function computeAlgorithm(
     segImage: vtkLabelMap,
     activeSegment: number
-  ): Promise<TypedArray> {
+  ) {
     const params = {
       sigma: sigma.value,
       label: activeSegment,

src/store/tools/process.ts

@@ -36,12 +36,10 @@ type PreviewingState = {
 
 type ProcessState = StartState | ComputingState | PreviewingState;
 
-export interface ProcessAlgorithm {
-  compute: (
-    segImage: vtkLabelMap,
-    activeSegment: number
-  ) => Promise<TypedArray>;
-}
+export type ProcessAlgorithm = (
+  segImage: vtkLabelMap,
+  activeSegment: number
+) => Promise<TypedArray | number[]>;
 
 export const useProcessStore = defineStore('process', () => {
   const processState = ref<ProcessState>({ step: 'start' });
@@ -117,10 +115,7 @@ export const useProcessStore = defineStore('process', () => {
     }
 
     try {
-      const outputScalars = await algorithm.compute(
-        segImage,
-        paintStore.activeSegment
-      );
+      const outputScalars = await algorithm(segImage, paintStore.activeSegment);
 
       // If the state changed during the async operation, stop processing
       if (processState.value.step !== 'computing') {

src/utils/index.ts

@@ -258,6 +258,23 @@ export const TypedArrayConstructorNames = [
   'Float64Array',
 ];
 
+/**
+ * Creates a new typed array of the same type as the source array.
+ * This utility handles the TypeScript typing issues when using array.constructor.
+ *
+ * @param sourceArray The source array to match the type of
+ * @param arrayLength The length of the new array
+ * @returns A new array of the same type as sourceArray
+ */
+export function createTypedArrayLike<T extends TypedArray | number[]>(
+  sourceArray: T,
+  arrayLength: number
+): T {
+  return new (sourceArray.constructor as new (length: number) => T)(
+    arrayLength
+  );
+}
+
 // https://stackoverflow.com/a/74823834
 type Entries<T> = {
   [K in keyof T]-?: [K, T[K]];