1
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
9b8c6788bf
commit
09144f2b98
|
|
@ -1926,6 +1926,7 @@ export default {
|
||||||
console.log('Completed')
|
console.log('Completed')
|
||||||
const { annotation } = e.detail
|
const { annotation } = e.detail
|
||||||
if (!annotation) return
|
if (!annotation) return
|
||||||
|
if (annotation.metadata.toolName === FusionJumpToPointTool.toolName) return
|
||||||
if (annotation.metadata.toolName.includes('histogram_')) return this.$refs.histogram.initToolValue(annotation)
|
if (annotation.metadata.toolName.includes('histogram_')) return this.$refs.histogram.initToolValue(annotation)
|
||||||
if (this.readingTaskState === 2) return
|
if (this.readingTaskState === 2) return
|
||||||
if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
|
if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
|
||||||
|
|
@ -1952,6 +1953,7 @@ export default {
|
||||||
console.log('Modified')
|
console.log('Modified')
|
||||||
const { annotation } = e.detail
|
const { annotation } = e.detail
|
||||||
if (!annotation) return
|
if (!annotation) return
|
||||||
|
if (annotation.metadata.toolName === FusionJumpToPointTool.toolName) return
|
||||||
if (annotation.metadata.toolName.includes('histogram_')) return this.$refs.histogram.initToolValue(annotation)
|
if (annotation.metadata.toolName.includes('histogram_')) return this.$refs.histogram.initToolValue(annotation)
|
||||||
if (this.readingTaskState === 2) return
|
if (this.readingTaskState === 2) return
|
||||||
if (!annotation.highlighted) return
|
if (!annotation.highlighted) return
|
||||||
|
|
@ -1968,6 +1970,7 @@ export default {
|
||||||
const { annotation } = e.detail
|
const { annotation } = e.detail
|
||||||
try {
|
try {
|
||||||
if (!annotation) return
|
if (!annotation) return
|
||||||
|
if (annotation.metadata.toolName === FusionJumpToPointTool.toolName) return
|
||||||
if (annotation.metadata.toolName === CrosshairsTool.toolName) return
|
if (annotation.metadata.toolName === CrosshairsTool.toolName) return
|
||||||
if (this.readingTaskState === 2 && !annotation.data.label) return false
|
if (this.readingTaskState === 2 && !annotation.data.label) return false
|
||||||
if (this.readingTaskState === 2) {
|
if (this.readingTaskState === 2) {
|
||||||
|
|
@ -1997,6 +2000,7 @@ export default {
|
||||||
async customAnnotationCompletedListener(e) {
|
async customAnnotationCompletedListener(e) {
|
||||||
const { annotation } = e.detail
|
const { annotation } = e.detail
|
||||||
if (!annotation) return
|
if (!annotation) return
|
||||||
|
if (annotation.metadata.toolName === FusionJumpToPointTool.toolName) return
|
||||||
if (annotation.metadata.toolName.includes('histogram_')) return this.$refs.histogram.initToolValue(annotation)
|
if (annotation.metadata.toolName.includes('histogram_')) return this.$refs.histogram.initToolValue(annotation)
|
||||||
if (this.readingTaskState === 2) return
|
if (this.readingTaskState === 2) return
|
||||||
const i = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
|
const i = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
|
||||||
|
|
@ -2085,6 +2089,7 @@ export default {
|
||||||
customAnnotationModifiedListener(e) {
|
customAnnotationModifiedListener(e) {
|
||||||
const { annotation } = e.detail
|
const { annotation } = e.detail
|
||||||
if (!annotation) return
|
if (!annotation) return
|
||||||
|
if (annotation.metadata.toolName === FusionJumpToPointTool.toolName) return
|
||||||
if (annotation.metadata.toolName.includes('histogram_')) return this.$refs.histogram.initToolValue(annotation)
|
if (annotation.metadata.toolName.includes('histogram_')) return this.$refs.histogram.initToolValue(annotation)
|
||||||
if (this.readingTaskState === 2) return
|
if (this.readingTaskState === 2) return
|
||||||
if (!annotation.highlighted) return
|
if (!annotation.highlighted) return
|
||||||
|
|
@ -2114,6 +2119,7 @@ export default {
|
||||||
try {
|
try {
|
||||||
// if ( this.resetAnnotation && this.isFusion ) return false
|
// if ( this.resetAnnotation && this.isFusion ) return false
|
||||||
if (!annotation) return false
|
if (!annotation) return false
|
||||||
|
if (annotation.metadata.toolName === FusionJumpToPointTool.toolName) return false
|
||||||
if (annotation.metadata.toolName === CrosshairsTool.toolName) return false
|
if (annotation.metadata.toolName === CrosshairsTool.toolName) return false
|
||||||
if (this.readingTaskState === 2 && !annotation.data.label) return false
|
if (this.readingTaskState === 2 && !annotation.data.label) return false
|
||||||
if (this.readingTaskState === 2) {
|
if (this.readingTaskState === 2) {
|
||||||
|
|
@ -2218,7 +2224,11 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
annotationSelectionChangeListener(e) { },
|
annotationSelectionChangeListener(e) {
|
||||||
|
const { annotation } = e.detail || {}
|
||||||
|
if (!annotation) return
|
||||||
|
if (annotation.metadata.toolName === FusionJumpToPointTool.toolName) return
|
||||||
|
},
|
||||||
async getAnnotations(visitTaskId) {
|
async getAnnotations(visitTaskId) {
|
||||||
if (this.readingTaskState === 2) return
|
if (this.readingTaskState === 2) return
|
||||||
const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
|
const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
|
||||||
|
|
|
||||||
|
|
@ -521,7 +521,7 @@ export default {
|
||||||
IsImageFilter: false,
|
IsImageFilter: false,
|
||||||
KeyFileListStr: '',
|
KeyFileListStr: '',
|
||||||
KeyFileList: [],
|
KeyFileList: [],
|
||||||
CircleRadius: null
|
CircleRadius: 10
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
IsAutoCreate: [
|
IsAutoCreate: [
|
||||||
|
|
@ -1063,7 +1063,7 @@ export default {
|
||||||
},
|
},
|
||||||
handleReadingToolListChange(v) {
|
handleReadingToolListChange(v) {
|
||||||
if (!v.includes('FixedRadiusCircleROI')) {
|
if (!v.includes('FixedRadiusCircleROI')) {
|
||||||
this.form.CircleRadius = null
|
this.form.CircleRadius = 10
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleNumberInput(value, field) {
|
handleNumberInput(value, field) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue