hellfire 0.20.6 → 0.20.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -2,6 +2,10 @@
2
2
 
3
3
  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.
4
4
 
5
+ ## [0.20.7](http://10.16.100.57/diffusion/115/paladin/compare/v0.20.6...v0.20.7) (2022-05-24)
6
+
7
+
8
+
5
9
  ## [0.20.6](http://10.16.100.57/diffusion/115/paladin/compare/v0.20.5...v0.20.6) (2022-05-23)
6
10
 
7
11
 
package/dist/index.html CHANGED
@@ -25,8 +25,8 @@
25
25
  }
26
26
 
27
27
  </style>
28
- <link rel="shortcut icon" href="./favicon.ico"><link href="./v0.17.0-45-g71b09d4/main0a2bc8afb5d6dd0c9044.css?0a2bc8afb5d6dd0c9044" rel="stylesheet"></head>
28
+ <link rel="shortcut icon" href="./favicon.ico"><link href="./v0.17.0-46-g33a703a/main56d1bbe76fd28b6ffa02.css?56d1bbe76fd28b6ffa02" rel="stylesheet"></head>
29
29
  <body>
30
30
  <div id="app" style="height: 100%;"></div>
31
- <script type="text/javascript" src="./v0.17.0-45-g71b09d4/main-0a2bc8afb5d6dd0c9044.js?0a2bc8afb5d6dd0c9044"></script></body>
31
+ <script type="text/javascript" src="./v0.17.0-46-g33a703a/main-56d1bbe76fd28b6ffa02.js?56d1bbe76fd28b6ffa02"></script></body>
32
32
  </html>
package/dist/index.js CHANGED
@@ -27210,6 +27210,7 @@ var external$k = cornerstoneTools.external,
27210
27210
  getToolState$c = cornerstoneTools.getToolState;
27211
27211
  /**
27212
27212
  * 多边形绘制工具
27213
+ * 备注:在activeTool改变的地方添加判断,如果是从多边形工具切换到了别的工具,要手动结束掉未完成的绘制
27213
27214
  */
27214
27215
 
27215
27216
  var PolygonTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
@@ -27308,6 +27309,7 @@ var PolygonTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
27308
27309
  var measurementData;
27309
27310
  var currentPoint;
27310
27311
  this.isDrawing = true;
27312
+ this.currentElement = element;
27311
27313
 
27312
27314
  if (pendingMeasurement) {
27313
27315
  measurementData = pendingMeasurement;
@@ -27328,7 +27330,6 @@ var PolygonTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
27328
27330
  measurementData = this.createNewMeasurement(eventData);
27329
27331
  addToolState$4(element, this.name, measurementData);
27330
27332
  currentPoint = measurementData.handles.point1;
27331
- this.currentElement = element;
27332
27333
  }
27333
27334
 
27334
27335
  external$k.cornerstone.updateImage(element);
@@ -49198,6 +49199,52 @@ function getEventButtons(event) {
49198
49199
  return 0;
49199
49200
  }
49200
49201
 
49202
+ function autoFinishPolygon() {
49203
+ try {
49204
+ fireKeyEvent(document.body, 'keyup', 27);
49205
+ console.log('---------自动结束多边形绘制---------');
49206
+ } catch (e) {
49207
+ console.log('---------自动结束多边形绘制失败---------', e);
49208
+ }
49209
+ }
49210
+
49211
+ function fireKeyEvent(el, evtType, keyCode) {
49212
+ var doc = el.ownerDocument,
49213
+ win = doc.defaultView || doc.parentWindow,
49214
+ evtObj;
49215
+
49216
+ if (doc.createEvent) {
49217
+ if (win.KeyEvent) {
49218
+ evtObj = doc.createEvent('KeyEvents');
49219
+ evtObj.initKeyEvent(evtType, true, true, win, false, false, false, false, keyCode, 0);
49220
+ } else {
49221
+ evtObj = doc.createEvent('UIEvents');
49222
+ Object.defineProperty(evtObj, 'keyCode', {
49223
+ get: function get() {
49224
+ return this.keyCodeVal;
49225
+ }
49226
+ });
49227
+ Object.defineProperty(evtObj, 'which', {
49228
+ get: function get() {
49229
+ return this.keyCodeVal;
49230
+ }
49231
+ });
49232
+ evtObj.initUIEvent(evtType, true, true, win, 1);
49233
+ evtObj.keyCodeVal = keyCode;
49234
+
49235
+ if (evtObj.keyCode !== keyCode) {
49236
+ console.log("keyCode " + evtObj.keyCode + " 和 (" + evtObj.which + ") 不匹配");
49237
+ }
49238
+ }
49239
+
49240
+ el.dispatchEvent(evtObj);
49241
+ } else if (doc.createEventObject) {
49242
+ evtObj = doc.createEventObject();
49243
+ evtObj.keyCode = keyCode;
49244
+ el.fireEvent('on' + evtType, evtObj);
49245
+ }
49246
+ }
49247
+
49201
49248
  (function () {
49202
49249
  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
49203
49250
 
@@ -49209,6 +49256,8 @@ function getEventButtons(event) {
49209
49256
  reactHotLoader.register(checkAndUnLockToolState, "checkAndUnLockToolState", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/unlockToolState.js");
49210
49257
  reactHotLoader.register(getActiveToolStateElement, "getActiveToolStateElement", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/unlockToolState.js");
49211
49258
  reactHotLoader.register(getEventButtons, "getEventButtons", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/unlockToolState.js");
49259
+ reactHotLoader.register(autoFinishPolygon, "autoFinishPolygon", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/unlockToolState.js");
49260
+ reactHotLoader.register(fireKeyEvent, "fireKeyEvent", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/unlockToolState.js");
49212
49261
  })();
49213
49262
 
49214
49263
  (function () {
@@ -49743,7 +49792,7 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
49743
49792
  };
49744
49793
  });
49745
49794
 
49746
- defineProperty(assertThisInitialized(_this), "setActiveTool", function (activeTool) {
49795
+ defineProperty(assertThisInitialized(_this), "setActiveTool", function (activeTool, prevTool) {
49747
49796
  var leftMouseToolNames = _this.availableTools.filter(function (tool) {
49748
49797
  if (!tool.mouseButtonMasks) {
49749
49798
  return;
@@ -49795,6 +49844,27 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
49795
49844
  } else {
49796
49845
  _default$E.clearToolState(_this.element, 'CrosshairsMPR');
49797
49846
  }
49847
+ } // 从多边形工具切换到了别的工具,要手动结束掉未完成的绘制
49848
+
49849
+
49850
+ if (prevTool && prevTool === 'Polygon') {
49851
+ var needAutoFinish = false;
49852
+
49853
+ var _toolData = _default$E.getToolState(_this.element, 'Polygon');
49854
+
49855
+ if (_toolData && _toolData.data && _toolData.data.length > 0) {
49856
+ for (var i = 0; i < _toolData.data.length; i++) {
49857
+ if (!_toolData.data[i].complete) {
49858
+ _toolData.data[i].complete = true;
49859
+ needAutoFinish = true;
49860
+ }
49861
+ }
49862
+ }
49863
+
49864
+ if (needAutoFinish) {
49865
+ autoFinishPolygon();
49866
+ cornerstone.updateImage(_this.element);
49867
+ }
49798
49868
  }
49799
49869
  });
49800
49870
 
@@ -50726,7 +50796,7 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
50726
50796
  break;
50727
50797
 
50728
50798
  case prevProps.activeTool !== this.props.activeTool:
50729
- this.setActiveTool(this.props.activeTool);
50799
+ this.setActiveTool(this.props.activeTool, prevProps.activeTool);
50730
50800
  break;
50731
50801
 
50732
50802
  case prevProps.activeIndex !== this.props.activeIndex: