POC: bring viv-dicomweb-test work into SLIM and add basic bulk annotations support

craco.config.js

@@ -130,6 +130,19 @@ module.exports = {
         }
       }
 
+      /* Viv / Deck.gl / Luma ship modern JS; transpile for CRA 5 / webpack 5. */
+      config.module.rules.push({
+        test: /\.m?js$/,
+        include: /node_modules[\\/](@deck\.gl|@luma\.gl|@math\.gl|@probe\.gl|@vivjs)[\\/]/,
+        use: {
+          loader: require.resolve('babel-loader'),
+          options: {
+            presets: [require.resolve('babel-preset-react-app/dependencies')],
+            cacheDirectory: true
+          }
+        }
+      })
+
       return config
     }
   },

package.json

@@ -37,6 +37,20 @@
     ]
   },
   "dependencies": {
+    "@deck.gl/core": "9.1.15",
+    "@deck.gl/extensions": "9.1.15",
+    "@deck.gl/geo-layers": "9.1.15",
+    "@deck.gl/layers": "9.1.15",
+    "@deck.gl/mesh-layers": "9.1.15",
+    "@deck.gl/react": "9.1.15",
+    "@deck.gl/widgets": "9.1.15",
+    "@vivjs/layers": "^0.20.0",
+    "@vivjs/loaders": "^0.20.0",
+    "@luma.gl/constants": "~9.1.10",
+    "@luma.gl/core": "~9.1.10",
+    "@luma.gl/engine": "~9.1.10",
+    "@luma.gl/shadertools": "~9.1.10",
+    "@luma.gl/webgl": "~9.1.10",
     "antd": "^4.22.8",
     "classnames": "^2.2.6",
     "dcmjs": "^0.52.0",
@@ -83,5 +97,21 @@
     "react-test-renderer": "^18.2.0",
     "sonarqube-scanner": "^4.3.0",
     "typescript": "^4.7.4"
+  },
+  "overrides": {
+    "@types/minimatch": "5.1.2",
+    "@deck.gl/core": "9.1.15",
+    "@deck.gl/extensions": "9.1.15",
+    "@deck.gl/geo-layers": "9.1.15",
+    "@deck.gl/layers": "9.1.15",
+    "@deck.gl/mesh-layers": "9.1.15",
+    "@deck.gl/react": "9.1.15",
+    "@deck.gl/widgets": "9.1.15",
+    "nth-check": "2.0.1",
+    "wrap-ansi": "7.0.0",
+    "make-dir": "3.1.0",
+    "express": "4.21.0",
+    "rollup": "3.29.5",
+    "semver": "7.5.2"
   }
 }

src/App.tsx

@@ -82,6 +82,8 @@ function ParametrizedCaseViewer({
         app={app}
         enableAnnotationTools={enableAnnotationTools}
         studyInstanceUID={studyInstanceUID}
+        useViv={config.useViv === true}
+        vivSettings={config.vivSettings}
       />
     </ValidationProvider>
   )

src/AppConfig.d.ts

@@ -98,6 +98,23 @@ export interface OidcSettings {
   endSessionEndpoint?: string
 }
 
+export interface VivChannelSelection {
+  c: number
+  t?: number
+  z?: number
+}
+
+export interface VivSettings {
+  selections?: VivChannelSelection[]
+  channelsVisible?: boolean[]
+  contrastLimits?: Array<[number, number]>
+  colors?: Array<[number, number, number]>
+  initialViewState?: {
+    target: [number, number, number]
+    zoom?: number
+  }
+}
+
 export default interface AppConfig {
   /**
    * Currently, only one server is supported. However, support for multiple
@@ -128,4 +145,11 @@ export default interface AppConfig {
     enableInDevelopment?: boolean
   }
   enableMemoryMonitoring?: boolean
+  /**
+   * When true, the slide viewport uses Viv + Deck.gl (src/viv)
+   * instead of the default OpenLayers-based SlideViewer. Limited feature set.
+   */
+  useViv?: boolean
+  /** Optional display overrides for the Viv viewer path (channels, contrast, etc.). */
+  vivSettings?: VivSettings
 }

src/DicomWebManager.ts

@@ -623,6 +623,20 @@ export default class DicomWebManager implements dwc.api.DICOMwebClient {
     return this.stores[0].client.headers
   }
 
+  /**
+   * Run a callback on the primary {@link dwc.api.DICOMwebClient} (the store used for reads).
+   * Used e.g. to append Viv tile {@link dwc.api.DICOMwebClientOptions.requestHooks} that must
+   * see the same XHR pipeline as {@link dmv.viewer.VolumeImageViewer}.
+   */
+  applyToPrimaryDicomwebClient(
+    fn: (client: dwc.api.DICOMwebClient) => void,
+  ): void {
+    if (this.stores.length === 0) {
+      return
+    }
+    fn(this.stores[0].client)
+  }
+
   /**
    * Store new instances in the first writable configured store. Picking the
    * first writable (rather than always store[0]) keeps backwards compatibility