diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue index df82f47b..b5b244f4 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue @@ -265,7 +265,7 @@ export default { ...mapGetters(['language']), isBaseline() { var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId) - return this.visitTaskList[i].IsBaseLine + return this.visitTaskList[i] ? this.visitTaskList[i].IsBaseLine : false } }, watch: { 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 d92f2aff..99b6222d 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue @@ -260,9 +260,9 @@ export default { this.defaultWindowLevel.windowCenter = windowCenter this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}` } - // const toolGroupId = `viewport-${this.viewportIndex}` - // const toolGroup = ToolGroupManager.getToolGroup(toolGroupId) - // toolGroup.setToolEnabled('ScaleOverlay') + const toolGroupId = this.viewportId + const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(toolGroupId) + toolGroup.setToolEnabled('ScaleOverlay') } }, 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 0bc8a2a7..c64aa02b 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue @@ -1,40 +1,21 @@ diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue index 4adf0b6e..c1fd2a45 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue @@ -255,7 +255,7 @@ export default { ...mapGetters(['language']), isBaseline() { var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId) - return this.visitTaskList[i].IsBaseLine + return this.visitTaskList[i] ? this.visitTaskList[i].IsBaseLine : false } }, watch: { diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue index f37090b0..0a3adcd5 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue @@ -1,59 +1,34 @@ @@ -195,7 +174,7 @@ export default { this.element.addEventListener('CORNERSTONE_STACK_NEW_IMAGE', this.stackNewImage) // this.element.addEventListener('CORNERSTONE_VOI_MODIFIED', this.voiModified) // this.element.addEventListener('CORNERSTONE_CAMERA_MODIFIED', this.cameraModified) - + this.element.addEventListener('CORNERSTONE_IMAGE_RENDERED', this.imageRendered) this.element.addEventListener('CORNERSTONE_TOOLS_MOUSE_MOVE', this.cornerstoneToolsMouseMove) this.element.addEventListener('mouseleave', () => { @@ -219,9 +198,9 @@ export default { // this.imageInfo.wwwc = `${Math.round(detail.image.windowWidth)}/${Math.round(detail.image.windowCenter)}` this.getOrientationMarker() this.$emit('renderAnnotations', this.series) - // const toolGroupId = `viewport-${this.viewportIndex}` - // const toolGroup = ToolGroupManager.getToolGroup(toolGroupId) - // toolGroup.setToolEnabled('ScaleOverlay') + const toolGroupId = this.viewportId + const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(toolGroupId) + toolGroup.setToolEnabled('ScaleOverlay') }, imageRendered(e) { const renderingEngine = getRenderingEngine(this.renderingEngineId) @@ -385,7 +364,7 @@ export default { } }, cachePTMetadata(images) { - images.map(i=>{ + images.map(i => { const instanceMetadata = getPTImageIdInstanceMetadata(i.imageId) if (typeof instanceMetadata.CorrectedImage === 'string') { instanceMetadata.CorrectedImage = instanceMetadata.CorrectedImage.split('\\') @@ -416,7 +395,7 @@ export default { } this.prefetchMetadataInformation(obj.ImageIds, obj.Modality) await viewport.setStack(this.series.Stack, obj.SliceIndex) - + viewport.render() } catch (e) { console.log(e) @@ -549,10 +528,11 @@ export default {