分割部分问题解决

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

@@ -76,7 +76,9 @@ import * as cornerstoneTools from '@cornerstonejs/tools'
 import { createImageIdsAndCacheMetaData } from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/createImageIdsAndCacheMetaData'
 import setCtTransferFunctionForVolumeActor from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/setCtTransferFunctionForVolumeActor'
 import { setCtMappingRange } from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/setCtTransferFunctionForVolumeActor'
-import { setPetColorMapTransferFunctionForVolumeActor } from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/setPetColorMapTransferFunctionForVolumeActor'
+import {
+    setPetTransferFunctionForVolumeActor
+} from './helpers/index.js'
 import { vec3, mat4 } from 'gl-matrix'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 export default {
@@ -99,6 +101,10 @@ export default {
             default: () => {
                 return {}
             }
+        },
+        histogramVisible: {
+            type: Boolean,
+            default: false
         }
     },
     data() {
@@ -183,6 +189,7 @@ export default {
             this.element.addEventListener("CORNERSTONE_VOLUME_NEW_IMAGE", this.stackNewImage)
             this.element.addEventListener('CORNERSTONE_VOI_MODIFIED', this.voiModified)
             this.element.addEventListener('wheel', (e) => {
+                if (this.histogramVisible) return false
                 // console.log('CORNERSTONE_STACK_VIEWPORT_SCROLL')
                 const renderingEngine = getRenderingEngine(this.renderingEngineId)
                 const viewport = renderingEngine.getViewport(this.viewportId)
@@ -490,7 +497,7 @@ export default {
                     .setVolumes([{
                         volumeId: this.volumeId, callback: (r) => {
                             if (this.series.Modality === 'PT') {
-                                setPetColorMapTransferFunctionForVolumeActor(r, true)
+                                setPetTransferFunctionForVolumeActor(r)
                             } else {
                                 let volume = cache.getVolume(this.volumeId)
                                 const voi = metaData.get('voiLutModule', volume._imageIds[Math.ceil((volume._imageIds.length - 1) / 2)])
@@ -506,6 +513,15 @@ export default {
                         }
                     })
                 viewport.render()
+                if (this.series.Modality === 'PT') {
+                    setTimeout(() => {
+                        viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true })
+                        viewport.resetProperties()
+                        viewport.setProperties({ voiRange: { upper: 5, lower: 0 } })
+                        viewport.render()
+                        renderingEngine.render()
+                    }, 100)
+                }
             } catch (e) {
                 console.log(e)
             }

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

@@ -315,8 +315,9 @@
                     :rendering-engine-id="renderingEngineId" :viewport-id="`viewport-${index}`" :viewport-index="index"
                     :histogramVisible="histogramVisible" @activeViewport="activeViewport"
                     @toggleTaskByViewport="toggleTaskByViewport" @previewCD="previewCD"
-                    @renderAnnotations="renderAnnotations" @contentMouseup="contentMouseup" @resetViewport="resetViewport"
+                    @renderAnnotations="renderAnnotations" @contentMouseup="contentMouseup"
-                    v-if="readingTool === 3" v-resize="(e) => handleSizeChange(e, `viewport-${index}`)" />
+                    @resetViewport="resetViewport" v-if="readingTool === 3"
+                    v-resize="(e) => handleSizeChange(e, `viewport-${index}`)" />
                   <Viewport :ref="`viewport-${index}`" :data-viewport-uid="`viewport-${index}`"
                     :rendering-engine-id="renderingEngineId" :viewport-id="`viewport-${index}`" :viewport-index="index"
                     @activeViewport="activeViewport" @toggleTaskByViewport="toggleTaskByViewport" @previewCD="previewCD"
@@ -362,8 +363,8 @@
                   :volumeToolGroupId="volumeToolGroupId" :viewportKey="viewportKey" :global-loading.sync="loading"
                   :loadingText.sync="loadingText" :rendering-engine-id="renderingEngineId"
                   :activeViewportIndex="activeViewportIndex" :activeTool.sync="activeTool"
-                  :actionConfiguration="actionConfiguration" @setToolsPassive="setToolsPassive"
+                  :actionConfiguration="actionConfiguration" :histogramVisible="histogramVisible"
-                  @resetQuestion="resetQuestion" />
+                  @setToolsPassive="setToolsPassive" @resetQuestion="resetQuestion" />
               </el-tab-pane>
               <el-tab-pane :label="$t('trials:reading:dicom3D:tabs:ecrf')" name="ecrf">
                 <div v-for="s in visitTaskList" v-show="lastViewportTaskId === s.VisitTaskId" :key="s.VisitTaskId"
@@ -876,10 +877,10 @@ export default {
       handler() {
         if (this.readingTool !== 3) return false
         this.setToolsPassive()
-        let viewportIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3']
+        let viewportIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3', this.volumeToolGroupId]
-        if (this.isMPR) {
+        // if (this.isMPR) {
-          viewportIds = ['viewport-MPR-0', 'viewport-MPR-1', 'viewport-MPR-2']
+        //   viewportIds = [this.volumeToolGroupId]
-        }
+        // }
         viewportIds.forEach(id => {
           const toolGroup = ToolGroupManager.getToolGroup(id)
           if (this.histogramVisible) {
@@ -894,6 +895,7 @@ export default {
             })
             for (let i = 0; i < this.cells.length; i++) {
               const viewportId = `${this.viewportKey}-${i}`
+              let renderingEngine = getRenderingEngine(renderingEngineId)
               const viewport = renderingEngine.getViewport(viewportId)
               viewport.render()
             }

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

@@ -113,11 +113,15 @@ export default {
                 if (find) {
                     this.form.studyId = this.series.StudyId
                     this.handleChange(null, 'study')
+                    let findSeries = find.SeriesArr.some(item => item.Id === this.form.seriesId)
+                    if (findSeries) {
                         this.form.seriesId = this.series.Id
                         this.handleChange(null, 'series')
                     }
 
                 }
+
+            }
             if (this.visitInfo.operateStateEnum === 22) {
                 let o = {}
                 if (this.isTableQuestion) {

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

@@ -322,6 +322,10 @@ export default {
         globalLoading: {
             type: Boolean,
             default: false
+        },
+        histogramVisible: {
+            type: Boolean,
+            default: false
         }
     },
     data() {
@@ -561,6 +565,7 @@ export default {
         setToolActive(toolName) {
             if (this.segmentList.length <= 0) return false
             if (this.curSegment.lock) return false
+            if (this.histogramVisible && !this.ThresholdTools.includes(toolName)) return false
             const toolGroupId = this.isMPR ? this.volumeToolGroupId : `${this.viewportKey}-${this.activeViewportIndex}`
             const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
             if (this.activeTool === toolName) {