分割部分问题修复

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

@@ -1606,9 +1606,9 @@ export default {
             getTextLines: this.getEllipticalROIToolTextLines
           })
           toolGroup.addTool(FixedRadiusCircleROITool.toolName, {
-          radius: Number.isFinite(this.taskInfo.CircleRadius) ? this.taskInfo.CircleRadius : 1,
+            radius: Number.isFinite(this.taskInfo.CircleRadius) ? this.taskInfo.CircleRadius : 1,
-          getTextLines: this.getCircleROIToolTextLines
+            getTextLines: this.getCircleROIToolTextLines
-        })
+          })
           toolGroup.addTool(AngleTool.toolName, {
             getTextLines: this.getAngleToolTextLines
           })
@@ -3160,8 +3160,10 @@ export default {
         this.fullScreenIndex = null
         this.isMPR = false
         obj.isChange = false
-        this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(obj)
         return this.$nextTick(() => {
+          DicomEvent.$emit('activeSeries', obj)
+          DicomEvent.$emit('changeMPR')
+          this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(obj)
           const renderingEngine = getRenderingEngine(renderingEngineId)
           renderingEngine.resize(true, false)
           renderingEngine.render()
@@ -3851,6 +3853,7 @@ export default {
         if (series.ImageIds.length <= 5) return this.$confirm(this.$t('trials:reading:confirm:smallNumberOfimage'), this.$t('system:menu:confirm:title:warning'), {
           type: 'warning'
         })
+        DicomEvent.$emit('changeMPR')
         if (series.ImageIds.length > 500) {
           let res = await this.getSystemInfo()
           if (!res) return false

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

@@ -8,24 +8,24 @@
                 <div class="tool-frame">
                     <div :title="$t('trials:Segmentations:tools:contour')"
                         :class="['tool-item', activeTool === 'LabelMapEditWithContour' && segmentList.length > 0 ? 'tool-item-active' : '']"
-                        :style="{ cursor: segmentList.length <= 0 || (curSegment && curSegment.lock) ? 'not-allowed' : 'pointer' }"
+                        :style="{ cursor: segmentList.length <= 0 || (curSegment && curSegment.lock) || ['viewport-MPR-1', 'viewport-MPR-2'].includes(`${viewportKey}-${activeViewportIndex}`) ? 'not-allowed' : 'pointer' }"
                         @click.prevent="setToolActive('LabelMapEditWithContour')">
                         <svg-icon icon-class="contour" class="svg-icon" />
                     </div>
                     <div :title="$t('trials:Segmentations:tools:thresholecircle')"
                         :class="['tool-item', ThresholdTools.includes(activeTool) && segmentList.length > 0 ? 'tool-item-active' : '']"
-                        :style="{ cursor: segmentList.length <= 0 || (curSegment && curSegment.lock) ? 'not-allowed' : 'pointer' }"
+                        :style="{ cursor: segmentList.length <= 0 || (curSegment && curSegment.lock) || ['viewport-MPR-1', 'viewport-MPR-2'].includes(`${viewportKey}-${activeViewportIndex}`) ? 'not-allowed' : 'pointer' }"
                         @click.prevent="initThreshold">
                         <svg-icon icon-class="thresholecircle" class="svg-icon" />
                     </div>
                     <div :title="$t('trials:Segmentations:tools:circularbrush')"
                         :class="['tool-item', activeTool === 'CircularBrush' && segmentList.length > 0 ? 'tool-item-active' : '']"
-                        :style="{ cursor: segmentList.length <= 0 || (curSegment && curSegment.lock) ? 'not-allowed' : 'pointer' }"
+                        :style="{ cursor: segmentList.length <= 0 || (curSegment && curSegment.lock) || ['viewport-MPR-1', 'viewport-MPR-2'].includes(`${viewportKey}-${activeViewportIndex}`) ? 'not-allowed' : 'pointer' }"
                         @click.prevent="setToolActive('CircularBrush')">
                         <svg-icon icon-class="circularbrush" class="svg-icon" />
                     </div>
                     <div :class="['tool-item', activeTool === 'CircularEraser' && segmentList.length > 0 ? 'tool-item-active' : '']"
-                        :style="{ cursor: segmentList.length <= 0 || (curSegment && curSegment.lock) ? 'not-allowed' : 'pointer' }"
+                        :style="{ cursor: segmentList.length <= 0 || (curSegment && curSegment.lock) || ['viewport-MPR-1', 'viewport-MPR-2'].includes(`${viewportKey}-${activeViewportIndex}`) ? 'not-allowed' : 'pointer' }"
                         :title="$t('trials:Segmentations:tools:Eraser')"
                         @click.prevent="setToolActive('CircularEraser')">
                         <svg-icon icon-class="clear" class="svg-icon" />
@@ -406,6 +406,7 @@ export default {
         DicomEvent.$on('activeSeries', (series) => {
             console.log(series, 'series')
             let { TaskInfo = {}, Id } = series
+            if (this.isMPR) return false
             if (Id === this.series.Id && TaskInfo.VisitTaskId === this.visitInfo.VisitTaskId) return false
             this.series = series
             this.$emit("update:curSegSeries", Object.assign(series, {}))
@@ -419,6 +420,12 @@ export default {
             if (viewportId !== `${this.viewportKey}-${this.activeViewportIndex}`) return false
             this.loading = false
         })
+        DicomEvent.$on('changeMPR', () => {
+            if (this.loading) return false
+            // if (viewportId !== `${this.viewportKey}-${this.activeViewportIndex}`) return false
+            this.segmentationId = this.segmentList[0].segmentationId
+            this.segmentIndex = this.segmentList[0] ? this.segmentList[0].segments[0].segmentIndex : null
+        })
         const digitPlaces = Number(localStorage.getItem('digitPlaces'))
         this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
         // document.addEventListener("click", () => {
@@ -605,6 +612,7 @@ export default {
             if (this.segmentList.length <= 0) return false
             if (this.curSegment.lock) return false
             if (this.histogramVisible && !this.ThresholdTools.includes(toolName)) return false
+            if (['viewport-MPR-1', 'viewport-MPR-2'].includes(`${this.viewportKey}-${this.activeViewportIndex}`)) return false
             const toolGroupId = this.isMPR ? this.volumeToolGroupId : `${this.viewportKey}-${this.activeViewportIndex}`
             const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
             if (this.activeTool === toolName) {

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

@@ -403,12 +403,12 @@ export default {
                 let spacing = volume ? volume.spacing : []
                 this.imageInfo.sliceThickness = type === 'AXIAL' ? spacing[2] : spacing[0]
                 this.getOrientationMarker()
-                if (this.series && this.series.Id) {
+                // if (this.series && this.series.Id) {
-                    let annotations = cornerstoneTools.annotation.state.getAllAnnotations().filter(item => item.metadata.toolName !== 'ScaleOverlay' && item.metadata.volumeId !== this.volumeId && !item.metadata.segmentationId && item.seriesId !== this.series.Id)
+                //     let annotations = cornerstoneTools.annotation.state.getAllAnnotations().filter(item => item.metadata.toolName !== 'ScaleOverlay' && item.metadata.volumeId !== this.volumeId && !item.metadata.segmentationId && item.seriesId !== this.series.Id)
-                    annotations.forEach(item => {
+                //     annotations.forEach(item => {
-                        cornerstoneTools.annotation.state.removeAnnotation(item.annotationUID)
+                //         cornerstoneTools.annotation.state.removeAnnotation(item.annotationUID)
-                    })
+                //     })
-                }
+                // }
                 this.$emit('renderAnnotations', this.series)
                 let properties = viewport.getProperties()
                 if (this.isFusion) {