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 2508f272..ad45a1f8 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue @@ -1433,11 +1433,11 @@ export default { viewport.render() } else if (type === 4) { const { rotation } = viewport.getViewPresentation() - viewport.setViewPresentation({ rotation: rotation + 90 }) + viewport.setViewPresentation({ rotation: rotation === 0 ? 270 : rotation - 90 }) viewport.render() } else if (type === 5) { const { rotation } = viewport.getViewPresentation() - viewport.setViewPresentation({ rotation: rotation - 90 }) + viewport.setViewPresentation({ rotation: rotation + 90 }) viewport.render() } this.$refs[`viewport-${this.activeViewportIndex}`][0].rotateOrientationMarkers(type) @@ -1624,10 +1624,9 @@ export default { bindHotKey() { const container = this.$refs['container'] container.addEventListener('keydown', event => { - event.preventDefault() - var idx = this.hotKeyList.findIndex(i => i.code === event.code && i.ctrlKey === event.ctrlKey && i.shiftKey === event.shiftKey && i.altKey === event.altKey) + let idx = this.hotKeyList.findIndex(i => i.code === event.code && i.ctrlKey === event.ctrlKey && i.shiftKey === event.shiftKey && i.altKey === event.altKey) if (idx === -1) return - var shortcutKeyEnum = this.hotKeyList[idx].shortcutKeyEnum + let shortcutKeyEnum = this.hotKeyList[idx].shortcutKeyEnum if (shortcutKeyEnum === 1) { // 前一图像视口 @@ -1705,6 +1704,9 @@ export default { const viewportIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3'] renderingEngine.renderViewports(viewportIds) } + event.stopImmediatePropagation() + event.stopPropagation() + event.preventDefault() }) }, // 重置热键信息 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 637207a9..76268fab 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue @@ -110,6 +110,9 @@ import { utilities as csUtils } from '@cornerstonejs/core' import * as cornerstoneTools from '@cornerstonejs/tools' +const { + ToolGroupManager +} = cornerstoneTools import { vec3 } from 'gl-matrix' export default { name: 'ImageViewport', @@ -202,6 +205,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'); }, voiModified(e) { const renderingEngine = getRenderingEngine(this.renderingEngineId) @@ -284,7 +290,7 @@ export default { const viewport = renderingEngine.getViewport(this.viewportId) if (isPlay) { - cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond }) + cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: false }) } else { cornerstoneTools.utilities.cine.stopClip(viewport.element) }