{{ $t("trials:reading:Segmentations:button:saveAll") }}
@@ -261,6 +258,8 @@ import * as cornerstoneAdapters from "@cornerstonejs/adapters";
import cornerstoneDICOMImageLoader from '@cornerstonejs/dicom-image-loader'
import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
import { getCustomizeStandardsSegmentDicomTools } from './toolConfig'
+import * as polySeg from '@cornerstonejs/polymorphic-segmentation'
+cornerstoneTools.init({ addons: { polySeg } })
const {
ToolGroupManager,
Enums: csToolsEnums,
@@ -271,6 +270,7 @@ const {
CrosshairsTool,
utilities: CStUtils,
} = cornerstoneTools;
+
const { MouseBindings, Events: toolsEvents } = csToolsEnums
const { segmentation: segmentationUtils } = CStUtils;
const { cache, getRenderingEngine, imageLoader, eventTarget, metaData, utilities: csUtils, volumeLoader } = cornerstone;
@@ -305,12 +305,32 @@ export default {
return {}
}
},
+ SegmentConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
+ },
actionConfiguration: {
type: Object,
default: () => {
return {}
}
},
+ curSegSeries: {
+ type: Object,
+ default: () => {
+ return {}
+ }
+ },
+ segId: {
+ type: String,
+ default: ''
+ },
+ segIndex: {
+ type: Number,
+ default: 0
+ },
renderingEngineId: {
type: String,
required: true
@@ -343,16 +363,6 @@ export default {
ThresholdTools: ['ThresholdCircle', 'ThresholdSphere'],
thresholdType: null,
showSegmentConfig: false,
- SegmentConfig: {
- renderOutline: true,
- renderFill: true,
- fillAlpha: 0.5,
- outlineWidth: 1,
- InactiveSegmentations: {
- show: true,
- fillAlpha: 0.3,
- }
- },
segmentList: [],
segmentationId: "",
segmentIndex: null,
@@ -368,7 +378,7 @@ export default {
'#ff994d',
'#fb628b',
],
- viewprotIds: ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3', 'viewport-MPR-0', 'viewport-MPR-1', 'viewport-MPR-2'], //
+ viewportIds: [], //
statsKey: [],
drawing: false, // 是否正在分割
// isDel: false,
@@ -388,14 +398,24 @@ export default {
this.segmentationModifiedCallback
);
DicomEvent.$on('activeSeries', (series) => {
+ console.log(series, 'series')
+ let { TaskInfo = {}, Id } = series
+ if (Id === this.series.Id && TaskInfo.VisitTaskId === this.visitInfo.VisitTaskId) return false
this.series = series
+ this.$emit("update:curSegSeries", Object.assign(series, {}))
+ this.getSegmentationList()
})
DicomEvent.$on('isloaded', (data) => {
- if (this.isloaded) return false
- this.isloaded = true
- let { segment, isChange = true } = data
- this.delAllSegment(isChange)
- this.getSegmentationList(segment)
+ let { segment, isChange = true, viewportId, series } = data
+ DicomEvent.$emit('renderSegmentation', viewportId)
+ // if (!series.TaskInfo || series.TaskInfo.VisitTaskId !== this.visitInfo.VisitTaskId) return false
+ // if (this.isloaded) return false
+ // this.isloaded = true
+ // this.series = series
+ // this.viewportIds = []
+ // this.viewportIds.push(viewportId)
+ // // this.delAllSegment(isChange)
+ // this.readingSegmentToViewport(segment)
})
const digitPlaces = Number(localStorage.getItem('digitPlaces'))
this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
@@ -414,12 +434,15 @@ export default {
s = this.curSegmentGroup.segments.find(item => item.segmentIndex === this.segmentIndex)
}
return s
+ },
+ readingTaskState() {
+ return this.series.TaskInfo ? this.series.TaskInfo.ReadingTaskState : 0
}
},
watch: {
SegmentConfig: {
handler() {
- this.readingSegmentByConfig()
+ // this.readingSegmentByConfig()
},
deep: true
},
@@ -434,9 +457,23 @@ export default {
this.setBrushThreshold()
},
deep: true
+ },
+ segmentIndex() {
+ this.$emit('update:segIndex', this.segmentIndex)
+ },
+ segmentationId() {
+ this.$emit('update:segId', this.segmentationId)
}
},
methods: {
+ showSurface(item) {
+ this.$emit("showSurface", {
+ segmentationId: item.segmentationId,
+ segmentIndex: item.segmentIndex,
+ volumeId: this.series.SeriesInstanceUid,
+ segmentations: this.curSegmentGroup
+ })
+ },
handleClickPopover(item) {
this.popoverId = `popover-${item.segmentationId}_${item.segmentIndex}`
},
@@ -504,7 +541,6 @@ export default {
segmentationId: list[0].segmentationId,
segmentIndices: list.map(item => item.segmentIndex),
});
- console.log(bidirectionalData, list[0].segmentationId, 'bidirectionalData')
if (bidirectionalData.length <= 0) {
list.forEach(item => {
let annotations = annotation.state.getAllAnnotations().filter(i => i.metadata.segmentationId === item.segmentationId && i.metadata.segmentIndex === item.segmentIndex);
@@ -563,6 +599,7 @@ export default {
},
setToolActive(toolName) {
+ // if (!this.series.TaskInfo || this.series.TaskInfo.VisitTaskId !== this.visitInfo.VisitTaskId) return false
if (this.segmentList.length <= 0) return false
if (this.curSegment.lock) return false
if (this.histogramVisible && !this.ThresholdTools.includes(toolName)) return false
@@ -602,71 +639,33 @@ export default {
viewBidirectional(arr, view) {
for (let j = 0; j < arr.length; j++) {
let item = arr[j]
- let bidirectional = annotation.state.getAllAnnotations().find(i => i.metadata.segmentationId === item.segmentationId && i.metadata.segmentIndex === item.segmentIndex && i.metadata.toolName === "SegmentBidirectional");
item.bidirectionalView = view
- if (!bidirectional) continue
- annotation.visibility.setAnnotationVisibility(bidirectional.annotationUID, view)
+ // let bidirectional = annotation.state.getAllAnnotations().find(i => i.metadata.segmentationId === item.segmentationId && i.metadata.segmentIndex === item.segmentIndex && i.metadata.toolName === "SegmentBidirectional");
+ // item.bidirectionalView = view
+ // if (!bidirectional) continue
+ // annotation.visibility.setAnnotationVisibility(bidirectional.annotationUID, view)
}
- this.resetViewport()
+ DicomEvent.$emit('viewBidirectional', arr)
+ // this.resetViewport()
},
async jumpBidirectional(item) {
- if (item.bidirectional) {
- let an = annotation.state.getAllAnnotations().find(i => i.metadata.segmentationId === item.segmentationId && i.metadata.segmentIndex === item.segmentIndex && i.metadata.toolName === "SegmentBidirectional");
- console.log(an, 'an')
- if (!an) return false
-
- const renderingEngine = getRenderingEngine(this.renderingEngineId)
- const viewportId = `${this.viewportKey}-${this.activeViewportIndex}`
- const viewport = renderingEngine.getViewport(viewportId)
- let key = Object.keys(an.data.cachedStats)[0]; // referencedImageId
- if (key) {
- let sliceIndex = key.split("?")[1].split("&")[0].split("=")[1]
- csUtils.jumpToSlice(viewport.element, { imageIndex: sliceIndex });
- } else {
- const points = an.data.handles.points;
- const worldPoint = points[0]; // 取一个点
- let volume = cache.getVolume(this.series.SeriesInstanceUid)
- let { imageData, numFrames } = volume
- const ijk = imageData.worldToIndex(worldPoint);
- const sliceIndex = Math.abs(Math.round(ijk[2]));
- // console.log(sliceIndex, 'sliceIndex')
- csUtils.jumpToSlice(viewport.element, { imageIndex: numFrames - sliceIndex - 1 });
- }
-
- }
+ DicomEvent.$emit('jumpBidirectional', item)
},
viewSegmentGroup(item) {
- let view = !item.view
- this.viewprotIds.forEach(id => {
- segmentation.config.visibility.setSegmentationRepresentationVisibility(
- id,
- {
- segmentationId: item.segmentationId,
- type: csToolsEnums.SegmentationRepresentations.Labelmap,
- },
- view
- );
- })
- item.view = view
-
+ item.view = !item.view
item.segments.forEach(i => {
- i.view = view
- // this.viewBidirectional(i, view)
+ i.view = item.view
})
- this.viewBidirectional(item.segments, view)
+ DicomEvent.$emit('viewSegmentation', item)
+ // this.viewBidirectional(item.segments, view)
},
viewSegment(item, view) {
- this.viewprotIds.forEach(id => {
- segmentation.config.visibility.setSegmentIndexVisibility(id, {
- segmentationId: item.segmentationId,
- type: csToolsEnums.SegmentationRepresentations.Labelmap,
- }, item.segmentIndex, view)
- })
item.view = view
- this.viewBidirectional([item], view)
this.$emit('setToolsPassive')
+ DicomEvent.$emit('viewSegment', item)
},
lockSegment(item, lock) {
+ if (this.readingTaskState >= 2) return false
segmentation.segmentLocking.setSegmentIndexLocked(item.segmentationId, item.segmentIndex, lock)
item.lock = lock
if (!lock) this.changeSegmentationSavedStatus(item.segmentationId, lock)
@@ -676,7 +675,7 @@ export default {
this.segmentationId = item.segmentationId;
this.segmentIndex = item.segmentIndex;
}
- segmentation.segmentIndex.setActiveSegmentIndex(item.segmentationId, item.segmentIndex);
+ // segmentation.segmentIndex.setActiveSegmentIndex(item.segmentationId, item.segmentIndex);
if (isChange) { this.jumpBidirectional(item) }
if (item.lock) {
@@ -685,15 +684,14 @@ export default {
// this.resetViewport()
},
selectSegmentGroup(s) {
- this.viewprotIds.forEach(id => {
- segmentation.activeSegmentation.setActiveSegmentation(id, this.segmentationId)
- })
+ // segmentation.activeSegmentation.setActiveSegmentation(`${this.viewportKey}-${this.activeViewportIndex}`, this.segmentationId)
let segment = s ? s : this.segmentList.find(item => item.segmentationId === this.segmentationId).segments[0]
- this.selectSegment(segment, s ? false : true)
- this.readingSegmentByConfig()
+ this.segmentIndex = segment.segmentIndex
+ // this.selectSegment(segment, s ? false : true)
+ // this.readingSegmentByConfig()
},
async addSegmentGroup() {
- let viewprotIds = this.viewprotIds
+ let viewportIds = this.viewportIds
// let segmentationId = this.$guid();
let obj = {
name: this.$t('trials:reading:Segmentations:name:SegmentGroup') + (this.segmentList.length + 1),
@@ -723,13 +721,14 @@ export default {
await this.createSegmentation(obj.segmentationId)
this.createSegmentationRepresentation(obj.segmentationId)
this.segmentIndex = 1
- viewprotIds.forEach(id => {
- segmentation.config.color.setSegmentIndexColor(id, obj.segmentationId, 1, this.hex2Rgb(this.colors[0]))
- })
+ this.changeColor(this.colors[0], { segmentationId: obj.segmentationId, segmentIndex: 1, color: this.colors[0] })
+ // viewportIds.forEach(id => {
+ // segmentation.config.color.setSegmentIndexColor(id, obj.segmentationId, 1, this.hex2Rgb(this.colors[0]))
+ // })
this.selectSegmentGroup()
},
async addSegment() {
- let viewprotIds = this.viewprotIds;
+ let viewportIds = this.viewportIds;
if (this.segmentList.length <= 0) {
let obj = {
name: this.$t('trials:reading:Segmentations:name:SegmentGroup') + 1,
@@ -759,10 +758,11 @@ export default {
this.createSegmentationRepresentation(this.segmentationId)
this.segmentIndex = 1
segmentation.segmentIndex.setActiveSegmentIndex(this.segmentList[0].segmentationId, 1);
- viewprotIds.forEach(id => {
- segmentation.config.color.setSegmentIndexColor(id, this.segmentList[0].segmentationId, 1, this.hex2Rgb(this.colors[0]))
- })
- this.readingSegmentByConfig()
+ this.changeColor(this.colors[0], { segmentationId: this.segmentList[0].segmentationId, segmentIndex: 1, color: this.colors[0] })
+ // viewportIds.forEach(id => {
+ // segmentation.config.color.setSegmentIndexColor(id, this.segmentList[0].segmentationId, 1, this.hex2Rgb(this.colors[0]))
+ // })
+ // this.readingSegmentByConfig()
} else {
let item = this.segmentList.find(i => i.segmentationId === this.segmentationId)
@@ -787,19 +787,22 @@ export default {
let id = await this.addOrUpdateSegment({ name: obj.SegmentLabel, color: obj.color, segmentIndex: obj.segmentIndex, segmentationId: obj.segmentationId })
obj.id = id
item.segments.push(obj)
- segmentation.segmentIndex.setActiveSegmentIndex(obj.segmentationId, obj.segmentIndex);
- viewprotIds.forEach(id => {
- segmentation.config.color.setSegmentIndexColor(id, obj.segmentationId, obj.segmentIndex, this.hex2Rgb(obj.color))
- })
this.segmentIndex = obj.segmentIndex
+ segmentation.segmentIndex.setActiveSegmentIndex(obj.segmentationId, obj.segmentIndex);
+ this.changeColor(obj.color, { segmentationId: obj.segmentationId, segmentIndex: obj.segmentIndex, color: obj.color })
+ // viewportIds.forEach(id => {
+ // segmentation.config.color.setSegmentIndexColor(id, obj.segmentationId, obj.segmentIndex, this.hex2Rgb(obj.color))
+ // })
+
}
},
changeColor(e, item) {
- this.viewprotIds.forEach(id => {
- segmentation.config.color.setSegmentIndexColor(id, item.segmentationId, item.segmentIndex, this.hex2Rgb(e))
- })
+ DicomEvent.$emit('changeColor', item)
+ // this.viewportIds.forEach(id => {
+ // segmentation.config.color.setSegmentIndexColor(id, item.segmentationId, item.segmentIndex, this.hex2Rgb(e))
+ // })
},
// 清空所有分割
delAllSegment(isChange) {
@@ -836,7 +839,7 @@ export default {
} else {
this.segmentationId = ''
}
- this.readingSegmentByConfig()
+ // this.readingSegmentByConfig()
this.resetViewport()
this.$emit('resetQuestion')
},
@@ -868,11 +871,7 @@ export default {
},
resetViewport(passive = true) {
- let renderingEngine = getRenderingEngine(this.renderingEngineId)
- this.viewprotIds.forEach(id => {
- const viewport = renderingEngine.getViewport(id)
- viewport.render()
- })
+ DicomEvent.$emit('resetViewport')
if (passive) this.$emit('setToolsPassive')
},
async rename(key, item) {
@@ -925,7 +924,7 @@ export default {
// 切换非当前分组分割标记显示
changeInactiveSegmentShow() {
let segmentList = this.segmentList.filter(item => item.segmentationId !== this.segmentationId)
- this.viewprotIds.forEach(id => {
+ this.viewportIds.forEach(id => {
segmentation.config.visibility.setSegmentationRepresentationVisibility(
id,
{
@@ -967,113 +966,118 @@ export default {
this.exportSegmentation(this.segmentationId, group, true)
},
exportSegmentation(segmentationId, group, isFile = false) {
- const segmentationIds = segmentation.state
- .getSegmentations()
- .map(x => x.segmentationId);
- if (!segmentationIds.length) {
- return;
- }
- const segmentGroup =
- segmentation.state.getSegmentation(segmentationId);
-
- let { imageIds } = segmentGroup.representationData.Labelmap;
-
- let segImages = imageIds.map(imageId => cache.getImage(imageId));
- segImages = segImages.reverse()
- let referencedImages = segImages.map(image =>
- cache.getImage(image.referencedImageId)
- );
- const labelmaps2D = [];
-
- let z = 0;
-
- for (const segImage of segImages) {
- const segmentsOnLabelmap = new Set();
- const pixelData = segImage.getPixelData();
- const { rows, columns } = segImage;
-
- for (let i = 0; i < pixelData.length; i++) {
- const segment = pixelData[i];
- if (segment !== 0) {
- segmentsOnLabelmap.add(segment);
- }
+ try {
+ const segmentationIds = segmentation.state
+ .getSegmentations()
+ .map(x => x.segmentationId);
+ if (!segmentationIds.length) {
+ return;
}
+ const segmentGroup =
+ segmentation.state.getSegmentation(segmentationId);
- labelmaps2D[z++] = {
- segmentsOnLabelmap: Array.from(segmentsOnLabelmap),
- pixelData,
- rows,
- columns
- };
- }
+ let { imageIds } = segmentGroup.representationData.Labelmap;
- const allSegmentsOnLabelmap = labelmaps2D.map(
- labelmap => labelmap.segmentsOnLabelmap
- );
-
- const labelmap3D = {
- segmentsOnLabelmap: Array.from(new Set(allSegmentsOnLabelmap.flat())),
- metadata: [],
- labelmaps2D
- };
- let segmentIndexs = []
- labelmap3D.segmentsOnLabelmap.forEach(segmentIndex => {
- const color = segmentation.config.color.getSegmentIndexColor(
- `${this.viewportKey}-${this.activeViewportIndex}`,
- segmentationId,
- segmentIndex
+ let segImages = imageIds.map(imageId => cache.getImage(imageId));
+ segImages = segImages.reverse()
+ let referencedImages = segImages.map(image =>
+ cache.getImage(image.referencedImageId)
);
- const RecommendedDisplayCIELabValue = dcmjs.data.Colors.rgb2DICOMLAB(
- color.slice(0, 3).map(value => value / 255)
- ).map(value => Math.round(value));
- let segment = group.segments.find(item => item.segmentIndex === segmentIndex)
- if (segment) {
- segmentIndexs.push(segmentIndex)
- let SegmentLabel = segment.SegmentLabel
- const segmentMetadata = {
- SegmentNumber: segmentIndex.toString(),
- SegmentLabel: SegmentLabel,
- SegmentAlgorithmType: "MANUAL",
- SegmentAlgorithmName: "OHIF Brush",
- RecommendedDisplayCIELabValue,
- SegmentedPropertyCategoryCodeSequence: {
- CodeValue: "T-D0050",
- CodingSchemeDesignator: "SRT",
- CodeMeaning: "Tissue"
- },
- SegmentedPropertyTypeCodeSequence: {
- CodeValue: "T-D0050",
- CodingSchemeDesignator: "SRT",
- CodeMeaning: "Tissue"
+ const labelmaps2D = [];
+
+ let z = 0;
+
+ for (const segImage of segImages) {
+ const segmentsOnLabelmap = new Set();
+ const pixelData = segImage.getPixelData();
+ const { rows, columns } = segImage;
+
+ for (let i = 0; i < pixelData.length; i++) {
+ const segment = pixelData[i];
+ if (segment !== 0) {
+ segmentsOnLabelmap.add(segment);
}
+ }
+
+ labelmaps2D[z++] = {
+ segmentsOnLabelmap: Array.from(segmentsOnLabelmap),
+ pixelData,
+ rows,
+ columns
};
-
- if (segment.stats) labelmap3D.metadata[segmentIndex] = segmentMetadata;
}
- });
- if (labelmap3D.metadata.length <= 0) {
- return false
- }
- const generatedSegmentation =
- Cornerstone3D.Segmentation.generateSegmentation(
- referencedImages,
- labelmap3D,
- metaData
+
+ const allSegmentsOnLabelmap = labelmaps2D.map(
+ labelmap => labelmap.segmentsOnLabelmap
);
- segmentIndexs.forEach((item, index) => {
- if (generatedSegmentation.dataset.SegmentSequence[index]) {
- generatedSegmentation.dataset.SegmentSequence[index].SegmentNumber = item.toString()
- }
- })
- generatedSegmentation.dataset.SegmentSequence.sort((a, b) => a.SegmentNumber - b.SegmentNumber)
- if (!isFile) {
- const buffer = Buffer.from(dcmjs.data.datasetToDict(generatedSegmentation.dataset).write());
- let blob = new Blob([buffer], { type: "application/dicom" });
- return blob
- } else {
- this.downloadDICOMData(generatedSegmentation.dataset, `${group.name}.dcm`);
+ const labelmap3D = {
+ segmentsOnLabelmap: Array.from(new Set(allSegmentsOnLabelmap.flat())),
+ metadata: [],
+ labelmaps2D
+ };
+ let segmentIndexs = []
+ labelmap3D.segmentsOnLabelmap.forEach(segmentIndex => {
+ const color = segmentation.config.color.getSegmentIndexColor(
+ `${this.viewportKey}-${this.activeViewportIndex}`,
+ segmentationId,
+ segmentIndex
+ );
+ const RecommendedDisplayCIELabValue = dcmjs.data.Colors.rgb2DICOMLAB(
+ color.slice(0, 3).map(value => value / 255)
+ ).map(value => Math.round(value));
+ let segment = group.segments.find(item => item.segmentIndex === segmentIndex)
+ if (segment) {
+ segmentIndexs.push(segmentIndex)
+ let SegmentLabel = segment.SegmentLabel
+ const segmentMetadata = {
+ SegmentNumber: segmentIndex.toString(),
+ SegmentLabel: SegmentLabel,
+ SegmentAlgorithmType: "MANUAL",
+ SegmentAlgorithmName: "OHIF Brush",
+ RecommendedDisplayCIELabValue,
+ SegmentedPropertyCategoryCodeSequence: {
+ CodeValue: "T-D0050",
+ CodingSchemeDesignator: "SRT",
+ CodeMeaning: "Tissue"
+ },
+ SegmentedPropertyTypeCodeSequence: {
+ CodeValue: "T-D0050",
+ CodingSchemeDesignator: "SRT",
+ CodeMeaning: "Tissue"
+ }
+ };
+
+ if (segment.stats) labelmap3D.metadata[segmentIndex] = segmentMetadata;
+ }
+ });
+ if (labelmap3D.metadata.length <= 0) {
+ return false
+ }
+ const generatedSegmentation =
+ Cornerstone3D.Segmentation.generateSegmentation(
+ referencedImages,
+ labelmap3D,
+ metaData
+ );
+ segmentIndexs.forEach((item, index) => {
+ if (generatedSegmentation.dataset.SegmentSequence[index]) {
+ generatedSegmentation.dataset.SegmentSequence[index].SegmentNumber = item.toString()
+ }
+
+ })
+ generatedSegmentation.dataset.SegmentSequence.sort((a, b) => a.SegmentNumber - b.SegmentNumber)
+ if (!isFile) {
+ const buffer = Buffer.from(dcmjs.data.datasetToDict(generatedSegmentation.dataset).write());
+ let blob = new Blob([buffer], { type: "application/dicom" });
+ return blob
+ } else {
+ this.downloadDICOMData(generatedSegmentation.dataset, `${group.name}.dcm`);
+ }
+ } catch (err) {
+ console.log(err)
}
+
},
downloadDICOMData(bufferOrDataset, filename) {
let blob;
@@ -1123,7 +1127,7 @@ export default {
const arrayBuffer = image.data.byteArray.buffer;
await this.loadSegmentation(arrayBuffer, obj.segmentationId);
- this.createSegmentationRepresentation(obj.segmentationId);
+ // this.createSegmentationRepresentation(obj.segmentationId);
},
async loadSegmentation(arrayBuffer, segmentationId) {
const generateToolState =
@@ -1306,51 +1310,49 @@ export default {
}
},
createSegmentationRepresentation(segmentationId) {
- this.viewprotIds.forEach(id => {
- segmentation.addSegmentationRepresentations(id, [
- {
- segmentationId,
- type: csToolsEnums.SegmentationRepresentations.Labelmap,
- },
- ])
- })
+ DicomEvent.$emit('createSegmentationRepresentation', segmentationId)
this.$emit('setToolsPassive')
},
contentMouseup() {
- // console.log("segment contentMouseup")
- if (!this.drawing) return false
- if (this.timeoutId) {
- clearTimeout(this.timeoutId);
- this.timeoutId = null;
- }
- this.timeoutId = setTimeout(() => {
- this.timeoutId = null;
- this.drawing = false;
- let segmentGroup = this.segmentList.find(item => item.segmentationId === this.segmentationId)
- if (segmentGroup && segmentGroup.segments && segmentGroup.segments.length > 0) {
- let segmentIndexs = []
- segmentGroup.segments.forEach(item => {
- segmentIndexs.push(item.segmentIndex)
- item.bidirectional = null
- item.stats = null
- })
- annotation.state.getAllAnnotations().forEach(i => {
- if (i.metadata.segmentationId === this.segmentationId && i.metadata.toolName === "SegmentBidirectional") {
- annotation.state.removeAnnotation(i.annotationUID)
- }
- })
- this.calculateStatistics(segmentIndexs, this.segmentationId, 'individual');
- this.resetViewport(false)
- // this.getBidirectional(segmentGroup.segments)
-
+ try {
+ // console.log("segment contentMouseup")
+ if (!this.drawing) return false
+ if (this.timeoutId) {
+ clearTimeout(this.timeoutId);
+ this.timeoutId = null;
}
- }, 500);
+ this.timeoutId = setTimeout(() => {
+ this.timeoutId = null;
+ this.drawing = false;
+ let segmentGroup = this.segmentList.find(item => item.segmentationId === this.segmentationId)
+ if (segmentGroup && segmentGroup.segments && segmentGroup.segments.length > 0) {
+ let segmentIndexs = []
+ segmentGroup.segments.forEach(item => {
+ segmentIndexs.push(item.segmentIndex)
+ item.bidirectional = null
+ item.stats = null
+ })
+ annotation.state.getAllAnnotations().forEach(i => {
+ if (i.metadata.segmentationId === this.segmentationId && i.metadata.toolName === "SegmentBidirectional") {
+ annotation.state.removeAnnotation(i.annotationUID)
+ }
+ })
+ this.calculateStatistics(segmentIndexs, this.segmentationId, 'individual');
+ this.resetViewport(false)
+ // this.getBidirectional(segmentGroup.segments)
+
+ }
+ }, 500);
+ } catch (err) {
+ console.log(err)
+ }
+
},
// 获取当前任务分割标记与问题绑定关系
async getSegmentBindingList(param = {}) {
try {
let data = {
- VisitTaskId: this.visitInfo.VisitTaskId,
+ VisitTaskId: this.series.TaskInfo.VisitTaskId,
PageSize: 9999,
PageIndex: 1,
}
@@ -1367,7 +1369,7 @@ export default {
async saveSegmentBindingAndAnswer(list) {
try {
let data = {
- VisitTaskId: this.visitInfo.VisitTaskId,
+ VisitTaskId: this.series.TaskInfo.VisitTaskId,
BindingList: list
}
let res = await saveSegmentBindingAndAnswer(data)
@@ -1482,7 +1484,7 @@ export default {
let bidirectional = bidirectionalData[0]
const { segmentIndex } = bidirectional;
- const { majorAxis, minorAxis, maxMajor, maxMinor } = bidirectional;
+ const { majorAxis, minorAxis } = bidirectional;
let item = list.find(i => i.segmentIndex === segmentIndex)
SegmentBidirectionalTool.hydrate(viewportId, [majorAxis, minorAxis], {
segmentIndex,
@@ -1491,7 +1493,7 @@ export default {
let an = annotation.state.getAllAnnotations().find(i => i.metadata.segmentationId === item.segmentationId && i.metadata.segmentIndex === bidirectional.segmentIndex && i.metadata.toolName === "SegmentBidirectional");
if (an) {
annotation.locking.setAnnotationLocked(an.annotationUID, true)
- annotation.visibility.setAnnotationVisibility(an.annotationUID, item.bidirectionalView)
+ annotation.visibility.setAnnotationVisibility(an.annotationUID, true)
}
item.bidirectional = bidirectional
reslove(true)
@@ -1536,7 +1538,7 @@ export default {
SegmentId: item.SegmentId,
SegmentationId: item.SegmentationId,
TableQuestionId: item.TableQuestionId,
- VisitTaskId: this.visitInfo.VisitTaskId,
+ VisitTaskId: this.series.TaskInfo.VisitTaskId,
}
bindingList.push(o)
}
@@ -1554,7 +1556,7 @@ export default {
SubjectId: this.visitInfo.SubjectId,
SubjectVisitId: this.visitInfo.VisistId,
TrialId: this.$route.query.trialId,
- VisitTaskId: this.visitInfo.VisitTaskId,
+ VisitTaskId: this.series.TaskInfo.VisitTaskId,
}
if (url) data.SegUrl = url;
if (id) data.Id = id;
@@ -1574,7 +1576,7 @@ export default {
try {
let data = {
SeriesId: this.series.Id,
- VisitTaskId: this.visitInfo.VisitTaskId,
+ VisitTaskId: this.series.TaskInfo.VisitTaskId,
PageSize: 9999,
PageIndex: 1,
}
@@ -1583,6 +1585,8 @@ export default {
this.loading = false;
if (res.IsSuccess) {
this.segmentList = []
+ this.segmentationId = null;
+ this.segmentIndex = null;
let list = res.Result.CurrentPageData;
for (let i = 0; i < list.length; i++) {
let item = list[i]
@@ -1597,12 +1601,12 @@ export default {
segments: []
}
this.segmentList.push(obj)
- if (item.SEGUrl) {
- await this.readSegmentation(obj)
- } else {
- await this.createSegmentation(obj.segmentationId)
- this.createSegmentationRepresentation(obj.segmentationId)
- }
+ // if (item.SEGUrl) {
+ // await this.readSegmentation(obj)
+ // } else {
+ // await this.createSegmentation(obj.segmentationId)
+ // // this.createSegmentationRepresentation(obj.segmentationId)
+ // }
}
if (!this.segmentationId) {
this.segmentationId = obj.segmentationId
@@ -1621,45 +1625,41 @@ export default {
bidirectional: SegmentJson.bidirectional,
bidirectionalView: true,
view: true,
- lock: item.locked,
+ lock: true,
id: s.Id
}
obj.segments.push(o)
- this.selectSegment(o, false)
- this.changeColor(s.ColorRgb, o)
- this.lockSegment(o, true)
+ // this.selectSegment(o, false)
+ // this.changeColor(s.ColorRgb, o)
+ // this.lockSegment(o, true)
}
if (!this.segmentIndex) {
this.segmentIndex = s.SegmentNumber
}
})
- this.$nextTick(() => {
- if (SEGMENT) {
- // console.log(SEGMENT, 'SEGMENT')
- return this.getBidirectional(obj.segments, SEGMENT)
- }
- this.getBidirectional(obj.segments, null, false)
- })
- }
- if (this.segmentationId && this.segmentIndex && this.segmentList && this.segmentList.length > 0) {
- let o = this.segmentList.find(item => item.segmentationId === this.segmentationId)
- if (o) {
- let s = o.segments.find(item => item.segmentIndex === this.segmentIndex)
- this.selectSegmentGroup(s)
- } else {
- this.segmentationId = this.segmentList[0].segmentationId
- this.segmentIndex = this.segmentationId ? this.segmentList[0].segments[0].segmentIndex : null
- if (this.segmentationId && this.segmentIndex) {
- this.selectSegmentGroup(this.segmentList[0].segments[0])
- }
-
- }
- // console.log(segment, 'segment')
-
- // this.selectSegment(segment)
+ // this.$nextTick(() => {
+ // if (SEGMENT) {
+ // // console.log(SEGMENT, 'SEGMENT')
+ // return this.getBidirectional(obj.segments, SEGMENT)
+ // }
+ // this.getBidirectional(obj.segments, null, false)
+ // })
}
+ // if (this.segmentationId && this.segmentIndex && this.segmentList && this.segmentList.length > 0) {
+ // let o = this.segmentList.find(item => item.segmentationId === this.segmentationId)
+ // if (o) {
+ // let s = o.segments.find(item => item.segmentIndex === this.segmentIndex)
+ // this.selectSegmentGroup(s)
+ // } else {
+ // this.segmentationId = this.segmentList[0].segmentationId
+ // this.segmentIndex = this.segmentationId ? this.segmentList[0].segments[0].segmentIndex : null
+ // if (this.segmentationId && this.segmentIndex) {
+ // this.selectSegmentGroup(this.segmentList[0].segments[0])
+ // }
+ // }
+ // }
this.isloaded = false
- this.readingSegmentByConfig()
+ // this.readingSegmentByConfig()
}
} catch (err) {
this.loading = false
@@ -1688,7 +1688,7 @@ export default {
SegmentName: name,
SegmentNumber: segmentIndex,
SegmentationId: segmentationId,
- VisitTaskId: this.visitInfo.VisitTaskId,
+ VisitTaskId: this.series.TaskInfo.VisitTaskId,
SegmentJson: segmentJson
}
if (id) data.Id = id
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
index 935e6697..59b3d097 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue
@@ -14,6 +14,25 @@
Image: #{{ `${series.SliceIndex + 1}/${imageInfo.total}` }}
{{ series.Modality }}
Slice Thickness: {{
`${Number(imageInfo.sliceThickness).toFixed(digitPlaces)} mm`
- }}