hellfire 0.20.2 → 0.20.5

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 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.20.5](http://10.16.100.57/diffusion/115/paladin/compare/v0.20.4...v0.20.5) (2022-05-20)
+
+
+
+## [0.20.4](http://10.16.100.57/diffusion/115/paladin/compare/v0.20.3...v0.20.4) (2022-05-19)
+
+
+
+## [0.20.3](http://10.16.100.57/diffusion/115/paladin/compare/v0.20.2...v0.20.3) (2022-05-18)
+
+
+
 ## [0.20.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.20.1...v0.20.2) (2022-05-18)
 
 

package/dist/index.js

@@ -27203,11 +27203,13 @@ var getPixelSpacing$7 = cornerstoneTools.importInternal('util/getPixelSpacing');
 var getROITextBoxCoords$2 = cornerstoneTools.importInternal('util/getROITextBoxCoords');
 var numbersWithCommas$2 = cornerstoneTools.importInternal('util/numbersWithCommas');
 var lineSegDistance$5 = cornerstoneTools.importInternal('util/lineSegDistance');
+var triggerEvent$3 = cornerstoneTools.importInternal('util/triggerEvent');
 var logger$8 = getLogger$3('tools:annotation:PolygonTool');
 var external$k = cornerstoneTools.external,
     addToolState$4 = cornerstoneTools.addToolState,
     toolColors$b = cornerstoneTools.toolColors,
-    toolStyle$6 = cornerstoneTools.toolStyle;
+    toolStyle$6 = cornerstoneTools.toolStyle,
+    EVENTS$4 = cornerstoneTools.EVENTS;
 /**
  * 多边形绘制工具
  */
@@ -27260,10 +27262,48 @@ var PolygonTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
 
     _this.finishOnce = true;
     _this.throttledUpdateCachedStats = throttle$7(_this.updateCachedStats, 110);
+    _this.elementCache = null;
     document.addEventListener('keyup', function (e) {
       if (e.keyCode === 27) {
         _this.finishOnce = true;
         _this.currentWadoUri = null;
+
+        if (_this.elementCache) {
+          var toolData = cornerstoneTools.getToolState(_this.elementCache, _this.name);
+
+          if (toolData && toolData.data && toolData.data.length > 0) {
+            for (var i = 0; i < toolData.data.length; i++) {
+              toolData.data[i].active = false;
+            }
+          }
+
+          var isToolLocked = lodash$1.get(cornerstoneTools, ['store', 'state', 'isToolLocked']); // 会锁住 需要手动解锁state
+
+
+          if (isToolLocked) {
+            var enable = external$k.cornerstone.getEnabledElement(_this.elementCache); // 情况：添加一个点后没有move，这时候就不会走moveHandler，下面mouseup模拟的endHandler也不会生效，所以需要先模拟move
+
+            triggerEvent$3(_this.elementCache, EVENTS$4.MOUSE_MOVE, {
+              element: _this.elementCache,
+              currentPoints: {
+                page: cornerstoneMath.point.pageToPoint(e)
+              },
+              image: enable.image,
+              buttons: getEventButtons(e)
+            });
+            triggerEvent$3(_this.elementCache, EVENTS$4.MOUSE_UP, {
+              element: _this.elementCache,
+              currentPoints: {
+                page: cornerstoneMath.point.pageToPoint(e)
+              },
+              image: enable.image,
+              buttons: getEventButtons(e)
+            });
+          }
+
+          external$k.cornerstone.updateImage(_this.elementCache);
+          _this.elementCache = null;
+        }
       }
     });
     return _this;
@@ -27418,6 +27458,7 @@ var PolygonTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
 
       if (!this.finishOnce) {
         var width = element.clientWidth;
+        this.elementCache = eventData.element;
         _default$h(context, '按ESC键结束多边形绘制', width / 2 - 100, 0, '#d06479', {
           fontSize: 17
         });
@@ -27701,14 +27742,19 @@ function _createTextBoxContent$2(context, isColorImage) {
       min = _ref.min,
       max = _ref.max,
       meanStdDevSUV = _ref.meanStdDevSUV;
+
+  var modality = arguments.length > 3 ? arguments[3] : undefined;
   var hasPixelSpacing = arguments.length > 4 ? arguments[4] : undefined;
+  var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
   var textLines = [];
   textLines.push(formatArea(area, hasPixelSpacing));
 
   if (!isColorImage) {
-    var meanString = "Mean: ".concat(numbersWithCommas$2(mean.toFixed(1)));
-    var stdDevString = "StdDev: ".concat(numbersWithCommas$2(stdDev.toFixed(1)));
-    textLines.push("Min/Max: ".concat(min, " / ").concat(max));
+    var unit = _getUnit$2(modality, options.showHounsfieldUnits);
+
+    var meanString = "Mean: ".concat(numbersWithCommas$2(mean.toFixed(1)), " ").concat(unit);
+    var stdDevString = "StdDev: ".concat(numbersWithCommas$2(stdDev.toFixed(1)), " ").concat(unit);
+    textLines.push("Min/Max: ".concat(min.toFixed(1), " ").concat(unit, " / ").concat(max.toFixed(1), " ").concat(unit));
     textLines.push("".concat(meanString));
     textLines.push("".concat(stdDevString));
   }
@@ -27740,6 +27786,32 @@ function isInPolygon(point, points) {
   return nCross % 2 === 1;
 }
 
+function getEventButtons(event) {
+  if (typeof event.buttons === 'number') {
+    return event.buttons;
+  }
+
+  switch (event.which) {
+    case 0:
+      return 0;
+
+    case 1:
+      return 1;
+
+    case 2:
+      return 4;
+
+    case 3:
+      return 2;
+  }
+
+  return 0;
+}
+
+function _getUnit$2(modality, showHounsfieldUnits) {
+  return modality === 'CT' && showHounsfieldUnits !== false ? 'HU' : '';
+}
+
 (function () {
   var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
 
@@ -27758,11 +27830,13 @@ function isInPolygon(point, points) {
   reactHotLoader.register(getROITextBoxCoords$2, "getROITextBoxCoords", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(numbersWithCommas$2, "numbersWithCommas", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(lineSegDistance$5, "lineSegDistance", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
+  reactHotLoader.register(triggerEvent$3, "triggerEvent", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(logger$8, "logger", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(external$k, "external", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(addToolState$4, "addToolState", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(toolColors$b, "toolColors", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(toolStyle$6, "toolStyle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
+  reactHotLoader.register(EVENTS$4, "EVENTS", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(PolygonTool, "PolygonTool", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(calculatePolygonStatistics, "calculatePolygonStatistics", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(_getPolygonImageCoordinates, "_getPolygonImageCoordinates", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
@@ -27770,6 +27844,8 @@ function isInPolygon(point, points) {
   reactHotLoader.register(_createTextBoxContent$2, "_createTextBoxContent", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(formatArea, "formatArea", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
   reactHotLoader.register(isInPolygon, "isInPolygon", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
+  reactHotLoader.register(getEventButtons, "getEventButtons", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
+  reactHotLoader.register(_getUnit$2, "_getUnit", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/PolygonTool.js");
 })();
 
 (function () {
@@ -35913,11 +35989,11 @@ var LengthTool$1 = /*#__PURE__*/function (_Component) {
         icon: /*#__PURE__*/React__default.createElement(SvgSave, null),
         value: 'save',
         hidden: !operateServerToolState || IO
-      }]; // 移动端不显示"连续测量"
+      }]; // 移动端不显示 "连续测量" "多边形"
 
       if (isMobile) {
         toolChildren = lodash$1.filter(toolChildren, function (item) {
-          return item.key !== 'continuousMeasure';
+          return item.key !== 'continuousMeasure' && item.value !== 'Polygon';
         });
       }
 
@@ -49042,7 +49118,7 @@ function _arrayLikeToArray$b(arr, len) { if (len == null || len > arr.length) le
 var __signature__$31 = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
-var triggerEvent$3 = _default$E.importInternal('util/triggerEvent');
+var triggerEvent$4 = _default$E.importInternal('util/triggerEvent');
 /**
  *
  * 每次click 都会检查, 目前比较损耗性能.
@@ -49075,13 +49151,13 @@ function checkAndUnLockToolState(evt, checkIsSelf) {
               continue;
             }
 
-            triggerEvent$3(enabledElement.element, _default$E.EVENTS.MOUSE_UP, {
+            triggerEvent$4(enabledElement.element, _default$E.EVENTS.MOUSE_UP, {
               element: enabledElement.element,
               currentPoints: {
                 page: cornerstoneMath.point.pageToPoint(evt)
               },
               image: enabledElement.image,
-              buttons: getEventButtons(evt)
+              buttons: getEventButtons$1(evt)
             });
             cornerstone.updateImage(enabledElement.element);
             console.log('---------异常数据, 处理完毕---------');
@@ -49157,7 +49233,7 @@ function getActiveToolStateElement() {
   }
 }
 
-function getEventButtons(event) {
+function getEventButtons$1(event) {
   if (typeof event.buttons === 'number') {
     return event.buttons;
   }
@@ -49190,10 +49266,10 @@ function getEventButtons(event) {
     return;
   }
 
-  reactHotLoader.register(triggerEvent$3, "triggerEvent", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/unlockToolState.js");
+  reactHotLoader.register(triggerEvent$4, "triggerEvent", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/unlockToolState.js");
   reactHotLoader.register(checkAndUnLockToolState, "checkAndUnLockToolState", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/unlockToolState.js");
   reactHotLoader.register(getActiveToolStateElement, "getActiveToolStateElement", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/unlockToolState.js");
-  reactHotLoader.register(getEventButtons, "getEventButtons", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/unlockToolState.js");
+  reactHotLoader.register(getEventButtons$1, "getEventButtons", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/unlockToolState.js");
 })();
 
 (function () {
@@ -54649,7 +54725,10 @@ var mapStateToProps$l = function mapStateToProps(state) {
       MPR = _state$paladin$tools$2.MPR,
       VR = _state$paladin$tools$2.VR,
       Surgery = _state$paladin$tools$2.Surgery,
-      Cine = _state$paladin$tools$2.Cine;
+      Cine = _state$paladin$tools$2.Cine,
+      activeTool = _state$paladin$tools$2.activeTool,
+      continuousMeasure = _state$paladin$tools$2.continuousMeasure,
+      originActiveTool = _state$paladin$tools$2.originActiveTool;
   var toolMode = state.paladin.tools.customization.toolMode;
   return {
     activeIndex: activeIndex,
@@ -54674,7 +54753,10 @@ var mapStateToProps$l = function mapStateToProps(state) {
     synchronizer: synchronizer,
     linkSynchronizer: linkSynchronizer,
     linkImageModeSynchronizer: linkImageModeSynchronizer,
-    linkScrollSynchronizer: linkScrollSynchronizer
+    linkScrollSynchronizer: linkScrollSynchronizer,
+    activeTool: activeTool,
+    continuousMeasure: continuousMeasure,
+    originActiveTool: originActiveTool
   };
 };
 
@@ -54748,7 +54830,8 @@ var mergeProps$k = function mergeProps(propsFromState, propsFromDispatch, ownPro
       WWWC7: ['key-7'],
       WWWC8: ['key-8'],
       WWWC9: ['key-9'],
-      PAUSE: "space"
+      PAUSE: "space",
+      ESC: "esc"
     },
     handlers: {
       PAUSE: function PAUSE() {
@@ -54896,6 +54979,15 @@ var mergeProps$k = function mergeProps(propsFromState, propsFromDispatch, ownPro
           backToEnd: true
         });
       },
+      ESC: function ESC() {
+        var activeTool = propsFromState.activeTool,
+            continuousMeasure = propsFromState.continuousMeasure,
+            originActiveTool = propsFromState.originActiveTool;
+
+        if (!continuousMeasure && activeTool && activeTool === 'Polygon') {
+          propsFromDispatch.setActiveTool(originActiveTool);
+        }
+      },
       WWWC1: function WWWC1() {
         if (!wwwcCustomDic[0]) return;
         setWwwc(getCurrentElement(), wwwcCustomDic[0].ww, wwwcCustomDic[0].wc);
@@ -55142,7 +55234,8 @@ var ConnectedDicomView = reactRedux.connect(mapStateToProps$l, {
   closeOnePickLayout: closeOnePickLayout,
   activeDicomFunction: activeDicomFunction,
   openIO: openIO,
-  closeIO: closeIO
+  closeIO: closeIO,
+  setActiveTool: setActiveTool
 }, mergeProps$k, withRef())(DicomView);
 
 function withRef() {