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 37a76e12..6b44c1af 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue @@ -1203,7 +1203,7 @@ export default { this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null this.stack.instanceId = instanceId this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1) - this.resetWwwc() + // this.resetWwwc() resolve() }) }, @@ -1941,6 +1941,9 @@ export default { for (const [key, value] of searchParams.entries()) { params[key] = value } + if (isNaN(params.frame)){ + params.frame = 0 + } return params }, preventDefault(e) { 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 b310032b..44d8db0f 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue @@ -629,7 +629,8 @@ export default { this.studyIndex = studyIndex this.seriesIndex = seriesIndex this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData - var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] + // var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] + var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex]) dicomStatck.imageIdIndex = 0 this.$emit('loadImageStack', dicomStatck) if (!series.loadStatus && series.modality !== 'SR') { @@ -672,7 +673,7 @@ export default { }, showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) { this.currentSeriesIndex = seriesIndex - var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId) + var idx = this.visitTaskIdx const imageIds = [] if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { for (let j = 0; j < instanceInfo.NumberOfFrames; j++) { @@ -680,11 +681,12 @@ export default { } } else { imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`) - } + } this.studyIndex = studyIndex this.seriesIndex = seriesIndex this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData - var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] + // var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] + var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex]) dicomStatck.imageIds = imageIds dicomStatck.imageIdIndex = 0 this.$emit('loadImageStack', dicomStatck) 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 bf21b24d..6d0f7af5 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue @@ -889,8 +889,7 @@ export default { cornerstoneTools.setToolPassiveForElement(element, data.MeasureData.type, { mouseButtonMask: 1 }) } - - if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame && data.MeasureData) || (!this.stack.isExistMutiFrames && 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))) { // console.log('renderMeasuredData', this.stack.frame,data.MeasureData.frame,this.stack.isExistMutiFrames) const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type) if (toolState && toolState.data.length > 0) { @@ -1181,7 +1180,7 @@ export default { this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null this.stack.instanceId = instanceId this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1) - this.resetWwwc() + // this.resetWwwc() resolve() }) }, @@ -1246,7 +1245,6 @@ export default { // console.log('onImageLoaded') }, onImageRendered(e) { - // console.log('onImageRendered') this.stack.imageRendered = true // const { element } = e.detail var imageId = e.detail.image.imageId @@ -1921,6 +1919,9 @@ export default { for (const [key, value] of searchParams.entries()) { params[key] = value } + if (isNaN(params.frame)){ + params.frame = 0 + } return params }, preventDefault(e) { 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 d68ef8c6..f00cabf5 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue @@ -600,7 +600,9 @@ export default { this.studyIndex = studyIndex this.seriesIndex = seriesIndex this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData - var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] + var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex]) + + dicomStatck.imageIdIndex = 0 this.$emit('loadImageStack', dicomStatck) if (!series.loadStatus && series.modality !== 'SR') { this.loopLoadStatus = -1 @@ -642,18 +644,19 @@ export default { }, showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) { this.currentSeriesIndex = seriesIndex - const imageIds = [] - if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { - for (let j = 0; j < instanceInfo.NumberOfFrames; j++) { - imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}`) - } - } else { - imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}`) - } + var idx = this.visitTaskIdx this.studyIndex = studyIndex this.seriesIndex = seriesIndex this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData - var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] + var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex]) + const imageIds = [] + if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { + for (let j = 0; j < instanceInfo.NumberOfFrames; j++) { + imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`) + } + } else { + imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`) + } dicomStatck.imageIds = imageIds dicomStatck.imageIdIndex = 0 this.$emit('loadImageStack', dicomStatck)