diff --git a/src/icons/svg/circularbrush.svg b/src/icons/svg/circularbrush.svg
new file mode 100644
index 00000000..07b0534c
--- /dev/null
+++ b/src/icons/svg/circularbrush.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/jumpto.svg b/src/icons/svg/jumpto.svg
new file mode 100644
index 00000000..b333542f
--- /dev/null
+++ b/src/icons/svg/jumpto.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
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 d27413a8..00b51b9e 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -363,9 +363,9 @@
+ :rendering-engine-id="renderingEngineId" :activeViewportIndex="activeViewportIndex"
+ :activeTool.sync="activeTool" :actionConfiguration="actionConfiguration"
+ @setToolsPassive="setToolsPassive" @resetQuestion="resetQuestion" />
@@ -479,7 +479,7 @@
-
{
+ this.$refs.SegmentForm.setSeries(this.$refs[`viewport-${this.activeViewportIndex}`][0].series)
+ this.$refs.SegmentForm.init()
+ })
},
handleClick(tab, event) {
this.formWrapperActiveName = tab.name
@@ -1323,7 +1327,7 @@ export default {
cornerstoneTools.addTool(MIPJumpToClickTool)
cornerstoneTools.addTool(VolumeRotateTool)
cornerstoneTools.addTool(CrosshairsTool)
- cornerstoneTools.addTool(PlanarFreehandContourSegmentationTool)
+ cornerstoneTools.addTool(LabelMapEditWithContourTool)
cornerstoneTools.addTool(BrushTool)
cornerstoneTools.addTool(SegmentBidirectionalTool)
viewportIds.forEach((viewportId, i) => {
@@ -1364,21 +1368,8 @@ export default {
}
)
- toolGroup.addTool(PlanarFreehandContourSegmentationTool.toolName, {
- cachedStats: true,
- });
- toolGroup.addTool(SegmentBidirectionalTool.toolName, {});
- // toolGroup.setToolActive(PlanarFreehandContourSegmentationTool.toolName, {
- // bindings: [
- // {
- // mouseButton: MouseBindings.Primary, // Left Click
- // },
- // {
- // mouseButton: MouseBindings.Primary, // Shift + Left Click
- // modifierKey: cornerstoneTools.Enums.KeyboardBindings.Shift,
- // },
- // ],
- // });
+ toolGroup.addTool(LabelMapEditWithContourTool.toolName);
+ toolGroup.addTool(SegmentBidirectionalTool.toolName);
}
if (volumeViewportIds.includes(viewportId)) {
toolGroup.addTool(WindowLevelTool.toolName, {
@@ -1490,7 +1481,7 @@ export default {
toolGroup.setToolPassive(AngleTool.toolName)
toolGroup.setToolPassive(CobbAngleTool.toolName)
if (this.readingTool === 3) {
- toolGroup.setToolPassive(PlanarFreehandContourSegmentationTool.toolName)
+ toolGroup.setToolPassive(LabelMapEditWithContourTool.toolName)
toolGroup.setToolPassive(SegmentBidirectionalTool.toolName, {});
}
} else {
@@ -1504,11 +1495,10 @@ export default {
toolGroup.setToolEnabled(FixedRadiusCircleROITool.toolName)
toolGroup.setToolEnabled(AngleTool.toolName)
toolGroup.setToolEnabled(CobbAngleTool.toolName)
- if (this.readingTool === 3) toolGroup.setToolEnabled(PlanarFreehandContourSegmentationTool.toolName)
+ if (this.readingTool === 3) toolGroup.setToolEnabled(LabelMapEditWithContourTool.toolName)
}
toolGroup.setToolPassive(EraserTool.toolName)
})
-
eventTarget.addEventListener('cornerstoneimageloadprogress', this.imageLoadProgress)
// console.log(Events, toolsEvents)
if (this.readingTool === 2) {
@@ -1517,6 +1507,7 @@ export default {
if ((this.criterionType === 0 && this.readingTool === 0) || this.readingTool === 3) {
this.setUpSynchronizersMPR()
}
+ renderingEngine.render();
},
// 影像下载进度回调
imageLoadProgress(e) {
@@ -1720,7 +1711,7 @@ export default {
if (!annotation) return
const i = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
if (i === -1) {
- if (annotation.metadata.toolName !== PlanarFreehandContourSegmentationTool.toolName) this.setToolsPassive()
+ if (annotation.metadata.toolName !== LabelMapEditWithContourTool.toolName) this.setToolsPassive()
return
}
if (annotation.data.segmentation || annotation.data.segment) return
@@ -1807,7 +1798,7 @@ export default {
if (!annotation) return
const i = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
if (i === -1) {
- if (annotation.metadata.toolName !== PlanarFreehandContourSegmentationTool.toolName) this.setToolsPassive()
+ if (annotation.metadata.toolName !== LabelMapEditWithContourTool.toolName) this.setToolsPassive()
return
}
if (annotation.data.segmentation || annotation.data.segment) return
@@ -3026,7 +3017,7 @@ export default {
obj.IsMarked = true
obj.MeasureData = annotation
}
- if (annotation.from === 'MPR' && checkFrom) {
+ if ((annotation.from === 'MPR' || annotation.metadata.volumeId) && checkFrom) {
obj = Object.assign({}, seriesList[seriesIdx])
obj.SliceIndex = annotation?.metadata?.sliceIndex
obj.IsMarked = true
@@ -3792,6 +3783,15 @@ export default {
}