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

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

@@ -564,17 +564,18 @@ export default {
             const renderingEngine = getRenderingEngine(this.renderingEngineId)
             const viewport = renderingEngine.getViewport(this.viewportId)
             if (!viewport) return
-
+            let index = this.series.SliceIndex
             if (forceFitToWindow) {
                 viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true })
                 viewport.render()
+                this.setFullScreen(index)
                 return
             }
 
             viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true })
             const canvas = viewport.getCanvas() || this.element.querySelector('canvas')
             const imageData = viewport.getImageData()?.imageData
-            const dimensions = imageData?.getDimensions?.()
+            const dimensions = imageData?.getDimensions()
             const imageWidth = dimensions?.[0]
             const imageHeight = dimensions?.[1]
             const canvasWidth = canvas?.clientWidth
@@ -582,16 +583,17 @@ export default {
 
             if (!imageWidth || !imageHeight || !canvasWidth || !canvasHeight) {
                 viewport.render()
+                this.setFullScreen(index)
                 return
             }
 
             const fitScale = Math.min(canvasWidth / imageWidth, canvasHeight / imageHeight)
             if (fitScale > 0) {
-                // zoom=1 通常是 fit-to-window，这里换算为图像接近 1:1 像素显示
                 viewport.setZoom(1 / fitScale)
             }
 
             viewport.render()
+            this.setFullScreen(index)
         },
         voiChange(v) {
             const renderingEngine = getRenderingEngine(this.renderingEngineId)

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

@@ -4244,6 +4244,7 @@ export default {
             if (!res) return false
           }
         }
+        this.fullScreenIndex = null
         if (!data) {
           let { imageOrientationPatient, imagePositionPatient } = this.$refs[`viewport-${this.activeViewportIndex}`][0].imageInfo
           if (!imageOrientationPatient || !imagePositionPatient || imagePositionPatient.length <= 0 || imageOrientationPatient.length <= 0) return this.$confirm(this.$t('trials:reading:confirm:imageNotMPR'), this.$t('system:menu:confirm:title:warning'), {

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

@@ -595,10 +595,11 @@ export default {
             const renderingEngine = getRenderingEngine(this.renderingEngineId)
             const viewport = renderingEngine.getViewport(this.viewportId)
             if (!viewport) return
-
+            let index = this.series.SliceIndex
             if (forceFitToWindow) {
                 viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true })
                 viewport.render()
+                this.setFullScreen(index)
                 return
             }
 
@@ -613,6 +614,7 @@ export default {
 
             if (!imageWidth || !imageHeight || !canvasWidth || !canvasHeight) {
                 viewport.render()
+                this.setFullScreen(index)
                 return
             }
 
@@ -622,6 +624,7 @@ export default {
             }
 
             viewport.render()
+            this.setFullScreen(index)
         },
         voiChange(v) {
             const renderingEngine = getRenderingEngine(this.renderingEngineId)