Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue

@@ -1978,7 +1978,8 @@ export default {
     imageLocation(obj) {
       return new Promise(resolve => {
         console.log('imageLocation')
-        this.setToolToTarget()
+        obj.markTool = obj.markTool ? obj.markTool : 'CircleROI'
+        this.setToolToTarget(obj)
         if (!obj.otherMeasureData) {
           resolve()
           return
@@ -2005,8 +2006,24 @@ export default {
       })
     },
     setToolToTarget(obj) {
-      if (this.activeTool) {
       var toolGroupIds = [ctToolGroupId, ptToolGroupId, fusionToolGroupId]
+      if (this.readingTaskState < 2 && obj.markTool && !obj.otherMeasureData) {
+        toolGroupIds.forEach((toolGroupId) => {
+          const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+          if (this.activeTool) {
+            toolGroup.setToolPassive(this.activeTool)
+          }
+          toolGroup.setToolActive(obj.markTool, {
+            bindings: [
+              {
+                mouseButton: MouseBindings.Primary // Left Click
+              }
+            ]
+          })
+        })
+        this.activeTool = obj.markTool
+      } else {
+        if (this.activeTool === obj.markTool) {
           toolGroupIds.forEach((toolGroupId) => {
             const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
 
@@ -2014,6 +2031,7 @@ export default {
           })
           this.activeTool = ''
         }
+      }
       this.isNonTargetMeasurement = false
     },
     getTargetIdImage(