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

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

@@ -120,6 +120,10 @@ export default {
             type: Boolean,
             default: false
         },
+        isMPR: {
+            type: Boolean,
+            default: false
+        },
         actionConfiguration: {
             type: Object,
             default: () => {
@@ -251,6 +255,7 @@ export default {
         },
         SegmentConfig: {
             handler() {
+                if (!this.isMPR) return false
                 if (!this.segmentationId) return false
                 if (!this.series.TaskInfo) return false
                 readingSegmentByConfig(this.series, this.series.TaskInfo, this.viewportId, this.segmentationId, this.SegmentConfig)
@@ -258,11 +263,13 @@ export default {
             deep: true
         },
         segmentIndex() {
+            if (!this.isMPR) return false
             if (this.curSegSeries.Id !== this.series.Id || this.curSegSeries.VisitTaskId !== this.series.VisitTaskId) return false
             if (this.segmentIndex <= 0) return false
             selectSegment(this.viewportId, this.segmentationId, this.segmentIndex)
         },
         segmentationId() {
+            if (!this.isMPR) return false
             if (this.curSegSeries.Id !== this.series.Id || this.curSegSeries.VisitTaskId !== this.series.VisitTaskId) return false
             if (!this.segmentationId) return false
             selectSegmentation(this.viewportId, this.segmentationId)
@@ -665,8 +672,11 @@ export default {
                         renderingEngine.render()
                     }, 100)
                 }
-                await renderSegmentation(this.series, this.series.TaskInfo, this.viewportId, this.SegmentConfig, this.renderingEngineId, null, this.actionConfiguration, this.segmentationId, this.segmentIndex)
+                if (this.isMPR) {
-                DicomEvent.$emit('SegmentationLoading', this.viewportId)
+                    await renderSegmentation(this.series, this.series.TaskInfo, this.viewportId, this.SegmentConfig, this.renderingEngineId, null, this.actionConfiguration, this.segmentationId, this.segmentIndex)
+                    DicomEvent.$emit('SegmentationLoading', this.viewportId)
+                }
+
                 let volume = cache.getVolume(this.volumeId)
                 // console.log(volume, 'volume')
                 if (this.series.orientation === 'AXIAL' && this.series.curIndex) return this.setFullScreen(this.series.curIndex)

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

@@ -344,7 +344,7 @@
                     :viewport-index="index" :histogramVisible="histogramVisible"
                     :actionConfiguration="actionConfiguration" :SegmentConfig="SegmentConfig"
                     :segmentationId.sync="segId" :segmentIndex.sync="segIndex" :curSegSeries.sync="curSegSeries"
-                    :MPRInfo="MPRInfo" @activeViewport="activeViewport" @setMPRInfo="setMPRInfo"
+                    :isMPR="isMPR" :MPRInfo="MPRInfo" @activeViewport="activeViewport" @setMPRInfo="setMPRInfo"
                     @toggleTaskByViewport="toggleTaskByViewport" @previewCD="previewCD"
                     @renderAnnotations="renderAnnotations" @contentMouseup="contentMouseup"
                     @resetHistogram="resetHistogram" v-resize="(e) => handleSizeChange(e, `viewport-MPR-${index}`)" />
@@ -1052,7 +1052,6 @@ export default {
       let imageId = imageIds[0]
       const imagePixelModule = metaData.get('imagePixelModule', imageId);
       const photometricInterpretation = imagePixelModule?.photometricInterpretation;
-      console.log(photometricInterpretation, 'photometricInterpretation')
       if (photometricInterpretation && photometricInterpretation !== 'MONOCHROME1' && photometricInterpretation !== 'MONOCHROME2') return this.$confirm(this.$t('trials:histogram:confirm:photometricInterpretationNotSupported'))
       this.histogramVisible = true
       this.setToolsPassive()

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

@@ -127,7 +127,7 @@
                         </el-switch>
                         <span style="margin-left: 5px;">{{
                             $t('trials:reading:Segmentations:title:InactiveSegmentationsShow')
-                        }}</span>
+                            }}</span>
                     </div>
                 </div>
                 <template v-if="segmentList.length > 0">
@@ -163,7 +163,8 @@
                             <i class="el-icon-warning-outline" style="color:red;margin-right: 5px;"
                                 :title="$t('trials:reading:Segmentations:tip:segmentationIsNotSave')"
                                 v-if="!curSegmentGroup.isSaved"></i>
-                            <el-button type="success" size="small" :disabled="saveLoading || isMPR"
+                            <el-button type="success" size="small"
+                                :disabled="saveLoading || isMPR || curSegmentGroup.isSaved"
                                 @click="saveSegmentGroup([curSegmentGroup])">
                                 {{ $t("trials:reading:Segmentations:button:save") }}
                             </el-button>
@@ -253,7 +254,8 @@
             </el-collapse-item>
         </el-collapse>
         <div class="saveBtnBox" v-if="readingTaskState < 2 && segmentList && segmentList.length > 1">
-            <el-button type="success" size="small" :disabled="saveLoading || isMPR" @click="saveSegmentGroup()">
+            <el-button type="success" size="small" :disabled="saveLoading || isMPR || curSegmentGroup.isSaved"
+                @click="saveSegmentGroup()">
                 {{ $t("trials:reading:Segmentations:button:saveAll") }}
             </el-button>
         </div>
@@ -1537,7 +1539,7 @@ export default {
                         segmentGroup.segUrl = this.$getObjectName(result.url)
                         DicomEvent.$emit("IsBeSegment", { StudyId: this.series.StudyId, Id: this.series.Id, IsBeSegment: true })
                     } else {
-                        segmentGroup.segUrl = null
+                        return this.$confirm(this.$t("segment:saveSegmention:notSEG"))
                     }
 
                     this.addOrUpdateSegmentation({ name: segmentGroup.name, id: segmentGroup.segmentationId, url: segmentGroup.segUrl })

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

@@ -74,9 +74,11 @@
                       #{{ series.SeriesNumber }}
 
                     </div>
-                    <div v-if="series.Description" class="text-desc" :title="series.Description" style="position: relative;">
+                    <div v-if="series.Description" class="text-desc" :title="series.Description"
+                      style="position: relative;">
                       {{ series.Description }}
-                      <div class="patient-info" style="position: absolute;right: 0;top: 0;" v-if="['PT','PET'].includes(series.Modality)">
+                      <div class="patient-info" style="position: absolute;right: 0;top: 0;"
+                        v-if="['PT', 'PET'].includes(series.Modality)">
                         <el-popover placement="right" trigger="hover" popper-class="patient-info-popper">
                           <h4>{{ $t('trials:ptData:title') }}</h4>
                           <div class="patient-info-row">
@@ -198,6 +200,9 @@ export default {
   },
   methods: {
     activeSeries(series, seriesIndex, studyIndex) {
+      const photometricInterpretation = series?.InstanceInfoList[0]?.PhotometricInterpretation;
+      if (!photometricInterpretation || (photometricInterpretation !== 'MONOCHROME1' && photometricInterpretation !== 'MONOCHROME2'))
+        return this.$confirm(this.$t('trials:histogram:confirm:activeSeriesPhotometricInterpretationNotSupported'))
       this.activeStudyIndex = studyIndex
       this.activeSeriesIndex = seriesIndex
       this.$emit('activeSeries', series)
@@ -286,7 +291,7 @@ export default {
   line-height: 18px;
 }
 
-.patient-info-popper .patient-info-row + .patient-info-row {
+.patient-info-popper .patient-info-row+.patient-info-row {
   margin-top: 4px;
 }
 

src/views/trials/trials-panel/reading/dicoms3D/components/helpers/segmentations.js

@@ -112,6 +112,7 @@ async function loadSegmentation(arrayBuffer, series, segmentationId) {
     })
     const megmentGroup =
         segmentation.state.getSegmentation(segmentationId);
+    if (!megmentGroup) return false
     const { imageIds } = megmentGroup.representationData.Labelmap;
     const derivedSegmentationImages = imageIds.map(imageId =>
         cache.getImage(imageId)
@@ -226,10 +227,11 @@ async function readingSegmentByConfig(series, visitInfo, viewportId, segmentatio
     )
 }
 function selectSegmentation(viewportId, segmentationId) {
+    if (!segmentation.state.getSegmentation(segmentationId)) return false
     segmentation.activeSegmentation.setActiveSegmentation(viewportId, segmentationId)
 }
 function selectSegment(viewportId, segmentationId, segmentIndex) {
-    if (!segmentIndex || !segmentationId) return false
+    if (!segmentIndex || !segmentationId || !segmentation.state.getSegmentation(segmentationId)) return false
     selectSegmentation(viewportId, segmentationId)
     segmentation.segmentIndex.setActiveSegmentIndex(segmentationId, segmentIndex);
 }
@@ -354,63 +356,66 @@ async function renderSegmentation(series, visitInfo, viewportId, SegmentConfig,
             PageSize: 9999,
             PageIndex: 1,
         }
-        let res = await getSegmentationList(data);
+        setTimeout(async () => {
-        if (res.IsSuccess) {
+            let res = await getSegmentationList(data);
-            let list = res.Result.CurrentPageData;
+            if (res.IsSuccess) {
-            for (let i = 0; i < list.length; i++) {
+                let list = res.Result.CurrentPageData;
-                let item = list[i]
+                for (let i = 0; i < list.length; i++) {
-                if (!segmentationId) segmentationId = item.Id
+                    let item = list[i]
-                await createSegmentation(viewportId, series.SeriesInstanceUid, item.Id)
+                    if (!segmentationId) segmentationId = item.Id
-                if (item.SEGUrl) await readSegmentation(item.SEGUrl, series, item.Id)
+                    await createSegmentation(viewportId, series.SeriesInstanceUid, item.Id)
-                createSegmentationRepresentation(viewportId, item.Id)
+                    if (item.SEGUrl) await readSegmentation(item.SEGUrl, series, item.Id)
-                if (!viewportInfo[viewportId]) {
+                    createSegmentationRepresentation(viewportId, item.Id)
-                    viewportInfo[viewportId] = [item.Id]
+                    if (!viewportInfo[viewportId]) {
-                } else {
+                        viewportInfo[viewportId] = [item.Id]
-                    viewportInfo[viewportId].push(item.Id)
+                    } else {
-                }
+                        viewportInfo[viewportId].push(item.Id)
-                let params = {
+                    }
-                    SegmentationId: item.Id,
+                    let params = {
-                    PageSize: 9999,
+                        SegmentationId: item.Id,
-                    PageIndex: 1,
+                        PageSize: 9999,
-                }
+                        PageIndex: 1,
-                let r = await getSegmentList(params)
+                    }
-                if (r.IsSuccess) {
+                    let r = await getSegmentList(params)
-                    let segments = r.Result.CurrentPageData
+                    if (r.IsSuccess) {
-                    segments.forEach(s => {
+                        let segments = r.Result.CurrentPageData
-                        if (!segmentIndex) segmentIndex = s.SegmentNumber
+                        segments.forEach(s => {
-                        let SegmentJson = s.SegmentJson ? JSON.parse(s.SegmentJson) : {};
+                            if (!segmentIndex) segmentIndex = s.SegmentNumber
-                        segmentation.segmentIndex.setActiveSegmentIndex(s.SegmentationId, s.SegmentNumber);
+                            let SegmentJson = s.SegmentJson ? JSON.parse(s.SegmentJson) : {};
-                        segmentation.config.color.setSegmentIndexColor(viewportId, s.SegmentationId, s.SegmentNumber, hex2Rgb(s.ColorRgb))
+                            segmentation.segmentIndex.setActiveSegmentIndex(s.SegmentationId, s.SegmentNumber);
-                        segmentation.segmentLocking.setSegmentIndexLocked(s.SegmentationId, s.SegmentNumber, s.IsLock)
+                            segmentation.config.color.setSegmentIndexColor(viewportId, s.SegmentationId, s.SegmentNumber, hex2Rgb(s.ColorRgb))
-                        if (SegmentJson.bidirectional) {
+                            segmentation.segmentLocking.setSegmentIndexLocked(s.SegmentationId, s.SegmentNumber, s.IsLock)
-                            let an = annotation.state.getAllAnnotations().find(i => i.metadata.segmentationId === s.SegmentationId && i.metadata.segmentIndex === SegmentJson.bidirectional.segmentIndex && i.metadata.toolName === "SegmentBidirectional");
+                            if (SegmentJson.bidirectional) {
-                            if (!an) {
+                                let an = annotation.state.getAllAnnotations().find(i => i.metadata.segmentationId === s.SegmentationId && i.metadata.segmentIndex === SegmentJson.bidirectional.segmentIndex && i.metadata.toolName === "SegmentBidirectional");
-                                let { majorAxis, minorAxis } = SegmentJson.bidirectional
+                                if (!an) {
-                                // createSegmentConfiguration(s.SegmentNumber, s.SegmentationId, viewportId, actionConfiguration)
+                                    let { majorAxis, minorAxis } = SegmentJson.bidirectional
-                                SegmentBidirectionalTool.hydrate(viewportId, [majorAxis, minorAxis], {
+                                    // createSegmentConfiguration(s.SegmentNumber, s.SegmentationId, viewportId, actionConfiguration)
-                                    segmentIndex: s.SegmentNumber,
+                                    SegmentBidirectionalTool.hydrate(viewportId, [majorAxis, minorAxis], {
-                                    segmentationId: s.SegmentationId,
+                                        segmentIndex: s.SegmentNumber,
-                                })
+                                        segmentationId: s.SegmentationId,
+                                    })
+                                }
+                                an = annotation.state.getAllAnnotations().find(i => i.metadata.segmentationId === s.SegmentationId && i.metadata.segmentIndex === SegmentJson.bidirectional.segmentIndex && i.metadata.toolName === "SegmentBidirectional");
+                                if (an) {
+                                    annotation.locking.setAnnotationLocked(an.annotationUID, true)
+                                    annotation.visibility.setAnnotationVisibility(an.annotationUID, true)
+                                }
                             }
-                            an = annotation.state.getAllAnnotations().find(i => i.metadata.segmentationId === s.SegmentationId && i.metadata.segmentIndex === SegmentJson.bidirectional.segmentIndex && i.metadata.toolName === "SegmentBidirectional");
-                            if (an) {
-                                annotation.locking.setAnnotationLocked(an.annotationUID, true)
-                                annotation.visibility.setAnnotationVisibility(an.annotationUID, true)
-                            }
-                        }
 
-                    })
+                        })
-                }
+                    }
-                if (segmentationId && segmentIndex) {
+                    if (segmentationId && segmentIndex) {
-                    selectSegment(viewportId, segmentationId, segmentIndex)
+                        selectSegment(viewportId, segmentationId, segmentIndex)
-                }
+                    }
 
-                if (Segment) {
+                    if (Segment) {
-                    jumpBidirectional(Segment, viewportId, series.SeriesInstanceUid)
+                        jumpBidirectional(Segment, viewportId, series.SeriesInstanceUid)
+                    }
                 }
             }
-        }
+            readingSegmentByConfig(series, visitInfo, viewportId, segmentationId, SegmentConfig)
-        readingSegmentByConfig(series, visitInfo, viewportId, segmentationId, SegmentConfig)
+        }, 500)
+
     } catch (err) {
         console.log(err)
     }

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

@@ -221,6 +221,7 @@ export default {
             Object.keys(this.seriesData).forEach(key => {
                 if (key !== 'default' || this.isNeedDefault) seriesData.push(this.seriesData[key])
             })
+            seriesData = this.formatSeriesData(seriesData)
             this.chart.clear();
             const option = {
                 useUTC: true,
@@ -287,6 +288,27 @@ export default {
             };
             this.chart.setOption(option);
         },
+        formatSeriesData(seriesData) {
+            let arr = []
+            seriesData.forEach(serie => {
+                serie.data.forEach(item => {
+                    if (!arr.includes(item[0])) arr.push(item[0])
+                })
+            })
+            arr = arr.sort((a, b) => a - b)
+            seriesData.forEach(serie => {
+                let data = []
+                arr.forEach(item => {
+                    if (serie.objKey[item]) {
+                        data.push([item, serie.objKey[item]])
+                    } else {
+                        data.push([item, 0])
+                    }
+                })
+                serie.data = data
+            })
+            return seriesData
+        },
         async generateData(annotation) {
             var seriesData = [];
             var min = null;
@@ -297,10 +319,8 @@ export default {
             } else {
                 res = await this.getCurrentSliceValuesFromVoxelManager(this.renderingEngineId, `${this.viewportKey}-${this.activeViewportIndex}`)
             }
+            let obj = {}
             if (res) {
-                let obj = {
-
-                }
                 res.values.forEach(item => {
                     if (obj[item]) {
                         obj[item]++
@@ -327,7 +347,8 @@ export default {
                 seriesData: {
                     type: 'line',
                     symbolSize: 0,
-                    data: seriesData
+                    data: seriesData,
+                    objKey: obj
                 },
                 min: min,
                 max: max