hellfire 0.25.0 → 0.25.2

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.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)
+
+
+
 # [0.25.0](http://10.16.100.57/diffusion/115/paladin/compare/v0.24.1...v0.25.0) (2022-09-29)
 
 

package/README.md

@@ -1,28 +1,32 @@
-### Paladin
+### Paladin (hellfire)
 ---
 
-承泽本地渲染引擎
+云图本地渲染引擎
 
 ### Usage
 
 Example:
 
 ```
-import DicomView from 'paladin';
+import DicomView from 'hellfire';
 const Example = ()=> (
     <DicomView
+        ref='dicomViewLocal'
         study={study}
+        token={token}
         options={options}
         toolSortChange={this.toolSortChange}
+        ...
     />
 )
 ```
 
 ### API documentation
 
-Paladin允许传入参数为 `study`, `options`, `toolSortChange`
+> 1.DicomView允许传入的参数
 
 <b>`study`</b>
+
 ```
 [
     {
@@ -38,9 +42,11 @@ Paladin允许传入参数为 `study`, `options`, `toolSortChange`
     }
 ]
 ```
+
 需要按此格式传入的检查相关数据集
 
 <b>`options`</b>
+
 ```
 {
     layout: {
@@ -51,15 +57,129 @@ Paladin允许传入参数为 `study`, `options`, `toolSortChange`
     toolbarSize: 20
 }
 ```
-传入配置项，控制布局和工具栏等
+
+传入配置项，控制布局和工具栏等（用于早期的单列工具栏）
 
 - <b>layout</b> ：传入初始化布局，不传则默认2*2
 - <b>tools</b> ：传入初始化工具栏顺序
 - <b>toolbarSize</b> ：传入初始化工具栏图标大小
 
+<b>`helpLink`</b>
+
+```
+helpLink = {'http://www.baidu.com'}
+```
+
+工具栏"使用帮助"跳转的链接
+
+<b>`aiResult`</b>
+
+```
+aiResult = {}
+```
+
+ai结果在影像上打的标记
+
+<b>`showAIResult`</b>
+
+```
+showAIResult: boolean
+```
+
+是否在影像上显示ai结果标记
+
+<b>`windowSetting`</b>
+
+```
+windowSetting = {}
+```
+
+初始化窗值的配置
+
+<b>`onLoadReady`</b>
+
+```
+onLoadReady: ()=> void
+```
+
+所有序列图像加载完毕触发
+
+<b>`changeWindowSet`</b>
+
+```
+changeWindowSet: (key, body, index)=> void
+```
+
+触发自定义窗值 key有：add update delete
+
+<b>`operateServerToolState`</b>
+
+```
+operateServerToolState: (key, data) => void
+```
+
+触发测量工具保存 key有：save delete clear
+
+<b>`operateCentesisPath`</b>
+
+```
+operateCentesisPath: (key, data) => void
+```
+
+触发手术路径规划数据的保存 key有：save
+
+<b>`onRefresh`</b>
+
+```
+onRefresh: () => void
+```
+
+界面下方的重新加载触发的方法（在reload之前）
+
 <b>`toolSortChange`</b>
+
 ```
 toolSortChange: ()=> void
 ```
-传入工具栏自定义排序的回调函数
+
+传入工具栏自定义排序的回调函数（用于早期的单列工具栏）
+
+> 2.DicomView提供给父组件调用的方法
+
+<b>`addStudy(data)`</b>
+
+添加序列，data格式参考study
+
+<b>`scrollSeriesImageToIndex(SeriesInstanceUID, SOPInstanceUID)`</b>
+
+指定某个序列跳转到某个图像上
+
+<b>`emitImageResize()`</b>
+
+视窗大小的改变
+
+<b>`cornerstoneActionEmit({type:xxx,data:xxx})`</b>
+
+模拟触发paladin内的各种操作行为（提供给同屏使用）
+
+> 3.paladin对外暴露的对象
+
+用法：
+```
+import { reducers as hellfireReducer, paladinUtils} from 'hellfire'
+```
+
+<b>`reducers`</b>
+
+暴露给外部hellfire的redux数据
+
+<b>`paladinUtils`</b>
+
+- getMultiImageDataFromWodo：将wodo url生成base64的image数据
+  ```
+  paladinUtils.getMultiImageDataFromWodo({
+    wodoList
+  })
+  ```
+
 

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,6 +51951,7 @@ var DicomThumbnailLayout = /*#__PURE__*/function (_Component) {
 
     defineProperty(assertThisInitialized(_this), "handleRefresh", function () {
       paladinRefreshEvent();
+      _this.props.onRefresh && _this.props.onRefresh();
       window.location.reload();
     });
 
@@ -52587,7 +52604,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
       var patientAge = dicom.PatientAge.toString();
       var patientID = dicom.PatientID.toString();
       var bodyPartExamined = dicom.BodyPartExamined.toString();
-      var laterality = dicom.Laterality.toString() || ''; //左下
+      var laterality = dicom.Laterality.toString() || dicom.ImageLaterality.toString() || ''; //左下
 
       var patientOrientation = dicom.PatientOrientation.toString();
       var protocolName = dicom.ProtocolName.toString();
@@ -59844,7 +59861,8 @@ var DicomView = /*#__PURE__*/function (_Component) {
       var isMobile = _default$3.isDeviceTypeMobile();
       var _this$props5 = this.props,
           viewMode = _this$props5.viewMode,
-          toolMode = _this$props5.toolMode;
+          toolMode = _this$props5.toolMode,
+          onRefresh = _this$props5.onRefresh;
       var dcStyle = {
         display: 'flex',
         position: 'absolute',
@@ -59880,7 +59898,8 @@ var DicomView = /*#__PURE__*/function (_Component) {
         className: "paladin-dicomView-dicomThumbnailWrapper"
       }, /*#__PURE__*/React__default.createElement(_default$14, {
         isMobile: isMobile,
-        study: this.state.study
+        study: this.state.study,
+        onRefresh: onRefresh
       }));
       var mobile = /*#__PURE__*/React__default.createElement("div", {
         style: dcStyle
@@ -59975,6 +59994,7 @@ var __signature__$3A = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoa
   return a;
 };
 var scroll = _default$E.importInternal('util/scroll');
+var throttle$9 = _default$E.importInternal('util/throttle');
 
 var mapStateToProps$q = function mapStateToProps(state) {
   var _state$paladin$viewpo = state.paladin.viewport,
@@ -60084,6 +60104,39 @@ var mergeProps$p = function mergeProps(propsFromState, propsFromDispatch, ownPro
   var getCurrentElement = function getCurrentElement() {
     return getActiveElement(mode, activeIndex, imageActiveIndex, threeDMode, mprActiveIndex, Surgery, surgeryActiveIndex, CPR);
   };
+  /**
+   * 前进、后退快捷键，加入频率控制
+   * 频率依据序列数量决定
+   * 目前按照一个序列10s播完的标准来计算
+   */
+
+
+  var forwardFunc = function forwardFunc() {
+    var activeElement = getCurrentElement();
+    if (!activeElement) return;
+
+    if (threeDMode) {
+      changeMprPositionWithElement(activeElement, -1, threeScrollType);
+    } else {
+      scroll(activeElement, -1, true, true);
+    }
+  };
+
+  var backFunc = function backFunc() {
+    var activeElement = getCurrentElement();
+    if (!activeElement) return;
+
+    if (threeDMode) {
+      changeMprPositionWithElement(activeElement, 1, threeScrollType);
+    } else {
+      scroll(activeElement, 1, true, true);
+    }
+  };
+
+  var totalCount = propsFromState.currentSeries && propsFromState.currentSeries.imageIds.length || 0;
+  var stepTime = lodash$1.floor(10 * 1000 / totalCount);
+  var throttleForwardFunc = throttle$9(forwardFunc, stepTime);
+  var throttleBackFunc = throttle$9(backFunc, stepTime);
   /**
    *
    * Key values:
@@ -60092,7 +60145,6 @@ var mergeProps$p = function mergeProps(propsFromState, propsFromDispatch, ownPro
    *
    */
 
-
   return _objectSpread$N(_objectSpread$N(_objectSpread$N({}, ownProps), propsFromState), {}, {
     showDicomThumbnail: showDicomThumbnail,
     viewMode: viewMode,
@@ -60205,24 +60257,10 @@ var mergeProps$p = function mergeProps(propsFromState, propsFromDispatch, ownPro
         }
       },
       FORWARD: function FORWARD() {
-        var activeElement = getCurrentElement();
-        if (!activeElement) return;
-
-        if (threeDMode) {
-          changeMprPositionWithElement(activeElement, -1, threeScrollType);
-        } else {
-          scroll(activeElement, -1, true, true);
-        }
+        throttleForwardFunc();
       },
       BACKWARD: function BACKWARD() {
-        var activeElement = getCurrentElement();
-        if (!activeElement) return;
-
-        if (threeDMode) {
-          changeMprPositionWithElement(activeElement, 1, threeScrollType);
-        } else {
-          scroll(activeElement, 1, true, true);
-        }
+        throttleBackFunc();
       },
       SCALE_ADD: function SCALE_ADD() {
         setScaleRelative(getCurrentElement(), 1.1);
@@ -60699,6 +60737,7 @@ var _default$1g = ConnectedDicomView;
   }
 
   reactHotLoader.register(scroll, "scroll", "/Users/huyeqing/workspace/chainz/paladin/src/Viewer/DicomView/ConnectedDicomView.js");
+  reactHotLoader.register(throttle$9, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/Viewer/DicomView/ConnectedDicomView.js");
   reactHotLoader.register(mapStateToProps$q, "mapStateToProps", "/Users/huyeqing/workspace/chainz/paladin/src/Viewer/DicomView/ConnectedDicomView.js");
   reactHotLoader.register(mergeProps$p, "mergeProps", "/Users/huyeqing/workspace/chainz/paladin/src/Viewer/DicomView/ConnectedDicomView.js");
   reactHotLoader.register(ConnectedDicomView, "ConnectedDicomView", "/Users/huyeqing/workspace/chainz/paladin/src/Viewer/DicomView/ConnectedDicomView.js");