diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue index 0cd2da2d..e5fda1b2 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue @@ -244,7 +244,7 @@ export default { this.imageInfo.size = `${imagePlaneModule.columns}*${imagePlaneModule.rows}` this.imageInfo.location = imagePlaneModule.sliceLocation this.getOrientationMarker() - // this.$emit('renderAnnotations', this.series) + this.$emit('renderAnnotations', this.series) let properties = viewport.getProperties() if (this.isFusion) { properties = viewport.getProperties(this.ptVolumeId) @@ -264,6 +264,16 @@ export default { } }, + setFullScreen(index) { + setTimeout(() => { + const renderingEngine = getRenderingEngine(this.renderingEngineId) + const viewport = renderingEngine.getViewport( + this.viewportId + ) + csUtils.jumpToSlice(viewport.element, { imageIndex: index }) + viewport.render() + }) + }, voiModified(e) { const renderingEngine = getRenderingEngine(this.renderingEngineId) const viewport = renderingEngine.getViewport(this.viewportId) @@ -278,6 +288,7 @@ export default { upper ) this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}` + this.$emit('upperRangeChange', Math.round(windowWidth)) } }, getOrientationMarker() { @@ -386,7 +397,14 @@ export default { resize(forceFitToWindow) { console.log('resize: ', forceFitToWindow) const renderingEngine = getRenderingEngine(this.renderingEngineId) - renderingEngine.resize(true, forceFitToWindow) + const viewport = renderingEngine.getViewport(this.viewportId) + if (!forceFitToWindow) { + viewport.setZoom(0.5) + viewport.render() + } else { + viewport.setZoom(1) + viewport.render() + } }, voiChange(v) { const renderingEngine = getRenderingEngine(this.renderingEngineId) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue index 3286bdae..f0d86632 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue @@ -381,6 +381,7 @@ @toggleTaskByViewport="toggleTaskByViewport" @previewCD="previewCD" @renderAnnotations="renderAnnotations" + @upperRangeChange="upperRangeChange" /> @@ -2162,6 +2163,13 @@ export default { toggleFullScreen(e, index) { this.fullScreenIndex = this.fullScreenIndex === index ? null : index this.activeViewportIndex = index + if ( this.isFusion ) { + let viewportIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`] + viewportIds.forEach(id=>{ + let index = this.$refs[id][0].series.SliceIndex + this.$refs[id][0].setFullScreen(index) + }) + } }, async toggleTask(taskInfo, taskIndex) { if(this.isFusion){ @@ -2797,6 +2805,10 @@ export default { return { volumeId, volume } }, + upperRangeChange(upper) { + this.$refs.colorMap.upper = upper + this.$refs.colorMap.upperRangeChange(upper) + }, openFusion() { this.fusionVisible = true },