Compare commits

..

No commits in common. "b0ae3cbd276f6e3df7d712d303e8ae44e7c72e93" and "83fa9375377844fd2ef8bc9d5f785829d129c21a" have entirely different histories.

2 changed files with 6 additions and 14 deletions

View File

@ -1433,11 +1433,11 @@ export default {
viewport.render() viewport.render()
} else if (type === 4) { } else if (type === 4) {
const { rotation } = viewport.getViewPresentation() const { rotation } = viewport.getViewPresentation()
viewport.setViewPresentation({ rotation: rotation === 0 ? 270 : rotation - 90 }) viewport.setViewPresentation({ rotation: rotation + 90 })
viewport.render() viewport.render()
} else if (type === 5) { } else if (type === 5) {
const { rotation } = viewport.getViewPresentation() const { rotation } = viewport.getViewPresentation()
viewport.setViewPresentation({ rotation: rotation + 90 }) viewport.setViewPresentation({ rotation: rotation - 90 })
viewport.render() viewport.render()
} }
this.$refs[`viewport-${this.activeViewportIndex}`][0].rotateOrientationMarkers(type) this.$refs[`viewport-${this.activeViewportIndex}`][0].rotateOrientationMarkers(type)
@ -1624,9 +1624,10 @@ export default {
bindHotKey() { bindHotKey() {
const container = this.$refs['container'] const container = this.$refs['container']
container.addEventListener('keydown', event => { container.addEventListener('keydown', event => {
let idx = this.hotKeyList.findIndex(i => i.code === event.code && i.ctrlKey === event.ctrlKey && i.shiftKey === event.shiftKey && i.altKey === event.altKey) event.preventDefault()
var 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 if (idx === -1) return
let shortcutKeyEnum = this.hotKeyList[idx].shortcutKeyEnum var shortcutKeyEnum = this.hotKeyList[idx].shortcutKeyEnum
if (shortcutKeyEnum === 1) { if (shortcutKeyEnum === 1) {
// //
@ -1704,9 +1705,6 @@ export default {
const viewportIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3'] const viewportIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3']
renderingEngine.renderViewports(viewportIds) renderingEngine.renderViewports(viewportIds)
} }
event.stopImmediatePropagation()
event.stopPropagation()
event.preventDefault()
}) })
}, },
// //

View File

@ -110,9 +110,6 @@ import {
utilities as csUtils utilities as csUtils
} from '@cornerstonejs/core' } from '@cornerstonejs/core'
import * as cornerstoneTools from '@cornerstonejs/tools' import * as cornerstoneTools from '@cornerstonejs/tools'
const {
ToolGroupManager
} = cornerstoneTools
import { vec3 } from 'gl-matrix' import { vec3 } from 'gl-matrix'
export default { export default {
name: 'ImageViewport', name: 'ImageViewport',
@ -205,9 +202,6 @@ export default {
// this.imageInfo.wwwc = `${Math.round(detail.image.windowWidth)}/${Math.round(detail.image.windowCenter)}` // this.imageInfo.wwwc = `${Math.round(detail.image.windowWidth)}/${Math.round(detail.image.windowCenter)}`
this.getOrientationMarker() this.getOrientationMarker()
this.$emit('renderAnnotations', this.series) this.$emit('renderAnnotations', this.series)
// const toolGroupId = `viewport-${this.viewportIndex}`
// const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
// toolGroup.setToolEnabled('ScaleOverlay');
}, },
voiModified(e) { voiModified(e) {
const renderingEngine = getRenderingEngine(this.renderingEngineId) const renderingEngine = getRenderingEngine(this.renderingEngineId)
@ -290,7 +284,7 @@ export default {
const viewport = renderingEngine.getViewport(this.viewportId) const viewport = renderingEngine.getViewport(this.viewportId)
if (isPlay) { if (isPlay) {
cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: false }) cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond })
} else { } else {
cornerstoneTools.utilities.cine.stopClip(viewport.element) cornerstoneTools.utilities.cine.stopClip(viewport.element)
} }