hellfire 0.25.1 → 0.25.3

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.3](http://10.16.100.57/diffusion/115/paladin/compare/v0.25.2...v0.25.3) (2023-01-16)
+
+
+
+## [0.25.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.25.1...v0.25.2) (2023-01-13)
+
+
+
 ## [0.25.1](http://10.16.100.57/diffusion/115/paladin/compare/v0.25.0...v0.25.1) (2023-01-13)
 
 

package/README.md

@@ -1,9 +1,9 @@
-### Paladin (hellfire)
----
+## Paladin (hellfire)
+
 
 云图本地渲染引擎
 
-### Usage
+## Usage
 
 Example:
 
@@ -21,9 +21,9 @@ const Example = ()=> (
 )
 ```
 
-### API documentation
+## API documentation
 
-> 1.DicomView允许传入的参数
+### DicomView允许传入的参数:
 
 <b>`study`</b>
 
@@ -144,7 +144,7 @@ toolSortChange: ()=> void
 
 传入工具栏自定义排序的回调函数（用于早期的单列工具栏）
 
-> 2.DicomView提供给父组件调用的方法
+### DicomView提供给父组件调用的方法:
 
 <b>`addStudy(data)`</b>
 
@@ -162,7 +162,7 @@ toolSortChange: ()=> void
 
 模拟触发paladin内的各种操作行为（提供给同屏使用）
 
-> 3.paladin对外暴露的对象
+### paladin对外暴露的对象:
 
 用法：
 ```

package/dist/index.js

@@ -32528,14 +32528,14 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
     };
     _this = _super.call(this, props, defaultProps);
     _this.aiResult = get$1('aiResult');
-    _this.color = '#ffff00';
+    _this.color = '#faa80a';
     return _this;
   }
 
   createClass(AIAnalysisOverlayTool, [{
     key: "addMeasurement",
-    value: function addMeasurement(data, element) {
-      var measurementData = this.createNewMeasurement(data);
+    value: function addMeasurement(data, element, imagePlane, index) {
+      var measurementData = this.createNewMeasurement(data, imagePlane, index);
       addToolState$5(element, this.name, measurementData);
       external$t.cornerstone.updateImage(element);
     }
@@ -32552,7 +32552,7 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
     }
   }, {
     key: "createNewMeasurement",
-    value: function createNewMeasurement(data) {
+    value: function createNewMeasurement(data, imagePlane, index) {
       var edgePoints = data.edgePoints;
 
       if (!edgePoints) {
@@ -32585,7 +32585,22 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
         coords.y = end.y;
       }
 
+      var columns = imagePlane.columns,
+          rows = imagePlane.rows;
       var text = getAIText(data);
+      var textBoxX = coords.x;
+      var textBoxY = coords.y;
+
+      if (index === 0) {
+        textBoxX = 20;
+        textBoxY = columns - 50;
+      }
+
+      if (index === 1) {
+        textBoxX = rows - 20;
+        textBoxY = columns - 50;
+      }
+
       return {
         visible: true,
         active: false,
@@ -32597,11 +32612,11 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
           start2: start2,
           end2: end2,
           textBox: {
-            x: coords.x,
-            y: coords.y,
+            x: textBoxX,
+            y: textBoxY,
             text: text,
             active: false,
-            hasMoved: false,
+            hasMoved: true,
             movesIndependently: false,
             drawnIndependently: true,
             allowedOutsideImage: true,
@@ -32648,7 +32663,7 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
       var _renderToolData = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(evt) {
         var _this2 = this;
 
-        var eventData, element, toolData, stack, seriesInstanceUID, dicom, instanceNumber, aiData, drawData, context, lineWidth, i, data, xOffset;
+        var eventData, element, toolData, stack, imagePlane, seriesInstanceUID, dicom, instanceNumber, aiData, drawData, context, lineWidth, i, data, xOffset;
         return regenerator.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -32667,7 +32682,7 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
                 toolData = cornerstoneTools.getToolState(evt.currentTarget, this.name);
 
                 if (toolData) {
-                  _context.next = 19;
+                  _context.next = 20;
                   break;
                 }
 
@@ -32682,11 +32697,12 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
                 return _context.abrupt("return");
 
               case 9:
+                imagePlane = external$t.cornerstone.metaData.get('imagePlaneModule', eventData.image.imageId);
                 seriesInstanceUID = stack.data[0].seriesInstanceUID;
-                _context.next = 12;
+                _context.next = 13;
                 return loadAndCacheDicom(eventData.image.imageId);
 
-              case 12:
+              case 13:
                 dicom = _context.sent;
                 instanceNumber = lodash$1.toNumber(dicom.InstanceNumber.value);
                 aiData = [];
@@ -32712,16 +32728,16 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
                   });
 
                   if (drawData && drawData.length > 0) {
-                    lodash$1.forEach(drawData, function (data) {
-                      _this2.addMeasurement(data, element);
+                    lodash$1.forEach(drawData, function (data, i) {
+                      _this2.addMeasurement(data, element, imagePlane, i);
                     });
                   }
                 }
 
-                _context.next = 22;
+                _context.next = 23;
                 break;
 
-              case 19:
+              case 20:
                 // 绘制
                 context = getNewContext$g(eventData.canvasContext.canvas);
                 lineWidth = cornerstoneTools.toolStyle.getToolWidth();
@@ -32737,7 +32753,7 @@ var AIAnalysisOverlayTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
                   drawLinkedTextBox$8(context, element, data.handles.textBox, data.handles.textBox.text, data.handles, textBoxAnchorPoints, this.color, lineWidth, xOffset, true);
                 }
 
-              case 22:
+              case 23:
               case "end":
                 return _context.stop();
             }
@@ -51935,8 +51951,12 @@ var DicomThumbnailLayout = /*#__PURE__*/function (_Component) {
 
     defineProperty(assertThisInitialized(_this), "handleRefresh", function () {
       paladinRefreshEvent();
-      _this.props.onRefresh && _this.props.onRefresh();
-      window.location.reload();
+
+      if (_this.props.onRefresh) {
+        _this.props.onRefresh();
+      } else {
+        window.location.reload();
+      }
     });
 
     defineProperty(assertThisInitialized(_this), "handleThumbSelect", function (i) {