hellfire 0.29.15 → 0.29.17

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.29.17](http://10.16.100.57/diffusion/115/paladin/compare/v0.29.16...v0.29.17) (2025-06-09)
+
+
+
+## [0.29.16](http://10.16.100.57/diffusion/115/paladin/compare/v0.29.15...v0.29.16) (2025-06-07)
+
+
+
 ## [0.29.15](http://10.16.100.57/diffusion/115/paladin/compare/v0.29.14...v0.29.15) (2025-06-05)
 
 

package/dist/index.js

@@ -554,6 +554,7 @@ var CustomKeyCodes = {
   69: 'key-e',
   70: 'key-f',
   74: 'key-j',
+  75: 'key-k',
   76: 'key-l',
   80: 'key-p',
   82: 'key-r',
@@ -1048,7 +1049,7 @@ var initialState$1 = {
   // 联动同步窗值
   autoLinkSyncOther: true,
   // 联动同步缩放平移等
-  mprCrosshairMode: 'orthogonal' // orthogonal free 正交 自由
+  mprCrosshairMode: 'free' // orthogonal free 正交 自由
 
 };
 var action = (function () {
@@ -13807,6 +13808,24 @@ function guid() {
     return v.toString(16);
   });
 }
+function getScaledCanvasDat(originalCanvas) {
+  var originWidth = originalCanvas.width;
+  var originHeight = originalCanvas.height;
+  var height = 300;
+
+  if (originHeight > height) {
+    var ratio = height / originHeight;
+    var tempCanvas = document.createElement('canvas');
+    var tempCtx = tempCanvas.getContext('2d');
+    tempCanvas.width = originWidth * ratio;
+    tempCanvas.height = originHeight * ratio;
+    tempCtx.imageSmoothingQuality = 'high';
+    tempCtx.drawImage(originalCanvas, 0, 0, originalCanvas.width, originalCanvas.height, 0, 0, tempCanvas.width, tempCanvas.height);
+    return tempCanvas.toDataURL('image/jpeg');
+  } else {
+    return originalCanvas.toDataURL('image/jpeg');
+  }
+}
 
 /**
  * @class 手术路径，路径为直线段
@@ -25605,6 +25624,10 @@ var dicomSettingHotKeyDic = [{
   label: '显示/隐藏图像信息',
   label_en: 'Display/Hide Image Overlay',
   hotkey: 'T'
+}, {
+  label: '添加/移除关键图',
+  label_en: 'Add/Remove Key Image',
+  hotkey: 'K'
 }];
 var hotKeyIsOpen = window.localStorage.getItem('hellfire-hotkey-open') || 'open';
 var dicomBasicInfoFrom = window.localStorage.getItem('hellfire-dicom-basic-info-from') || 'dicom';
@@ -27546,8 +27569,6 @@ function setThickness(imageId, imageProcessType) {
   }
 }
 
-var rotateCursorFree = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAA5dJREFUWEftVl9IWmEUvz7MMsWUMEtffBAdY6CQ4LZgy5dYsUCWNdiTbER7KLCCoFVo1ENjBUUtaw9SL/bSmBGbsKDJ2IusgewlDASfJBVJ87/C2jniHbfWdj9bIwZ9L3rv/e49v/P7/c45H4e65MW55PjUFYD/k4Hj4+MW8M69sn98HA5n87xeqogBCCxKJBLbkUjkutPpFGDQjo6OuFqtDvP5/PsAJFgpEGIAGPzo6OjL5OSkfGZmhscMZDabqcXFxSiAUAGIeCUgiAFkMhmnw+F42NfXVyUSiSi73Z7CQCMjI4JgMEhNTU3lBgYGfADi9oUDgOy10Wj0s0ql4uPHvV5vSiqVvqqtrT0IBAITOp1OGI/HKZAmLZFIHgALHlIQRAzEYrENoL5zbm4OM8339/d/guCtGCSZTNpXV1efwD0uSjE7O/umrq7OdKEAcrlctqGhoRqzTKfTxZqaGtS6ZDhgR5HNZv0ymYyL14eHhxQ8I0oM97NuxJIDmjeVSqXQaDRSa2trAcheycwQ5PnY09PT4nK5qN3d3URTU5ORVAYSABZw+Auk2GazUVardQI+bqMBoD/y+fy75eVlmcVioXDP8PDwQbFY/CYUCh+xVQUrANR4fHz8Gep/VnapVCoClSHBSvB4PBSyhMtkMhXa2tq22PzACgDo9XV1dWnw42cBgOwzer2e5/P5TvgO2RgdHfVAVRj+ZMiKAJTL7Caz44EEZugRr5ubm6/RILAaVlZWslwu9w7sPYnsFJq/BlCuhJ8gtFotcXCiKmCTgGFGc6FQWIKSDYH5TGyZ0++xMsBmwjIDIpDBDf3hVjgcdkDPeHphjQg0ts3Pz1vpEjtdhrQEbrd7qb29nfcv+kDL/v7+FoxcAZYYtN2vMIx0v2tEOzs7MYPBgBIQzQNWCTAQsxUD1QUej6dmtGIRdmCxWFzChK0YlpitARF7ADfiMBoaGuqE7Etjd3Bw8C3o/RifoUdAIvPY2Fg1lh/836YHFYkPiBjAeQDmeg/m4uFZwO/3Z+rr659jAGDkpVwuv4aDKhQK5RsbG/FkREQ/URnSWcBR7MPCwsJdyLRKoVDggSQD975PT08LsAGVTfqLP9hYIGKALjWo81Bvby8PpWAuRue7Uem5kBhAGYQWzoUbe3t70vX19dKhtLu7O6fRaJJwFGslbT5M8BUBoF/E/g9TUI/XAoHACz8uUtefluRcANh0reT5FYAf9tTzMKO0AnsAAAAASUVORK5CYII=";
-
 var rotateCursorCross = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAABDRJREFUWEfdVl1IU2EYPqOyzfxZOs12NbAbu3GwQRpEU1AUksQUf0DcheIfoilEoOJPgoL4h4YagYaEZkWGXkReOLoLFKaUqCh6I5p/c3Nzm4r2vLIT8zQ954QidK7mOZ/v+7zP+7zP+0mYS34kl5yf+X8BHB0dyS0Wy7u9vb1rCoWiVCKRGD2xfWEMmM3mry0tLTHb29tMeXn5ZFBQkPpcAKCyRAQKdwUzorLPngKvr68bU1JSwg0GA4P/YXDOY7GCGUAQNSh9Pz8/rxgeHpZT0oyMDGtwcPCMv79/DOJv44wKZ7r9/Pxi6XtUVBTDAqC/NzY2xrjtEASAAqOXP3Nzc717e3tPFFxXV+coKipaRlLt1tbW676+vifV1dUMUc996H1hYaEB7YhivwkCQP1sb29/UFFRIVWpVEx9fb2VAuTn5/tQoo6ODmdWVlbP4eFhaHNzc0xNTY3H6S4pKSE9iAOA6nUrKytflErldblczszNzVlRQSVAheB9cWRkpJSyLS8v73t7e0eD5hegWeepBWjPAphKdp8IXgao+uLi4hiiHvTuJyQkNAPIc0rAKp2opVaUlpZ+AogM+nYuIqRZRiwTCZiqR8UOqVR6mwRHSUgbSPQDQrxBrZmamtpEhQoXgDG0Rkctqq2tXYBQ74geQxq50dHRN7GxsX56vZ5pa2sbRaBjhbMPhLeYlJSkIrUvLi6aACSaKHZNxCuXET39JyNCkGoIqooo7u/vt6WlpVUgUCubnPThdDrfNjQ0KOlMV1eXJT09fe3g4MAYEBCQwzLlUZGul2dqAPSO5eTk6IaGhpjx8XGzRqNJRFADGxDJd1NTU2VLS0uM0WhkSOX0Ozs7ez8iIqIKYqw/Kzl94wPwx812d3f3ZDLZLfeqHA6HPSQkRMqdeWKjrKysy9fXN//cAHiyU4iyAMmbaBRZEKSV7u5uu5eX112AXbpQABScBREfHy/V6XRs8vuniY4LSHALiAE8Nz0JC9/00EPnzs7OLPquF5pciAbOFKHLC+QwJBpPrdVq7UTfC/hod/9+JgPuYzgwMGCF4otQXa97AJwpGRkZaczMzLyKSbGEhoY+PDcGuEbU1NT0MTAwMPk0I8KqJgCP3UeVjw0+Bk5YsclkOqEDcju73T4L//ciq15dXSWrlvElFdwCOojxGofBaGgZURvi4uJesstoc3PzA9b08f4nE6qsrPyLIT4wvNuQ2jAxMdGj1WrltHCmp6fJkJ5R4JmZmQbWA9bW1mxY04/E0M87BSx6YgFValpbWxm1Ws00NjaaUf2VvLy84wsJVrETt6Jv3EXFV71gAK4r2TSuZDLulczN+ZRClo8oI+KMm9pms32dnJz0HRwcPL4FYfNZw8LCfnFvOUIqZ8/waoAbjFwPhnOP3vv4+Hzn+oKY5IJbIDaomPOiGRATXMjZSwfwG+T6aD+ZfV1fAAAAAElFTkSuQmCC";
 
 function _createForOfIteratorHelper$7(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$8(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -27643,9 +27664,9 @@ var CrosshairsMPRTool = /*#__PURE__*/function (_BaseTool) {
         } else if (lodash$1.includes(this.rotateDirection, position)) {
           // 旋转图标
           if (this.options.mode === 'free') {
-            element.style.cursor = "url(".concat(rotateCursorFree, "), se-resize");
+            element.style.cursor = "se-resize";
           } else {
-            element.style.cursor = "url(".concat(rotateCursorCross, "), se-resize");
+            element.style.cursor = "url(".concat(rotateCursorCross, ") 16 16, se-resize");
           }
         } else {
           // 平移图标 -- 定位线平移 或者 层厚平移
@@ -47276,7 +47297,7 @@ var mergeProps$j = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
 var ConnectedVRClip = reactRedux.connect(mapStateToProps$j, {}, mergeProps$j)(VRClip);
 
-var css_248z$r = ".paladin-key-image-box {\n  background: #fff;\n  border-radius: 3px;\n}\n.paladin-key-image-box .paladin-key-image-header {\n  font-size: 15px;\n  font-weight: bold;\n  color: #000;\n  padding: 16px 18px;\n}\n.paladin-key-image-box .paladin-key-image-item {\n  min-width: 320px;\n  font-size: 13px;\n  color: #333;\n  padding: 14px 18px;\n}\n.paladin-key-image-box .paladin-key-image-item:nth-child(2n) {\n  background: #f9f9f9;\n}\n.paladin-key-image-box .paladin-key-image-item .paladin-key-image-item-action {\n  text-align: right;\n}\n.paladin-key-image-box .paladin-key-image-item .paladin-key-image-item-action span {\n  display: inline-block;\n  color: #2D78C4;\n}\n.paladin-key-image-box .paladin-key-image-item .paladin-key-image-item-action span:first-child {\n  margin-right: 20px;\n}\n.paladin-key-image-preview img {\n  max-width: 100%;\n}\n";
+var css_248z$r = ".paladin-key-image-box {\n  background: #fff;\n  border-radius: 3px;\n}\n.paladin-key-image-box .paladin-key-image-header {\n  font-size: 15px;\n  font-weight: bold;\n  color: #000;\n  padding: 16px 18px;\n}\n.paladin-key-image-box .paladin-key-image-item {\n  min-width: 320px;\n  font-size: 13px;\n  color: #333;\n  padding: 14px 18px;\n}\n.paladin-key-image-box .paladin-key-image-item:nth-child(2n) {\n  background: #f9f9f9;\n}\n.paladin-key-image-box .paladin-key-image-item .paladin-key-image-item-action {\n  text-align: right;\n}\n.paladin-key-image-box .paladin-key-image-item .paladin-key-image-item-action span {\n  display: inline-block;\n  color: #2D78C4;\n}\n.paladin-key-image-box .paladin-key-image-item .paladin-key-image-item-action span:first-child {\n  margin-right: 20px;\n}\n.paladin-key-image-preview img {\n  max-width: 50vw;\n  max-height: 50vh;\n}\n";
 styleInject$1(css_248z$r);
 
 function _createSuper$1o(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1o(); return function _createSuperInternal() { var Super = getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return possibleConstructorReturn(this, result); }; }
@@ -47309,6 +47330,7 @@ var KeyImagesTool = /*#__PURE__*/function (_Component) {
           show: false
         },
         style: {
+          width: '60%',
           textAlign: 'center'
         }
       });
@@ -50547,7 +50569,7 @@ var mergeProps$o = function mergeProps(propsFromState, propsFromDispatch, ownPro
                     numberOfInstances: currentSeries.imageIds.length,
                     instanceNumber: instanceNumber
                   };
-                  dataUrl = enabled.canvas.toDataURL('image/jpeg');
+                  dataUrl = getScaledCanvasDat(enabled.canvas);
                   ownProps.operateKeyImages('add', {
                     dataUrl: dataUrl,
                     imageInfo: imageInfo
@@ -50922,7 +50944,7 @@ var LoadingIndicator = /*#__PURE__*/function (_PureComponent) {
         className: "indicatorContents"
       }, /*#__PURE__*/React__default.createElement("h4", null, "\u52A0\u8F7D\u5F71\u50CF\u5931\u8D25"), /*#__PURE__*/React__default.createElement("p", {
         className: "description"
-      }, "\u52A0\u8F7D\u5F71\u50CF\u65F6\u53D1\u751F\u4E86\u4E00\u4E2A\u9519\u8BEF"), /*#__PURE__*/React__default.createElement("p", {
+      }, "\u8BF7\u5237\u65B0\u91CD\u8BD5\uFF0C\u6216\u91CD\u65B0\u6253\u5F00\u8F6F\u4EF6"), /*#__PURE__*/React__default.createElement("p", {
         className: "details"
       }, error.message || error.error.message || this.props.error.error.statusText), /*#__PURE__*/React__default.createElement("div", {
         className: "loadingIndicator-retry",
@@ -73647,7 +73669,8 @@ var mapStateToProps$F = function mapStateToProps(state) {
       MIP = _state$paladin$tools$2.MIP,
       CPR = _state$paladin$tools$2.CPR,
       Film = _state$paladin$tools$2.Film,
-      Fusion = _state$paladin$tools$2.Fusion;
+      Fusion = _state$paladin$tools$2.Fusion,
+      keyImages = _state$paladin$tools$2.keyImages;
   var _state$paladin$tools$3 = state.paladin.tools.customization,
       toolMode = _state$paladin$tools$3.toolMode,
       globalLoading = _state$paladin$tools$3.globalLoading;
@@ -73687,7 +73710,8 @@ var mapStateToProps$F = function mapStateToProps(state) {
     Film: Film,
     reduxFilmPrinterSettings: filmPrinterSettings,
     Fusion: Fusion,
-    fusionActiveIndex: fusionActiveIndex
+    fusionActiveIndex: fusionActiveIndex,
+    reduxKeyImages: keyImages
   };
 };
 
@@ -73826,10 +73850,87 @@ var mergeProps$C = function mergeProps(propsFromState, propsFromDispatch, ownPro
       KEYE: ['key-e'],
       KEYR: ['key-r'],
       KEYT: ['key-t'],
+      KEYK: ['key-k'],
       DICOMMODAL: ['ctrl+alt+key-d'] // FILMENTRANCE: ['ctrl+alt+key-p', 'ctrl+alt+key-f']
 
     },
     handlers: {
+      KEYK: function KEYK() {
+        // 添加删除关键图
+        if (!hotKeyIsOpen) {
+          return;
+        } // 关键图像添加/移除
+
+
+        var reduxKeyImages = propsFromState.reduxKeyImages,
+            seriesCurrentIndex = propsFromState.seriesCurrentIndex,
+            currentSeries = propsFromState.currentSeries;
+        var realActiveIndex = col * currentScrollLine + activeIndex;
+        var currentSeriesIndex = seriesCurrentIndex[realActiveIndex];
+        var SOPInstanceUID = currentSeries.SOPInstanceUIDs[currentSeriesIndex];
+        var selectImage = lodash$1.find(reduxKeyImages, {
+          SOPInstanceUID: SOPInstanceUID
+        });
+
+        function handleAddKeyImage() {
+          return _handleAddKeyImage.apply(this, arguments);
+        }
+
+        function _handleAddKeyImage() {
+          _handleAddKeyImage = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
+            var activeElement, enabled, dicom, instanceNumber, imageInfo, dataUrl;
+            return regenerator.wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    activeElement = getElement(realActiveIndex);
+                    enabled = cornerstone.getEnabledElement(activeElement);
+                    _context.next = 4;
+                    return loadAndCacheDicom(enabled.image.imageId);
+
+                  case 4:
+                    dicom = _context.sent;
+
+                    if (dicom) {
+                      _context.next = 7;
+                      break;
+                    }
+
+                    return _context.abrupt("return");
+
+                  case 7:
+                    instanceNumber = dicom.InstanceNumber.toString();
+                    imageInfo = {
+                      studyInstanceUID: currentSeries.studyInstanceUID,
+                      seriesInstanceUID: currentSeries.seriesInstanceUID,
+                      SOPInstanceUID: SOPInstanceUID,
+                      seriesNumber: currentSeries.seriesNumber,
+                      numberOfSeries: currentSeries.seriesCount,
+                      numberOfInstances: currentSeries.imageIds.length,
+                      instanceNumber: instanceNumber
+                    };
+                    dataUrl = getScaledCanvasDat(enabled.canvas);
+                    ownProps.operateKeyImages('add', {
+                      dataUrl: dataUrl,
+                      imageInfo: imageInfo
+                    });
+
+                  case 11:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }));
+          return _handleAddKeyImage.apply(this, arguments);
+        }
+
+        if (selectImage) {
+          ownProps.operateKeyImages('remove', selectImage);
+        } else {
+          handleAddKeyImage();
+        }
+      },
       PAUSE: function PAUSE() {
         // 空格键的监听 如果正在播放 则暂停
         if (Cine) {
@@ -74297,12 +74398,12 @@ var mergeProps$C = function mergeProps(propsFromState, propsFromDispatch, ownPro
       });
     },
     initSeries: function () {
-      var _initSeries2 = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(changeStudy, callback) {
+      var _initSeries2 = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(changeStudy, callback) {
         var data, resetToolMergeState, synchronizer, linkSynchronizer, linkImageModeSynchronizer, linkScrollSynchronizer, options, _study, series, needCheckMultiFrame, hasMultiFrame, modalitiesInStudy, i, item, wado, url, dataSet, numFrames, imageIds, _i, imageId, seriesCurrentIndex, firstReady, maxRequest, retry, clearCacheEveryLoad, dicom, frameTime, linkToolLocalDefaultState, realActiveIndex, continuousMeasureLocalDefaultState, referenceLineLocalDefaultState, shutterLocalDefaultState, autoLinkSyncWindowLevelDefaultState, autoLinkSyncOtherDefaultState, mprCrossModeDefaultState;
 
-        return regenerator.wrap(function _callee$(_context) {
+        return regenerator.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context.prev = _context.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 /**
                  * 初始化study
@@ -74413,7 +74514,7 @@ var mergeProps$C = function mergeProps(propsFromState, propsFromDispatch, ownPro
                 });
 
                 if (!needCheckMultiFrame) {
-                  _context.next = 47;
+                  _context2.next = 47;
                   break;
                 }
 
@@ -74421,25 +74522,25 @@ var mergeProps$C = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
               case 31:
                 if (!(i < series.length)) {
-                  _context.next = 47;
+                  _context2.next = 47;
                   break;
                 }
 
                 item = series[i];
 
                 if (!(item.numberOfSeriesRelatedInstances && item.numberOfSeriesRelatedInstances === 1)) {
-                  _context.next = 44;
+                  _context2.next = 44;
                   break;
                 }
 
                 wado = lodash$1.cloneDeep(item.imageIds[0].split(':'));
                 wado.shift();
                 url = wado.join(':');
-                _context.next = 39;
+                _context2.next = 39;
                 return cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.load(url, cornerstoneWADOImageLoader.internal.xhrRequest);
 
               case 39:
-                dataSet = _context.sent;
+                dataSet = _context2.sent;
                 // 这边如果加载了的话 进度条也需要匹配上
                 propsFromDispatch.setSeriesLoaded(item.seriesInstanceUID);
                 numFrames = dataSet.intString('x00280008');
@@ -74464,7 +74565,7 @@ var mergeProps$C = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
               case 44:
                 i++;
-                _context.next = 31;
+                _context2.next = 31;
                 break;
 
               case 47:
@@ -74523,11 +74624,11 @@ var mergeProps$C = function mergeProps(propsFromState, propsFromDispatch, ownPro
                   })]
                 }); // 如果有frameTime的话设置fps
 
-                _context.next = 62;
+                _context2.next = 62;
                 return loadAndCacheDicom(series[0].imageIds[0]);
 
               case 62:
-                dicom = _context.sent;
+                dicom = _context2.sent;
 
                 if (dicom && dicom.FrameTime && dicom.FrameTime.value) {
                   frameTime = dicom.FrameTime.value;
@@ -74591,19 +74692,19 @@ var mergeProps$C = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
                 mprCrossModeDefaultState = window.localStorage.getItem('hellfire-mpr-cross-mode-default-state'); // 默认是正交
 
-                if (mprCrossModeDefaultState && mprCrossModeDefaultState === 'free') {
+                if (mprCrossModeDefaultState && mprCrossModeDefaultState === 'orthogonal') {
                   propsFromDispatch.setActionStateByKey({
                     key: 'mprCrosshairMode',
-                    value: 'free'
+                    value: 'orthogonal'
                   });
                 }
 
               case 78:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee);
+        }, _callee2);
       }));
 
       function initSeries(_x, _x2) {