From f5ec5505d407782733c71e2d704a871f40b711fc Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 29 Jul 2024 10:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=B8=A7=E5=AF=B9=E9=BD=90=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomCanvas.vue    | 2 +-
 .../trials-panel/reading/dicoms/components/StudyList.vue      | 2 +-
 .../reading/dicoms/customize/CustomizeDicomCanvas.vue         | 2 +-
 .../reading/dicoms/customize/CustomizeDicomViewer.vue         | 4 ++--
 .../reading/dicoms/customize/CustomizeStudyList.vue           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 458ecb01..2be97eb1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -899,7 +899,7 @@ export default {
           } else {
             cornerstoneTools.setToolEnabledForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
           }
-          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && data.MeasureData) {
+          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame && data.MeasureData) || (!this.stack.isExistMutiFrames && data.MeasureData))) {
             const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
             if (toolState && toolState.data.length > 0) {
               var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
index 34b28038..0aa5f3e1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -168,7 +168,7 @@ import store from '@/store'
 import SrList from './SrList'
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 // 1 GB
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
 cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
   name: 'StudyList',
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index b446a7e9..069149e5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -891,7 +891,7 @@ export default {
           }
           // console.log('renderMeasuredData', this.stack.frame)
 
-          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && data.MeasureData) {
+          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame && data.MeasureData) || (!this.stack.isExistMutiFrame && data.MeasureData))) {
             const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
             if (toolState && toolState.data.length > 0) {
               var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid)
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index a4c0f912..c281fdef 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -914,9 +914,9 @@ export default {
     this.getWwcTpl()
     // cornerstone.imageCache.setMaximumSizeBytes(0)
 
-    const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 // 1 GB
+    // const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 // 1 GB
     // const maximumSizeInBytes = 1024 * 1024 * 500
-    cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
+    // cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
     this.customWwc = {
       visible: false,
       title: this.$t('trials:reading:dagTitle:wwwcCustom')
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
index 16c35b1a..fc7b18aa 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -167,7 +167,7 @@ import store from '@/store'
 import SrList from './../components/SrList'
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 // 1 GB
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6 // 1 GB
 cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
   name: 'StudyList',