+
{{ subjectCode }} {{ stack.taskBlindName }}
Series: #{{ dicomInfo.series }}
Image: #{{ dicomInfo.frame }}
@@ -99,8 +99,8 @@
-
Location: {{ dicomInfo.location }}
-
Slice Thickness: {{ dicomInfo.thick }}mm
+
Location: {{ `${Number(dicomInfo.location).toFixed(digitPlaces)} mm` }}
+
Slice Thickness: {{ `${dicomInfo.thick} mm` }}
WW/WL: {{ dicomInfo.wwwc }}
@@ -220,7 +220,8 @@ export default {
visitTaskId: '',
taskBlindName: '',
frame: null,
- imageRendered: false
+ imageRendered: false,
+ isExistsClinicalData: false
// preventCache: true
},
dicomInfo: {
@@ -297,7 +298,7 @@ export default {
],
scrollSyncInfo: { offset: 0 },
hideMeasureArr: []
-
+
}
},
computed: {
@@ -330,6 +331,7 @@ export default {
},
mounted() {
+ console.log(cornerstoneTools)
this.subjectCode = this.$router.currentRoute.query.subjectCode
document.addEventListener('mouseup', () => {
this.sliderMouseup()
@@ -373,10 +375,10 @@ export default {
}
)
- // this.canvas.addEventListener(
- // 'cornerstonetoolsmeasurementremoved',
- // this.onMeasurementremoved
- // )
+ this.canvas.addEventListener(
+ 'cornerstonetoolsmeasurementremoved',
+ this.onMeasurementremoved
+ )
// EVENTS.MOUSE_UP
this.canvas.addEventListener('cornerstonetoolsmouseup', this.mouseUp)
this.canvas.addEventListener('cornerstonetoolsmousedown', this.mouseDown)
@@ -477,7 +479,6 @@ export default {
},
methods: {
goViewer(e) {
- console.log('goViewer')
console.log(this.$refs['sliderBox'].clientHeight)
var height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
this.height = height
@@ -566,6 +567,7 @@ export default {
showCancelButton: false,
type: 'warning'
}).then(() => {
+
}).catch(() => {})
e.stopImmediatePropagation()
e.stopPropagation()
@@ -651,7 +653,7 @@ export default {
if (PX < 0) return
if (PX > boxHeight) return
var height = PX * 100 / boxHeight
- var index = Math.trunc(this.stack.imageIds.length * this.height / 100)
+ var index = Math.trunc(this.stack.imageIds.length * height / 100)
index = index > this.stack.imageIds.length ? this.stack.imageIds.length : index < 0 ? 0 : index
// if (!cornerstone.imageCache.getImageLoadObject(this.stack.imageIds[index])) return
this.height = height
@@ -663,6 +665,7 @@ export default {
this.sliderInfo.isMove = false
},
getMeasureData() {
+ console.log('getMeasureData')
var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
this.measureData = this.visitTaskList[idx].MeasureData
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
@@ -736,14 +739,10 @@ export default {
getToolStateInfo(e) {
const { element, currentPoints, image, viewport } = e.detail
var imageId = image.imageId
- var instanceId = imageId.split('/')[imageId.split('/').length - 1]
- var frame = null
- if (instanceId.includes('?frame=')) {
- frame = instanceId.split('?frame=')[1]
- instanceId = instanceId.split('?frame=')[0]
- }
+ const imageInfo = this.getInstanceInfo(imageId)
+ var instanceId = imageInfo.instanceId
+ var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
- instanceId = instanceId.split('.')[0]
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
for (var m = 0; m < this.measuredTools.length; m++) {
var toolType = this.measuredTools[m]
@@ -771,6 +770,7 @@ export default {
measureData.data = toolState.data[i]
measureData.type = toolType
measureData.thick = this.dicomInfo.thick
+ measureData.location = this.dicomInfo.location
var uuid = toolState.data[i].uuid
var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
if (idx > -1) {
@@ -866,6 +866,7 @@ export default {
renderMeasuredData(e) {
this.stack.frame = !isNaN(parseInt(this.stack.frame)) ? parseInt(this.stack.frame) : 0
var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
+ if (idx === -1) return
this.measureData = this.visitTaskList[idx].MeasureData
const { element } = e.detail
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
@@ -904,11 +905,8 @@ export default {
if (this.readingTaskState >= 2) return
var element = cornerstone.getEnabledElement(this.canvas)
var { imageId } = element.image
- var instanceId = imageId.split('/')[imageId.split('/').length - 1]
- if (instanceId.includes('?frame=')) {
- instanceId = instanceId.split('?frame=')[0]
- }
- instanceId = instanceId.split('.')[0]
+ const imageInfo = this.getInstanceInfo(imageId)
+ var instanceId = imageInfo.instanceId
var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId && i.IsCurrentTask && i.ReadingTaskState < 2)
if (idx === -1) return
this.measureData = this.visitTaskList[idx].MeasureData
@@ -968,18 +966,13 @@ export default {
}
}
},
- async mouseClick(e) {
+ mouseClick(e) {
const { element, currentPoints, image, viewport } = e.detail
var imageId = image.imageId
- var instanceId = imageId.split('/')[imageId.split('/').length - 1]
- var frame = null
- if (instanceId.includes('?frame=')) {
- frame = instanceId.split('?frame=')[1]
- instanceId = instanceId.split('?frame=')[0]
- }
+ const imageInfo = this.getInstanceInfo(imageId)
+ var instanceId = imageInfo.instanceId
+ var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
- instanceId = instanceId.split('.')[0]
-
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
for (let t = 0; t < this.measuredTools.length; t++) {
var toolType = this.measuredTools[t]
@@ -1010,6 +1003,7 @@ export default {
measureData.data = toolState.data[i]
measureData.type = toolType
measureData.thick = this.dicomInfo.thick
+ measureData.location = this.dicomInfo.location
measureData.ww = Math.round(viewport.voi.windowWidth)
measureData.wc = Math.round(viewport.voi.windowCenter)
measureData.data.active = false
@@ -1049,6 +1043,7 @@ export default {
this.stack.seriesIndex = dicomSeries.seriesIndex
this.stack.sliceThickness = dicomSeries.sliceThickness
this.stack.instanceCount = dicomSeries.instanceCount
+ this.stack.isExistsClinicalData = dicomSeries.isExistsClinicalData
// this.measuredData = dicomSeries.measuredData
var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === dicomSeries.visitTaskId)
this.stack.visitTaskNum = this.visitTaskList[idx].VisitTaskNum
@@ -1058,18 +1053,15 @@ export default {
} else {
this.disabledMarks = []
}
+
this.maxVistNum = this.visitTaskList[this.visitTaskList.length - 1].VisitTaskNum
this.minVistNum = this.visitTaskList[0].VisitTaskNum
this.measureData = this.visitTaskList[idx].MeasureData
const imageId = this.stack.imageIds[this.stack.currentImageIdIndex]
- var instanceId = imageId.split('/')[imageId.split('/').length - 1]
- var frame = null
- if (instanceId.includes('?frame=')) {
- frame = instanceId.split('?frame=')[1]
- instanceId = instanceId.split('?frame=')[0]
- }
+ const imageInfo = this.getInstanceInfo(imageId)
+ var instanceId = imageInfo.instanceId
+ var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
- instanceId = instanceId.split('.')[0]
this.stack.instanceId = instanceId
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
ToolStateManager.clearImageIdToolState(dicomSeries.imageIds)
@@ -1093,99 +1085,100 @@ export default {
// }
// resolve()
// })
+ this.loading = true
cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
- .then(image => {
- scope.onFirstImageLoaded(image)
+ .then(async image => {
+ await scope.onFirstImageLoaded(image)
+ scope.loading = false
resolve()
})
.catch((error) => {
if (error.error && error.error.message) {
this.$alert(error.error.message)
}
+ scope.loading = false
resolve()
})
})
},
onFirstImageLoaded(image) {
console.log('onFirstImageLoaded')
+ return new Promise(async resolve => {
+ const element = this.$refs.canvas
+ var viewport = cornerstone.getDefaultViewportForImage(this.canvas, image)
+ cornerstone.displayImage(this.canvas, image, viewport)
- const element = this.$refs.canvas
- var viewport = cornerstone.getDefaultViewportForImage(this.canvas, image)
- cornerstone.displayImage(this.canvas, image, viewport)
+ if (!this.toolState.initialized) {
+ this.toolState.initialized = true
+ const toolButtons = document.querySelectorAll('[data-tool]')
- if (!this.toolState.initialized) {
- this.toolState.initialized = true
- const toolButtons = document.querySelectorAll('[data-tool]')
-
- // const scope = this
- Array.from(toolButtons).forEach((toolBtn) => {
+ // const scope = this
+ Array.from(toolButtons).forEach((toolBtn) => {
// Add the tool
- const toolName = toolBtn.getAttribute('data-tool')
- const apiTool = cornerstoneTools[`${toolName}Tool`]
- if (apiTool) {
- const toolAlreadyAddedToElement = cornerstoneTools.getToolForElement(element, apiTool)
+ const toolName = toolBtn.getAttribute('data-tool')
+ const apiTool = cornerstoneTools[`${toolName}Tool`]
+ if (apiTool) {
+ const toolAlreadyAddedToElement = cornerstoneTools.getToolForElement(element, apiTool)
- if (!toolAlreadyAddedToElement) {
- if (toolName === 'Length') {
- cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true }})
- } else if (toolName === 'Bidirectional') {
+ if (!toolAlreadyAddedToElement) {
+ if (toolName === 'Length') {
+ cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true }})
+ } else if (toolName === 'Bidirectional') {
// cornerstoneTools.addToolForElement(element, BidirectionalTool, { digits: this.digitPlaces })
// , handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true
- cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true }})
- } else if (toolName === 'ArrowAnnotate') {
- cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
- } else if (toolName === 'RectangleRoi') {
- cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
- } else {
- cornerstoneTools.addToolForElement(element, apiTool)
+ cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true }})
+ } else if (toolName === 'ArrowAnnotate') {
+ cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
+ } else if (toolName === 'RectangleRoi') {
+ cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
+ } else {
+ cornerstoneTools.addToolForElement(element, apiTool)
+ }
}
}
+ })
+ if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.WwwcRegionTool)) {
+ cornerstoneTools.addToolForElement(element, cornerstoneTools.WwwcRegionTool)
}
- })
- if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.WwwcRegionTool)) {
- cornerstoneTools.addToolForElement(element, cornerstoneTools.WwwcRegionTool)
- }
- if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)) {
- cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)
- }
- cornerstoneTools.setToolActiveForElement(element, 'StackScrollMouseWheel', {})
+ if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)) {
+ cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)
+ }
+ cornerstoneTools.setToolActiveForElement(element, 'StackScrollMouseWheel', {})
- if (!cornerstoneTools.getToolForElement(element, ScaleOverlayTool)) {
- cornerstoneTools.addToolForElement(element, ScaleOverlayTool)
- }
- cornerstoneTools.setToolActiveForElement(element, 'ScaleOverlay', {})
- cornerstoneTools.setToolActiveForElement(this.canvas, 'Zoom', {
- mouseButtonMask: 2
- })
- cornerstoneTools.setToolActiveForElement(this.canvas, 'Pan', {
- mouseButtonMask: 4
- })
+ if (!cornerstoneTools.getToolForElement(element, ScaleOverlayTool)) {
+ cornerstoneTools.addToolForElement(element, ScaleOverlayTool)
+ }
+ cornerstoneTools.setToolActiveForElement(element, 'ScaleOverlay', {})
+ cornerstoneTools.setToolActiveForElement(this.canvas, 'Zoom', {
+ mouseButtonMask: 2
+ })
+ cornerstoneTools.setToolActiveForElement(this.canvas, 'Pan', {
+ mouseButtonMask: 4
+ })
// if (!cornerstoneTools.getToolForElement(element, OrientationMarkersTool)) {
// cornerstoneTools.addToolForElement(element, OrientationMarkersTool)
// }
// cornerstoneTools.setToolActiveForElement(element, 'OrientationMarkers', { })
- }
+ }
- // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
- cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'playClip'])
- cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
- // cornerstoneTools.stackPrefetch.enable(this.canvas)
- cornerstone.updateImage(element, true)
+ // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
+ cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'playClip'])
+ cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
+ // cornerstoneTools.stackPrefetch.enable(this.canvas)
+ cornerstone.updateImage(element, true)
- this.stack.firstImageLoading = false
- this.toolState.dicomInfoVisible = true
- var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
- var frame = null
- if (instanceId.includes('?frame=')) {
- frame = instanceId.split('?frame=')[1]
- instanceId = instanceId.split('?frame=')[0]
- }
- this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
- instanceId = instanceId.split('.')[0]
- this.stack.instanceId = instanceId
- this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
- this.resetWwwc()
+ this.stack.firstImageLoading = false
+ this.toolState.dicomInfoVisible = true
+ const imageInfo = this.getInstanceInfo(image.imageId)
+ var instanceId = imageInfo.instanceId
+ var frame = imageInfo.frame
+ this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+ this.stack.instanceId = instanceId
+ this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
+ this.resetWwwc()
+ resolve()
+ })
},
onNewImage(e) {
console.log('cornerstonenewimage')
@@ -1246,14 +1239,10 @@ export default {
this.stack.imageRendered = true
// const { element } = e.detail
var imageId = e.detail.image.imageId
- var instanceId = imageId.split('/')[imageId.split('/').length - 1]
- var frame = null
- if (instanceId.includes('?frame=')) {
- frame = instanceId.split('?frame=')[1]
- instanceId = instanceId.split('?frame=')[0]
- }
+ const imageInfo = this.getInstanceInfo(imageId)
+ var instanceId = imageInfo.instanceId
+ var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
- instanceId = instanceId.split('.')[0]
if (this.imageId !== instanceId) {
this.getOrientationMarker(e.detail.element)
// 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值
@@ -1290,20 +1279,11 @@ export default {
if (!imagePlane || !imagePlane.rowCosines || !imagePlane.columnCosines) {
return
}
-
const row = getOrientationString(imagePlane.rowCosines)
const column = getOrientationString(imagePlane.columnCosines)
const oppositeRow = invertOrientationString(row)
const oppositeColumn = invertOrientationString(column)
- const markers = {
- top: oppositeColumn,
- bottom: column,
- left: oppositeRow,
- right: row
- }
- if (!markers) {
- return
- }
+
this.orientationMarkers = [oppositeColumn, row, column, oppositeRow]
this.originalMarkers = [oppositeColumn, row, column, oppositeRow]
this.setMarkers()
@@ -1318,14 +1298,10 @@ export default {
this.activeTool = 1
this.activeToolName = ''
var { imageId } = element.image
- var instanceId = imageId.split('/')[imageId.split('/').length - 1]
- var frame = null
- if (instanceId.includes('?frame=')) {
- frame = instanceId.split('?frame=')[1]
- instanceId = instanceId.split('?frame=')[0]
- }
+ const imageInfo = this.getInstanceInfo(imageId)
+ var instanceId = imageInfo.instanceId
+ var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
- instanceId = instanceId.split('.')[0]
if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') {
const measureData = {}
measureData.studyId = this.stack.studyId
@@ -1335,6 +1311,7 @@ export default {
measureData.data = e.detail.measurementData
measureData.type = e.detail.toolName
measureData.thick = this.dicomInfo.thick
+ measureData.location = this.dicomInfo.location
measureData.ww = Math.round(viewport.voi.windowWidth)
measureData.wc = Math.round(viewport.voi.windowCenter)
@@ -1351,6 +1328,7 @@ export default {
measureData.data = e.detail.measurementData
measureData.type = e.detail.toolName
measureData.thick = this.dicomInfo.thick
+ measureData.location = this.dicomInfo.location
measureData.ww = Math.round(viewport.voi.windowWidth)
measureData.wc = Math.round(viewport.voi.windowCenter)
const canvas = this.canvas.querySelector('canvas')
@@ -1402,9 +1380,9 @@ export default {
var element = cornerstone.getEnabledElement(this.canvas)
const { rowPixelSpacing, colPixelSpacing } = this.getPixelSpacing(element.image)
const dx =
- (data.handles.end.x - data.handles.start.x) * (colPixelSpacing || 1)
+ (data.handles.end.x - data.handles.start.x) * (colPixelSpacing || 1)
const dy =
- (data.handles.end.y - data.handles.start.y) * (rowPixelSpacing || 1)
+ (data.handles.end.y - data.handles.start.y) * (rowPixelSpacing || 1)
const length = Math.sqrt(dx * dx + dy * dy)
return length.toFixed(this.digitPlaces)
@@ -1418,9 +1396,9 @@ export default {
if (imagePlane) {
return {
rowPixelSpacing:
- imagePlane.rowPixelSpacing || imagePlane.rowImagePixelSpacing,
+ imagePlane.rowPixelSpacing || imagePlane.rowImagePixelSpacing,
colPixelSpacing:
- imagePlane.columnPixelSpacing || imagePlane.colImagePixelSpacing
+ imagePlane.columnPixelSpacing || imagePlane.colImagePixelSpacing
}
}
@@ -1430,7 +1408,7 @@ export default {
}
},
onMeasurementremoved(e) {
-
+ console.log('================移除病灶=================', e)
},
onMeasurementmodified(e) {
// 移动
@@ -1440,14 +1418,10 @@ export default {
var element = cornerstone.getEnabledElement(this.canvas)
var viewport = element.viewport
var { imageId } = element.image
- var instanceId = imageId.split('/')[imageId.split('/').length - 1]
- var frame = null
- if (instanceId.includes('?frame=')) {
- frame = instanceId.split('?frame=')[1]
- instanceId = instanceId.split('?frame=')[0]
- }
+ const imageInfo = this.getInstanceInfo(imageId)
+ var instanceId = imageInfo.instanceId
+ var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
- instanceId = instanceId.split('.')[0]
var uuid = measurementData.uuid
var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
@@ -1465,6 +1439,7 @@ export default {
measureData.data = measurementData
measureData.type = toolType
measureData.thick = this.dicomInfo.thick
+ measureData.location = this.dicomInfo.location
measureData.ww = Math.round(viewport.voi.windowWidth)
measureData.wc = Math.round(viewport.voi.windowCenter)
measureData.data.active = false
@@ -1504,11 +1479,8 @@ export default {
// 判断有没有标记 获取第一个标记
var element = cornerstone.getEnabledElement(this.canvas)
var { imageId } = element.image
- var instanceId = imageId.split('/')[imageId.split('/').length - 1]
- if (instanceId.includes('?frame=')) {
- instanceId = instanceId.split('?frame=')[0]
- }
- instanceId = instanceId.split('.')[0]
+ const imageInfo = this.getInstanceInfo(imageId)
+ var instanceId = imageInfo.instanceId
var idx = this.measureData.findIndex(item => item.InstanceId === instanceId)
var measureData = null
if (idx > -1) {
@@ -1923,6 +1895,14 @@ export default {
}
}
},
+ getInstanceInfo(imageId) {
+ const params = {}
+ const searchParams = new URLSearchParams(imageId.split('?')[1])
+ for (const [key, value] of searchParams.entries()) {
+ params[key] = value
+ }
+ return params
+ },
preventDefault(e) {
e.stopImmediatePropagation()
e.stopPropagation()
@@ -1940,87 +1920,87 @@ export default {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index 714acea8..882a259d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -280,6 +280,51 @@
{{ tool.text }}