refactor: general cleanup

Author: PaulHax

src/components/tools/ScalarProbe.vue

@@ -118,47 +118,49 @@ const getImageSamples = (x: number, y: number) => {
     firstToSample.image.indexToWorld(pickedIjk) as vec3
   );
 
-  const samples = sampleSet.value.map((item: any) => {
-    // Convert world position to this specific image's IJK
-    const itemIjk = worldPointToIndex(item.image, worldPosition);
-    const dims = item.image.getDimensions();
-    const scalarData = item.image.getPointData().getScalars();
-
-    // Round to nearest integer indices
-    const i = Math.round(itemIjk[0]);
-    const j = Math.round(itemIjk[1]);
-    const k = Math.round(itemIjk[2]);
-
-    // Check bounds
-    if (
-      i < 0 ||
-      j < 0 ||
-      k < 0 ||
-      i >= dims[0] ||
-      j >= dims[1] ||
-      k >= dims[2]
-    ) {
-      return null;
-    }
-
-    const index = dims[0] * dims[1] * k + dims[0] * j + i;
-    const scalars = scalarData.getTuple(index) as number[];
-    const baseInfo = { id: item.id, name: item.name };
-
-    if (item.type === 'segmentGroup') {
-      return {
-        ...baseInfo,
-        displayValues: scalars.map(
-          (v) => item.segments.byValue[v]?.name || 'Background'
-        ),
-      };
-    }
-    return { ...baseInfo, displayValues: scalars };
-  });
+  const samples = sampleSet.value
+    .map((item: any) => {
+      // Convert world position to this specific image's IJK
+      const itemIjk = worldPointToIndex(item.image, worldPosition);
+      const dims = item.image.getDimensions();
+      const scalarData = item.image.getPointData().getScalars();
+
+      // Round to nearest integer indices
+      const i = Math.round(itemIjk[0]);
+      const j = Math.round(itemIjk[1]);
+      const k = Math.round(itemIjk[2]);
+
+      // Check bounds
+      if (
+        i < 0 ||
+        j < 0 ||
+        k < 0 ||
+        i >= dims[0] ||
+        j >= dims[1] ||
+        k >= dims[2]
+      ) {
+        return null;
+      }
+
+      const index = dims[0] * dims[1] * k + dims[0] * j + i;
+      const scalars = scalarData.getTuple(index) as number[];
+      const baseInfo = { id: item.id, name: item.name };
+
+      if (item.type === 'segmentGroup') {
+        return {
+          ...baseInfo,
+          displayValues: scalars.map(
+            (v) => item.segments.byValue[v]?.name || 'Background'
+          ),
+        };
+      }
+      return { ...baseInfo, displayValues: scalars };
+    })
+    .filter((s): s is NonNullable<typeof s> => s !== null);
 
   return {
     pos: worldPosition,
-    samples: samples.filter((s): s is NonNullable<typeof s> => s !== null),
+    samples,
   };
 };
 

src/components/vtk/VtkSegmentationSliceRepresentation.vue

@@ -111,22 +111,19 @@ watchEffect(() => {
 const slice = vtkFieldRef(sliceRep.mapper, 'slice');
 const { slice: storedSlice } = useSliceConfig(viewId, parentImageId);
 
-watchImmediate(
-  [storedSlice, labelmapLpsOrientation, () => parentMetadata.value],
-  () => {
-    const parentImage = parentMetadata.value;
-    const labelmap = imageData.value;
-    if (!parentImage || !labelmap || storedSlice.value == null) return;
-
-    slice.value = convertSliceIndex(
-      storedSlice.value,
-      parentImage.lpsOrientation,
-      parentImage.indexToWorld,
-      labelmap,
-      axis.value
-    );
-  }
-);
+watchImmediate([storedSlice, labelmapLpsOrientation, parentMetadata], () => {
+  const parentImage = parentMetadata.value;
+  const labelmap = imageData.value;
+  if (!parentImage || !labelmap || storedSlice.value == null) return;
+
+  slice.value = convertSliceIndex(
+    storedSlice.value,
+    parentImage.lpsOrientation,
+    parentImage.indexToWorld,
+    labelmap,
+    axis.value
+  );
+});
 
 // set coloring properties
 const applySegmentColoring = () => {

src/io/import/dataSource.ts

@@ -5,57 +5,58 @@ import { Maybe } from '@/src/types';
 /**
  * Represents a URI source with a file name for the downloaded resource.
  */
-export interface UriSource {
+export type UriSource = {
   type: 'uri';
   uri: string;
   name: string;
   mime?: string;
   fetcher?: Fetcher;
-}
+};
 
 /**
  * Represents a user-specified file.
  */
-export interface FileSource {
+export type FileSource = {
   type: 'file';
   file: File;
   fileType: string;
-}
+};
 
 /**
  * Represents an archive member. The parent should exist and be a FileSource.
  */
-export interface ArchiveSource {
+export type ArchiveSource = {
   type: 'archive';
-  // Full path + filename inside the archive
   path: string;
   parent: FileSource;
-}
+};
 
 /**
  * Represents a collection of data sources.
  *
  * This is used for data that is derived from a collection of data sources,
  * e.g. reconstructed DICOM.
  */
-export interface CollectionSource {
+export type CollectionSource = {
   type: 'collection';
-
   sources: DataSource[];
-}
+};
 
 /**
  * Represents a data chunk for further processing and import.
  */
-export interface ChunkSource {
+export type ChunkSource = {
   type: 'chunk';
   chunk: Chunk;
   mime: string;
-}
+};
 
-export interface StateFileLeaf {
+/**
+ * Used to map DICOM volumes back to state file datasets.
+ */
+export type StateFileLeaf = {
   stateID: string;
-}
+};
 
 /**
  * Represents a source of data.

wdio.shared.conf.ts

@@ -36,6 +36,8 @@ export const TEST_PORT = 4567;
 // DOWNLOAD_TIMEOUT=60000 && npm run test:e2e:dev
 export const DOWNLOAD_TIMEOUT = Number(process.env.DOWNLOAD_TIMEOUT ?? 20000);
 
+const IS_CI = !!(process.env.CI || process.env.GITHUB_ACTIONS);
+
 const ROOT = projectRoot();
 const TMP = '.tmp/';
 // TEMP_DIR is also browser downloads directory
@@ -59,7 +61,7 @@ export const config: Options.Testrunner = {
   // ============
   // Capabilities
   // ============
-  maxInstances: 1,
+  maxInstances: IS_CI ? 1 : 6,
   //
   // ===================
   // Test Configurations