Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue

@@ -2626,7 +2626,7 @@ export default {
         toolGroup.setToolDisabled(FusionJumpToPointTool.toolName)
       }
     },
-    dispatchFusionCenterPoint() {
+    dispatchFusionCenterPoint(retryCount = 0) {
       const renderingEngine = getRenderingEngine(renderingEngineId)
       if (!renderingEngine) return
       const toolGroup = ToolGroupManager.getToolGroup(this.fusionToolGroupId)
@@ -2652,6 +2652,11 @@ export default {
         })
         return
       }
+      if (retryCount < 10) {
+        setTimeout(() => {
+          this.dispatchFusionCenterPoint(retryCount + 1)
+        }, 120)
+      }
     },
     setFusionMipRotateEnabled(enabled) {
       if (!this.isFusion) return

src/views/trials/trials-panel/reading/dicoms3D/components/tools/FusionJumpToPointTool.js

@@ -194,9 +194,7 @@ class FusionJumpToPointTool extends AnnotationDisplayTool {
     if (!viewport?.element) return false
 
     const annotations = getAnnotations(this.getToolName(), viewport.element) || []
-    const crosshairAnnotation = annotations.find((item) =>
+    const crosshairAnnotation = this._findViewportCrosshairAnnotationFromList(annotations, viewport.id)
-      item?.data?.type === 'fusion-jump-crosshair' && item?.data?.viewportId === viewport.id
-    )
     if (!crosshairAnnotation) return false
 
     const worldPoint = crosshairAnnotation.data?.handles?.points?.[0]
@@ -323,9 +321,20 @@ class FusionJumpToPointTool extends AnnotationDisplayTool {
   _getViewportCrosshairAnnotation(viewport) {
     if (!viewport?.element) return null
     const annotations = getAnnotations(this.getToolName(), viewport.element) || []
-    return annotations.find((item) =>
+    return this._findViewportCrosshairAnnotationFromList(annotations, viewport.id)
-      item?.data?.type === 'fusion-jump-crosshair' && item?.data?.viewportId === viewport.id
+  }
-    ) || null
+
+  _findViewportCrosshairAnnotationFromList(annotations, viewportId) {
+    if (!Array.isArray(annotations) || !viewportId) return null
+    for (let i = 0; i < annotations.length; i++) {
+      const item = annotations[i]
+      const data = item && item.data
+      if (!data) continue
+      if (data.type === 'fusion-jump-crosshair' && data.viewportId === viewportId) {
+        return item
+      }
+    }
+    return null
   }
 
   _tryStartDrag(evt) {
@@ -521,8 +530,13 @@ class FusionJumpToPointTool extends AnnotationDisplayTool {
 
   _getReferenceLineColor(viewportId, fallbackColor) {
     if (typeof this.configuration.getReferenceLineColor === 'function') {
-      const color = this.configuration.getReferenceLineColor(viewportId)
+      try {
+        const safeViewportId = viewportId || ''
+        const color = this.configuration.getReferenceLineColor(safeViewportId)
         if (color) return color
+      } catch (e) {
+        console.log(e)
+      }
     }
     return fallbackColor || '#6fb9ff'
   }
@@ -538,7 +552,11 @@ class FusionJumpToPointTool extends AnnotationDisplayTool {
     const centerHoleSize = Number.isFinite(appearance.centerHoleSize) ? appearance.centerHoleSize : 8
     let color = appearance.color
     if (!color && typeof this.configuration.getReferenceLineColor === 'function') {
-      color = this.configuration.getReferenceLineColor(sourceViewportId)
+      try {
+        color = this.configuration.getReferenceLineColor(sourceViewportId || '')
+      } catch (e) {
+        console.log(e)
+      }
     }
 
     return {