hellfire 0.29.16 → 0.29.18

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.18](http://10.16.100.57/diffusion/115/paladin/compare/v0.29.17...v0.29.18) (2025-06-25)
+
+
+
+## [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)
 
 

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',
@@ -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';
@@ -30374,6 +30397,7 @@ var EXCHANGE_FILM = 'FILM/EXCHANGE_FILM';
 var SET_FILM_ACTIVE_INDEX = 'FILM/SET_FILM_ACTIVE_INDEX';
 var CLEAR_FILMS = 'FILM/CLEAR_FILMS';
 var SET_FILM_RELATIVE_INDEX = 'FILM/SET_FILM_RELATIVE_INDEX';
+var SET_FILM_RELATIVE_INDEX_MULTI = 'FILM/SET_FILM_RELATIVE_INDEX_MULTI';
 var initialState$4 = {
   // 胶片添加模式 image or series
   filmAddType: 'series',
@@ -30535,6 +30559,13 @@ var film = (function () {
         });
       }
 
+    case SET_FILM_RELATIVE_INDEX_MULTI:
+      {
+        return _objectSpread$e(_objectSpread$e({}, state), {}, {
+          filmRelativeIndexes: action.payload
+        });
+      }
+
     case SET_FILM_ACTIVE_INDEX:
       {
         var _action$payload2 = action.payload,
@@ -30590,6 +30621,12 @@ function setFilmRelativeIndex(index) {
     payload: index
   };
 }
+function setFilmRelativeIndexMulti(data) {
+  return {
+    type: SET_FILM_RELATIVE_INDEX_MULTI,
+    payload: data
+  };
+}
 function setFilmAddType(value) {
   return setFilmReduxValue('filmAddType', value);
 }
@@ -47274,7 +47311,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); }; }
@@ -47307,6 +47344,7 @@ var KeyImagesTool = /*#__PURE__*/function (_Component) {
           show: false
         },
         style: {
+          width: '60%',
           textAlign: 'center'
         }
       });
@@ -50545,7 +50583,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
@@ -51485,7 +51523,7 @@ function _isNativeReflectConstruct$1y() { if (typeof Reflect === "undefined" ||
 
 var getStudyDateTime = function getStudyDateTime(dicom) {
   // 因为检查时间部分数据可能未传, 根据以下顺序进行获取
-  var fetchTagList = ['Content', 'Acquisition', 'Series', 'Study'];
+  var fetchTagList = ['Acquisition', 'Content', 'Series', 'Study'];
 
   for (var _i = 0, _fetchTagList = fetchTagList; _i < _fetchTagList.length; _i++) {
     var tag = _fetchTagList[_i];
@@ -54504,7 +54542,7 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
       var index = this.props.index; // 判断是否按住ctrl
 
       if (e && e.ctrlKey) {
-        this.props.handleCtrlSelect(this.element, index);
+        this.props.handleCtrlSelect && this.props.handleCtrlSelect(this.element, index);
       }
     }
   }, {
@@ -70785,12 +70823,17 @@ var FilmViewport = /*#__PURE__*/function (_Component) {
       var index = _this.props.index; // 判断是否按住ctrl
 
       if (e && e.ctrlKey) {
-        _this.props.handleCtrlSelect(_this.element, index);
+        _this.props.handleCtrlSelect && _this.props.handleCtrlSelect(_this.element, index);
+      } // 判断是否按住shift
+
+
+      if (e && e.shiftKey) {
+        _this.props.handleShiftSelect && _this.props.handleShiftSelect(_this.element, index);
       }
     });
 
     defineProperty(assertThisInitialized(_this), "onMouseDown", function (e) {
-      if (e && e.ctrlKey) {
+      if (e && (e.ctrlKey || e.shiftKey)) {
         return;
       }
 
@@ -71169,6 +71212,7 @@ var FilmView = /*#__PURE__*/function (_Component) {
           filmCurrentPage = _this$props4.filmCurrentPage,
           filmActiveTool = _this$props4.filmActiveTool,
           handleCtrlSelect = _this$props4.handleCtrlSelect,
+          handleShiftSelect = _this$props4.handleShiftSelect,
           filmRelativeIndexes = _this$props4.filmRelativeIndexes;
       var _this$state = this.state,
           filmViewWidth = _this$state.filmViewWidth,
@@ -71253,6 +71297,7 @@ var FilmView = /*#__PURE__*/function (_Component) {
               handleOnClickViewport(e, index);
             },
             handleCtrlSelect: handleCtrlSelect,
+            handleShiftSelect: handleShiftSelect,
             active: filmActiveIndex === index,
             onViewportSave: function onViewportSave(vp) {
               _onViewportSave && _onViewportSave(realIndex, vp);
@@ -71311,7 +71356,7 @@ var mergeProps$A = function mergeProps(propsFromState, propsFromDispatch, ownPro
           filmActiveIndex = propsFromState.filmActiveIndex,
           filmRelativeIndexes = propsFromState.filmRelativeIndexes;
 
-      if (!e.ctrlKey && e.button === 0) {
+      if (!e.ctrlKey && !e.shiftKey && e.button === 0) {
         if (!_.includes(filmRelativeIndexes, filmActiveIndex)) {
           var oldActiveElement = getFilmElement(filmActiveIndex);
           filmSynchronizer.remove(oldActiveElement);
@@ -71321,9 +71366,9 @@ var mergeProps$A = function mergeProps(propsFromState, propsFromDispatch, ownPro
           var element = getFilmElement(index);
           filmSynchronizer.add(element);
         }
-      }
 
-      propsFromDispatch.setFilmActiveIndex(index);
+        propsFromDispatch.setFilmActiveIndex(index);
+      }
     },
     // 多选胶片
     handleCtrlSelect: function handleCtrlSelect(element, index) {
@@ -71338,6 +71383,25 @@ var mergeProps$A = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
       propsFromDispatch.setFilmRelativeIndex(index);
     },
+    handleShiftSelect: function handleShiftSelect(element, index) {
+      var filmActiveIndex = propsFromState.filmActiveIndex,
+          filmSynchronizer = propsFromState.filmSynchronizer;
+      filmSynchronizer.destroy();
+      var start = Math.min(filmActiveIndex, index);
+      var end = Math.max(filmActiveIndex, index);
+      var relativeIndexs = [];
+
+      for (var i = start; i <= end; i++) {
+        var _element = getFilmElement(i);
+
+        if (_element) {
+          filmSynchronizer.add(_element);
+          relativeIndexs.push(i);
+        }
+      }
+
+      propsFromDispatch.setFilmRelativeIndexMulti(relativeIndexs);
+    },
     onViewportSave: function onViewportSave(index, vp) {
       propsFromDispatch.setFilmViewport(index, vp);
     }
@@ -71351,7 +71415,8 @@ var ConnectedFilmView = reactRedux.connect(mapStateToProps$C, {
   setFilmActiveIndex: setFilmActiveIndex,
   setFilmRelativeIndex: setFilmRelativeIndex,
   setFilmViewport: setFilmViewport,
-  setFilmCurrentPage: setFilmCurrentPage
+  setFilmCurrentPage: setFilmCurrentPage,
+  setFilmRelativeIndexMulti: setFilmRelativeIndexMulti
 }, mergeProps$A)(FilmView);
 
 var css_248z$M = ".paladin-fusion-wrapper {\n  width: 100%;\n  height: 100%;\n  color: white;\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n}\n.paladin-fusion-wrapper .paladin-fusion-item-fusion {\n  display: flex;\n  flex-direction: column;\n  width: 60%;\n  height: 100%;\n  position: relative;\n  z-index: 1;\n  flex: none;\n}\n.paladin-fusion-wrapper .paladin-fusion-origin {\n  display: flex;\n  flex-direction: column;\n  width: 40%;\n  height: 100%;\n  position: relative;\n  z-index: 1;\n  flex: none;\n}\n.paladin-fusion-wrapper .paladin-fusion-item {\n  display: flex;\n  flex-direction: row;\n  width: 100%;\n  height: 50%;\n  position: relative;\n  z-index: 1;\n  flex: none;\n}\n.paladin-fusion-wrapper .paladin-fusion-ct,\n.paladin-fusion-wrapper .paladin-fusion-pet {\n  width: 100%;\n  height: 100%;\n  position: absolute;\n  left: 0;\n  top: 0;\n}\n.paladin-fusion-wrapper .paladin-fusion-ct {\n  z-index: 2;\n}\n.paladin-fusion-wrapper .paladin-fusion-pet {\n  z-index: 3;\n}\n";
@@ -73645,7 +73710,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;
@@ -73685,7 +73751,8 @@ var mapStateToProps$F = function mapStateToProps(state) {
     Film: Film,
     reduxFilmPrinterSettings: filmPrinterSettings,
     Fusion: Fusion,
-    fusionActiveIndex: fusionActiveIndex
+    fusionActiveIndex: fusionActiveIndex,
+    reduxKeyImages: keyImages
   };
 };
 
@@ -73824,10 +73891,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) {
@@ -74295,12 +74439,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
@@ -74411,7 +74555,7 @@ var mergeProps$C = function mergeProps(propsFromState, propsFromDispatch, ownPro
                 });
 
                 if (!needCheckMultiFrame) {
-                  _context.next = 47;
+                  _context2.next = 47;
                   break;
                 }
 
@@ -74419,25 +74563,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');
@@ -74462,7 +74606,7 @@ var mergeProps$C = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
               case 44:
                 i++;
-                _context.next = 31;
+                _context2.next = 31;
                 break;
 
               case 47:
@@ -74521,11 +74665,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;
@@ -74598,10 +74742,10 @@ var mergeProps$C = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
               case 78:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee);
+        }, _callee2);
       }));
 
       function initSeries(_x, _x2) {