feat(toolbar): new Toolbar to enable reactive state synchronization (#3983)

extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts

@@ -962,7 +962,7 @@ class SegmentationService extends PubSubService {
 
     // Force use of a Uint8Array SharedArrayBuffer for the segmentation to save space and so
     // it is easily compressible in worker thread.
-    await volumeLoader.createAndCacheDerivedVolume(volumeId, {
+    await volumeLoader.createAndCacheDerivedSegmentationVolume(volumeId, {
       volumeId: segmentationId,
       targetBuffer: {
         type: 'Uint8Array',
@@ -1368,8 +1368,6 @@ class SegmentationService extends PubSubService {
 
   public setConfiguration = (configuration: SegmentationConfig): void => {
     const {
-      brushSize,
-      brushThresholdGate,
       fillAlpha,
       fillAlphaInactive,
       outlineWidthActive,
@@ -1461,7 +1459,6 @@ class SegmentationService extends PubSubService {
     segmentInfo.label = label;
 
     if (suppressEvents === false) {
-      // this._setSegmentationModified(segmentationId);
       this._broadcastEvent(this.EVENTS.SEGMENTATION_UPDATED, {
         segmentation,
       });

extensions/cornerstone/src/services/SyncGroupService/SyncGroupService.ts

@@ -1,4 +1,5 @@
 import { synchronizers, SynchronizerManager, Synchronizer } from '@cornerstonejs/tools';
+import { getRenderingEngines } from '@cornerstonejs/core';
 
 import { pubSubServiceInterface, Types, ServicesManager } from '@ohif/core';
 
@@ -25,6 +26,7 @@ const POSITION = 'cameraposition';
 const VOI = 'voi';
 const ZOOMPAN = 'zoompan';
 const STACKIMAGE = 'stackimage';
+const IMAGE_SLICE = 'imageslice';
 
 const asSyncGroup = (syncGroup: string | SyncGroup): SyncGroup =>
   typeof syncGroup === 'string' ? { type: syncGroup } : syncGroup;
@@ -45,9 +47,14 @@ export default class SyncGroupService {
     [POSITION]: synchronizers.createCameraPositionSynchronizer,
     [VOI]: synchronizers.createVOISynchronizer,
     [ZOOMPAN]: synchronizers.createZoomPanSynchronizer,
+    // todo: remove stack image since it is legacy now and the image_slice
+    // handles both stack and volume viewports
     [STACKIMAGE]: synchronizers.createImageSliceSynchronizer,
+    [IMAGE_SLICE]: synchronizers.createImageSliceSynchronizer,
   };
 
+  synchronizersByType: { [key: string]: Synchronizer[] } = {};
+
   constructor(serviceManager: ServicesManager) {
     this.servicesManager = serviceManager;
     this.listeners = {};
@@ -57,14 +64,27 @@ export default class SyncGroupService {
   }
 
   private _createSynchronizer(type: string, id: string, options): Synchronizer | undefined {
+    // Initialize if not already done
+    this.synchronizersByType[type] = this.synchronizersByType[type] || [];
+
     const syncCreator = this.synchronizerCreators[type.toLowerCase()];
+
     if (syncCreator) {
-      return syncCreator(id, options);
+      const synchronizer = syncCreator(id, options);
+
+      if (synchronizer) {
+        this.synchronizersByType[type].push(synchronizer);
+        return synchronizer;
+      }
     } else {
-      console.warn('Unknown synchronizer type', type, id);
+      console.warn(`Unknown synchronizer type: ${type}, id: ${id}`);
     }
   }
 
+  public getSyncCreatorForType(type: string): SyncCreator {
+    return this.synchronizerCreators[type.toLowerCase()];
+  }
+
   /**
    * Creates a synchronizer type.
    * @param type is the type of the synchronizer to create
@@ -78,6 +98,15 @@ export default class SyncGroupService {
     return SynchronizerManager.getSynchronizer(id);
   }
 
+  /**
+   * Retrieves an array of synchronizers of a specific type.
+   * @param type - The type of synchronizers to retrieve.
+   * @returns An array of synchronizers of the specified type.
+   */
+  public getSynchronizersOfType(type: string): Synchronizer[] {
+    return this.synchronizersByType[type];
+  }
+
   protected _getOrCreateSynchronizer(
     type: string,
     id: string,
@@ -125,14 +154,17 @@ export default class SyncGroupService {
     SynchronizerManager.destroy();
   }
 
-  public getSynchronizersForViewport(
-    viewportId: string,
-    renderingEngineId: string
-  ): Synchronizer[] {
-    return SynchronizerManager.getAllSynchronizers().filter(
+  public getSynchronizersForViewport(viewportId: string): Synchronizer[] {
+    const renderingEngine =
+      getRenderingEngines().find(re => {
+        return re.getViewports().find(vp => vp.id === viewportId);
+      }) || getRenderingEngines()[0];
+
+    const synchronizers = SynchronizerManager.getAllSynchronizers();
+    return synchronizers.filter(
       s =>
-        s.hasSourceViewport(renderingEngineId, viewportId) ||
-        s.hasTargetViewport(renderingEngineId, viewportId)
+        s.hasSourceViewport(renderingEngine.id, viewportId) ||
+        s.hasTargetViewport(renderingEngine.id, viewportId)
     );
   }
 

extensions/cornerstone/src/services/ToolGroupService/ToolGroupService.ts

@@ -189,19 +189,6 @@ export default class ToolGroupService {
     this.addToolsToToolGroup(toolGroupId, tools);
     return toolGroup;
   }
-
-  /**
-  private changeConfigurationIfNecessary(toolGroup, volumeUID) {
-    // handle specific assignment for volumeUID (e.g., fusion)
-    const toolInstances = toolGroup._toolInstances;
-    // Object.values(toolInstances).forEach(toolInstance => {
-    //   if (toolInstance.configuration) {
-    //     toolInstance.configuration.volumeUID = volumeUID;
-    //   }
-    // });
-  }
-  */
-
   /**
    * Get the tool's configuration based on the tool name and tool group id
    * @param toolGroupId - The id of the tool group that the tool instance belongs to.

extensions/cornerstone/src/services/ViewportService/CornerstoneViewportService.ts

@@ -234,7 +234,7 @@ class CornerstoneViewportService extends PubSubService implements IViewportServi
     }
 
     const { viewPlaneNormal, viewUp } = csViewport.getCamera();
-    const initialImageIndex = csViewport.getCurrentImageIdIndex();
+    const initialImageIndex = csViewport.getCurrentImageIdIndex() || 0;
     const zoom = csViewport.getZoom();
     const pan = csViewport.getPan();
 
@@ -347,10 +347,7 @@ class CornerstoneViewportService extends PubSubService implements IViewportServi
 
     const { stateSyncService, syncGroupService } = this.servicesManager.services;
 
-    const synchronizers = syncGroupService.getSynchronizersForViewport(
-      viewportId,
-      this.renderingEngine.id
-    );
+    const synchronizers = syncGroupService.getSynchronizersForViewport(viewportId);
 
     const { positionPresentationStore, synchronizersStore, lutPresentationStore } =
       stateSyncService.getState();