hellfire 0.25.13 → 0.25.15

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.25.15](http://10.16.100.57/diffusion/115/paladin/compare/v0.25.14...v0.25.15) (2023-04-23)
+
+
+
+## [0.25.14](http://10.16.100.57/diffusion/115/paladin/compare/v0.25.13...v0.25.14) (2023-04-20)
+
+
+
 ## [0.25.13](http://10.16.100.57/diffusion/115/paladin/compare/v0.25.12...v0.25.13) (2023-04-03)
 
 

package/README.md

@@ -144,6 +144,13 @@ toolSortChange: ()=> void
 
 传入工具栏自定义排序的回调函数（用于早期的单列工具栏）
 
+<b>`disableUpDownKeyAction`</b>
+```
+disableUpDownKeyAction: boolean
+```
+
+上下热键事件是否禁用
+
 ### DicomView提供给父组件调用的方法:
 
 <b>`addStudy(data)`</b>

package/dist/index.js

@@ -32530,10 +32530,20 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
     _this = _super.call(this, props, defaultProps);
     _this.aiResult = get$1('aiResult');
     _this.color = '#faa80a';
+    _this.simpleMode = false;
     return _this;
   }
 
   createClass(AIAnalysisOverlayTool, [{
+    key: "enabledCallback",
+    value: function enabledCallback(element) {
+      var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+          simpleMode = _ref.simpleMode;
+
+      this.simpleMode = simpleMode;
+      this.aiResult = get$1('aiResult');
+    }
+  }, {
     key: "addMeasurement",
     value: function addMeasurement(data, element, imagePlane, index) {
       var measurementData = this.createNewMeasurement(data, imagePlane, index);
@@ -32588,18 +32598,20 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
 
       var columns = imagePlane.columns,
           rows = imagePlane.rows;
-      var text = getAIText(data);
+      var text = this.simpleMode ? getSimpleAIText(data) : getAIText(data);
       var textBoxX = coords.x;
       var textBoxY = coords.y;
 
-      if (index === 0) {
-        textBoxX = 20;
-        textBoxY = columns - 50;
-      }
+      if (!this.simpleMode) {
+        if (index === 0) {
+          textBoxX = 20;
+          textBoxY = columns - 50;
+        }
 
-      if (index === 1) {
-        textBoxX = rows - 20;
-        textBoxY = columns - 50;
+        if (index === 1) {
+          textBoxX = rows - 20;
+          textBoxY = columns - 50;
+        }
       }
 
       return {
@@ -32633,10 +32645,10 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
     }
   }, {
     key: "drawAI",
-    value: function drawAI(_ref) {
-      var context = _ref.context,
-          element = _ref.element,
-          handles = _ref.handles;
+    value: function drawAI(_ref2) {
+      var context = _ref2.context,
+          element = _ref2.element,
+          handles = _ref2.handles;
       var p1 = handles.start,
           p2 = handles.end,
           p3 = handles.start2,
@@ -32682,7 +32694,7 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
               case 4:
                 toolData = cornerstoneTools.getToolState(evt.currentTarget, this.name);
 
-                if (toolData) {
+                if (!(!toolData || toolData.data.length === 0)) {
                   _context.next = 20;
                   break;
                 }
@@ -32806,7 +32818,7 @@ function getAIText(data) {
     }
 
     if (longAxisDiameter_mm && shortAxisDiameter_mm) {
-      text.push("\u5927\u5C0F: ".concat(lodash$1.round(longAxisDiameter_mm, 1), "mm \xD7 ").concat(lodash$1.round(shortAxisDiameter_mm, 1), "mm"));
+      text.push("\u5927\u5C0F: ".concat(lodash$1.round(longAxisDiameter_mm / 10, 1), "cm \xD7 ").concat(lodash$1.round(shortAxisDiameter_mm / 10, 1), "cm"));
     }
 
     if (characteristic && lodash$1.has(characteristic, ['isCalcification'])) {
@@ -32817,6 +32829,11 @@ function getAIText(data) {
   return text;
 }
 
+function getSimpleAIText(data) {
+  var title = "#".concat(data.index);
+  return [title];
+}
+
 function textBoxAnchorPoints(handles) {
   var midpoint = {
     x: (handles.start.x + handles.end.x) / 2,
@@ -32892,6 +32909,7 @@ var textureDic = function textureDic(value) {
   reactHotLoader.register(external$t, "external", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AIAnalysisOverlayTool.js");
   reactHotLoader.register(AIAnalysisOverlayTool, "AIAnalysisOverlayTool", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AIAnalysisOverlayTool.js");
   reactHotLoader.register(getAIText, "getAIText", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AIAnalysisOverlayTool.js");
+  reactHotLoader.register(getSimpleAIText, "getSimpleAIText", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AIAnalysisOverlayTool.js");
   reactHotLoader.register(textBoxAnchorPoints, "textBoxAnchorPoints", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AIAnalysisOverlayTool.js");
   reactHotLoader.register(riskTypeDic, "riskTypeDic", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AIAnalysisOverlayTool.js");
   reactHotLoader.register(inspectionTypeDic, "inspectionTypeDic", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AIAnalysisOverlayTool.js");
@@ -54488,9 +54506,13 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
           var aiResult = get$1('aiResult');
 
           if (aiResult) {
+            _default$E.setToolEnabledForElement(_this.element, 'AIAnalysisOverlay', {
+              simpleMode: _this.props.showSimpleAIResult
+            });
             _default$E.setToolActiveForElement(_this.element, 'AIAnalysisOverlay', {
               mouseButtonMask: 1,
-              isTouchActive: true
+              isTouchActive: true,
+              simpleMode: _this.props.showSimpleAIResult
             });
           }
         } // 只在手术路径规划中触发的
@@ -54667,6 +54689,33 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
       });
     });
 
+    defineProperty(assertThisInitialized(_this), "resetAIToolState", function () {
+      // 先清除所有ai tool state数据
+      var imageIds = _this.state.stack.imageIds;
+
+      for (var i = 0; i < imageIds.length; i++) {
+        var aiToolState = _default$E.globalImageIdSpecificToolStateManager.getImageIdToolState(imageIds[i], 'AIAnalysisOverlay');
+
+        if (aiToolState && aiToolState.data && aiToolState.data.length > 0) {
+          _default$E.globalImageIdSpecificToolStateManager.setImageIdToolState(imageIds[i], 'AIAnalysisOverlay', {
+            data: []
+          });
+        }
+      }
+
+      var config = {
+        mouseButtonMask: 1,
+        isTouchActive: true
+      };
+      _default$E.setToolDisabledForElement(_this.element, 'AIAnalysisOverlay', config);
+      _default$E.setToolEnabledForElement(_this.element, 'AIAnalysisOverlay', {
+        simpleMode: _this.props.showSimpleAIResult
+      });
+      _default$E.setToolActiveForElement(_this.element, 'AIAnalysisOverlay', config);
+      var enableElement = cornerstone.getEnabledElement(_this.element);
+      cornerstone.updateImage(enableElement.element, true);
+    });
+
     _this.mouseDownViewport = null; // 记录鼠标操作前的viewport，为了相对同步
     // 拷贝一份 使得作用域内stack的修改不污染外部的series
 
@@ -55321,16 +55370,18 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
           var aiResult = get$1('aiResult');
 
           if (aiResult) {
+            var config = {
+              mouseButtonMask: 1,
+              isTouchActive: true
+            };
+
             if (this.props.showAIResult) {
-              _default$E.setToolActiveForElement(this.element, 'AIAnalysisOverlay', {
-                mouseButtonMask: 1,
-                isTouchActive: true
+              _default$E.setToolEnabledForElement(this.element, 'AIAnalysisOverlay', {
+                simpleMode: this.props.showSimpleAIResult
               });
+              _default$E.setToolActiveForElement(this.element, 'AIAnalysisOverlay', config);
             } else {
-              _default$E.setToolDisabledForElement(this.element, 'AIAnalysisOverlay', {
-                mouseButtonMask: 1,
-                isTouchActive: true
-              });
+              _default$E.setToolDisabledForElement(this.element, 'AIAnalysisOverlay', config);
             }
 
             var enableElement = cornerstone.getEnabledElement(this.element);
@@ -55340,6 +55391,23 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
 
           break;
 
+        case prevProps.showSimpleAIResult !== this.props.showSimpleAIResult:
+          var _aiResult = get$1('aiResult');
+
+          if (_aiResult) {
+            this.resetAIToolState();
+          }
+
+          break;
+
+        case JSON.stringify(prevProps.aiResult) !== JSON.stringify(this.props.aiResult):
+          // 滚动条的ai标记更新
+          this.checkAITipInCustomScroll({
+            stack: this.state.stack
+          });
+          this.resetAIToolState();
+          break;
+
         case prevProps.ReferencePosition !== this.props.ReferencePosition:
           this.initReferencePosition();
 
@@ -56064,8 +56132,10 @@ var DicomLayout = /*#__PURE__*/function (_Component) {
             onCustomScroll: _this2.onCustomScroll,
             onDrop: _this2.props.onDrop,
             showAIResult: _this2.props.showAIResult,
+            showSimpleAIResult: _this2.props.showSimpleAIResult,
             onResizeEmit: _this2.props.onResizeEmit,
-            onClickDomErrorReRenderButton: _this2.props.onClickDomErrorReRenderButton
+            onClickDomErrorReRenderButton: _this2.props.onClickDomErrorReRenderButton,
+            aiResult: _this2.props.aiResult
           });
         }));
       })), showVerticalScroll && /*#__PURE__*/React__default.createElement("div", {
@@ -59583,7 +59653,7 @@ var DicomView = /*#__PURE__*/function (_Component) {
       }
 
       if (JSON.stringify(nextProps.aiResult) !== JSON.stringify(this.props.aiResult)) {
-        if (nextProps.aiResult && nextProps.aiResult.inspectionDetails && nextProps.aiResult.inspectionDetails.length > 0) {
+        if (nextProps.aiResult && nextProps.aiResult.inspectionDetails) {
           console.log('添加联动 -> ai 变化');
           set$1('aiResult', nextProps.aiResult.inspectionDetails);
         }
@@ -59956,6 +60026,8 @@ var DicomView = /*#__PURE__*/function (_Component) {
       var DicomLayout = /*#__PURE__*/React__default.createElement(DicomLayoutContainerWrap, null, viewMode === '2D' && this.props.mode === 'seriesMode' && /*#__PURE__*/React__default.createElement(_default$18, {
         series: this.props.series,
         showAIResult: this.props.showAIResult,
+        showSimpleAIResult: this.props.showSimpleAIResult,
+        aiResult: this.props.aiResult,
         onResizeEmit: this.props.onResizeEmit
       }), viewMode === '2D' && this.props.mode === 'imageMode' && /*#__PURE__*/React__default.createElement(_default$19, {
         onResizeEmit: this.props.onResizeEmit
@@ -60254,6 +60326,11 @@ var mergeProps$p = function mergeProps(propsFromState, propsFromDispatch, ownPro
         }
       },
       IMAGE_MODE_UP: function IMAGE_MODE_UP() {
+        if (ownProps.disableUpDownKeyAction) {
+          // disableUpDownKeyAction 禁用上下键
+          return;
+        }
+
         if (threeDMode) {
           return;
         }
@@ -60278,6 +60355,11 @@ var mergeProps$p = function mergeProps(propsFromState, propsFromDispatch, ownPro
         }
       },
       IMAGE_MODE_DOWN: function IMAGE_MODE_DOWN() {
+        if (ownProps.disableUpDownKeyAction) {
+          // disableUpDownKeyAction 禁用上下键
+          return;
+        }
+
         if (threeDMode) {
           return;
         }