feat: add support to scoord3d (#5016)

Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>

platform/core/src/services/MeasurementService/MeasurementService.ts

@@ -74,10 +74,11 @@ const EVENTS = {
   RAW_MEASUREMENT_ADDED: 'event::raw_measurement_added',
   MEASUREMENT_REMOVED: 'event::measurement_removed',
   MEASUREMENTS_CLEARED: 'event::measurements_cleared',
-  // Give the viewport a chance to jump to the measurement
-  JUMP_TO_MEASUREMENT_VIEWPORT: 'event:jump_to_measurement_viewport',
-  // Give the layout a chance to jump to the measurement
-  JUMP_TO_MEASUREMENT_LAYOUT: 'event:jump_to_measurement_layout',
+  /**
+   *  Indicate some viewport should be jumped to.  This will have to be implemented
+   * by a single handler that can look at all viewports to decide who should handle it.
+   */
+  JUMP_TO_MEASUREMENT: 'event:jump_to_measurement',
 };
 
 const VALUE_TYPES = {
@@ -431,11 +432,7 @@ class MeasurementService extends PubSubService {
       return;
     }
 
-    let internalUID = data.id;
-    if (!internalUID) {
-      internalUID = guid();
-      log.warn(`Measurement ID not found. Generating UID: ${internalUID}`);
-    }
+    const internalUID = data.uid || guid();
 
     const annotationData = data.annotation.data;
 
@@ -497,7 +494,7 @@ class MeasurementService extends PubSubService {
         mapping => mapping.annotationType === annotationType
       );
       if (!sourceMapping) {
-        console.log('No source mapping', source);
+        console.log('No source mapping', source.uid, annotationType, source);
         return;
       }
       const { toMeasurementSchema } = sourceMapping;
@@ -656,19 +653,7 @@ class MeasurementService extends PubSubService {
   }
 
   /**
-   * This method calls the subscriptions for JUMP_TO_MEASUREMENT_VIEWPORT
-   * and JUMP_TO_MEASUREMENT_LAYOUT.  There are two events which are
-   * fired because there are two different items which might want to handle
-   * the event.  First, there might already be a viewport which can handle
-   * the event.  If so, then the layout doesn't need to necessarily change.
-   * This is communicated by the isConsumed value on the event itself.
-   * Otherwise, the layout itself may need to be navigated to in order
-   * to provide a viewport which can show the given measurement.
-   *
-   * When a viewport decides to apply the event, it should call the consume()
-   * method on the event, so that other listeners know they do not need to
-   * navigate.  This does NOT affect whether the layout event is fired, and
-   * merely causes it to fire the event with the isConsumed set to true.
+   * This method calls the subscription for JUMP_TO_MEASUREMENT
    */
 
   public jumpToMeasurement(viewportId: string, measurementUID: string): void {
@@ -678,16 +663,14 @@ class MeasurementService extends PubSubService {
       log.warn(`No measurement uid, or unable to find by uid.`);
       return;
     }
-    const consumableEvent = this.createConsumableEvent({
+    const event = {
       viewportId,
       measurement,
-    });
+    };
 
-    // Important: we should broadcast the layout event first, since
-    // in the layout there might be a viewport that we can match and choose
-    // and jump in it before we decide on changing the orientation of different viewports
-    this._broadcastEvent(EVENTS.JUMP_TO_MEASUREMENT_LAYOUT, consumableEvent);
-    this._broadcastEvent(EVENTS.JUMP_TO_MEASUREMENT_VIEWPORT, consumableEvent);
+    // A single handler will decide on which window to jump to, previously
+    // this was handled by a consumable event
+    this._broadcastEvent(EVENTS.JUMP_TO_MEASUREMENT, event);
   }
 
   _getSourceUID(name, version) {

platform/core/src/services/ViewportGridService/ViewportGridService.ts

@@ -45,10 +45,6 @@ class ViewportGridService extends PubSubService {
     return this.presentationIdProviders.get(id);
   }
 
-  public setIsReferenceViewable(viewportId: string, isReferenceViewable: boolean): void {
-    this.serviceImplementation._setIsReferenceViewable(viewportId, isReferenceViewable);
-  }
-
   public getPresentationId(id: string, viewportId: string): string | null {
     const state = this.getState();
     const viewport = state.viewports.get(viewportId);
@@ -104,7 +100,6 @@ class ViewportGridService extends PubSubService {
     set: setImplementation,
     getNumViewportPanes: getNumViewportPanesImplementation,
     setViewportIsReady: setViewportIsReadyImplementation,
-    setIsReferenceViewable: setIsReferenceViewableImplementation,
     getViewportState: getViewportStateImplementation,
   }): void {
     if (getViewportStateImplementation) {
@@ -139,9 +134,6 @@ class ViewportGridService extends PubSubService {
     if (setViewportIsReadyImplementation) {
       this.serviceImplementation._setViewportIsReady = setViewportIsReadyImplementation;
     }
-    if (setIsReferenceViewableImplementation) {
-      this.serviceImplementation._setIsReferenceViewable = setIsReferenceViewableImplementation;
-    }
   }
 
   public publishViewportsReady() {

platform/core/src/types/DisplaySet.ts

@@ -29,6 +29,9 @@ export type DisplaySet = {
   /** A fetch method to get the thumbnail */
   getThumbnailSrc?(imageId?: string): Promise<string>;
 
+  /** An opaque type of this viewport, used internally to specify which viewport to use */
+  viewportType;
+
   /**
    * A fetch URL to display the content.  This is used for content such as
    * pdf display.

platform/core/src/types/ViewportGridType.ts

@@ -45,10 +45,6 @@ export interface ViewportGridState {
   activeViewportId: string | null;
   layout: Layout;
   isHangingProtocolLayout: boolean;
-  isReferenceViewable: (props: {
-    viewportId: string;
-    reference: Record<string, unknown>;
-  }) => boolean;
   viewports: GridViewports;
 }