hellfire 0.30.3 → 0.30.4

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 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.30.4](http://10.16.100.57/diffusion/115/paladin/compare/v0.30.3...v0.30.4) (2025-07-28)
+
+
+
 ## [0.30.3](http://10.16.100.57/diffusion/115/paladin/compare/v0.30.2...v0.30.3) (2025-07-18)
 
 

package/dist/index.js

@@ -999,6 +999,7 @@ var initActiveTool = isMobile ? 'StackScroll' : 'Wwwc';
 var initialState$1 = {
   activeTool: initActiveTool,
   originActiveTool: initActiveTool,
+  originNo3DActiveTool: initActiveTool,
   mipActiveTool: 'MipWWWc',
   // seriesMode序列模式 imageMode图像模式 allImageMode全部模式
   mode: 'seriesMode',
@@ -10609,13 +10610,13 @@ function addTaskPool(series) {
   });
 }
 
-function changePriorityBySeries(seriesInstanceUID) {
+function changePriorityBySeries(seriesInstanceUID, series) {
   if (lastScrollSeriesUid && lastScrollSeriesUid === seriesInstanceUID) {
     return;
   }
 
   lastScrollSeriesUid = seriesInstanceUID;
-  var index = 0;
+  var index = 0; // taskPool中有内容 优先级改变
 
   if (taskPool && taskPool.length > 1) {
     lodash$1.forEachRight(taskPool, function (task) {
@@ -10627,6 +10628,20 @@ function changePriorityBySeries(seriesInstanceUID) {
     });
     changeCurrentTopPriority(index);
     executeSpecificTask();
+  } else {
+    // taskPool中无内容 + cache达到max + 序列第一张不在cache中 重新加载整个序列
+    var cacheInfo = cornerstone.imageCache.getCacheInfo();
+    var maximumSizeInBytes = cacheInfo.maximumSizeInBytes,
+        cacheSizeInBytes = cacheInfo.cacheSizeInBytes;
+
+    if (series && cacheSizeInBytes > maximumSizeInBytes * 0.99) {
+      var firstImageId = series.imageIds[0];
+      var imageLoadObject = cornerstone.imageCache.getImageLoadObject(firstImageId);
+
+      if (!imageLoadObject) {
+        addTaskPool([series]);
+      }
+    }
   }
 }
 
@@ -13326,8 +13341,10 @@ var ImageProcessorWorkerBase = /*#__PURE__*/function () {
   }, {
     key: "getProperSpaceBetweenSlice",
     value: function getProperSpaceBetweenSlice(models) {
-      var first = models[0];
-      var next = models[1];
+      // 取中间的两张来计算
+      var center_index = Math.floor(models.length / 2);
+      var first = models[center_index];
+      var next = models[center_index + 1];
       var sliceCount = Math.max(1, Math.abs(next.instanceNum - first.instanceNum));
       return computeDistance(first.position, next.position) / sliceCount;
     }
@@ -44901,13 +44918,17 @@ var mapStateToProps$c = function mapStateToProps(state) {
       CPR = _state$paladin$tools$.CPR,
       MPR = _state$paladin$tools$.MPR,
       MIP = _state$paladin$tools$.MIP,
-      VR = _state$paladin$tools$.VR;
+      VR = _state$paladin$tools$.VR,
+      activeTool = _state$paladin$tools$.activeTool,
+      originNo3DActiveTool = _state$paladin$tools$.originNo3DActiveTool;
   return {
     currentSeries: currentSeries,
     CPR: CPR,
     MPR: MPR,
     MIP: MIP,
-    VR: VR
+    VR: VR,
+    activeTool: activeTool,
+    originNo3DActiveTool: originNo3DActiveTool
   };
 };
 
@@ -44919,6 +44940,16 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
       VR = propsFromState.VR;
   return _objectSpread$B(_objectSpread$B(_objectSpread$B({}, ownProps), propsFromState), {}, {
     start3D: function start3D(key) {
+      var isThree = MPR || VR || MIP || CPR;
+
+      if (!isThree) {
+        // 从二维进入三维要存一下当前激活工具
+        propsFromDispatch.setActionStateByKey({
+          key: 'originNo3DActiveTool',
+          value: propsFromState.activeTool
+        });
+      }
+
       reset();
       Modal.create( /*#__PURE__*/React__default.createElement(ThreeDLoadingModal, {
         currentSeries: currentSeries,
@@ -44968,7 +44999,7 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
     },
     exit3D: function exit3D(key) {
       // 退出mpr 激活调窗
-      propsFromDispatch.setActiveTool('Wwwc');
+      propsFromDispatch.setActiveTool(propsFromState.originNo3DActiveTool || 'Wwwc');
 
       if (key === 'Surgery') {
         propsFromDispatch.activeDicomFunction('Surgery');
@@ -45002,7 +45033,8 @@ var mergeProps$c = function mergeProps(propsFromState, propsFromDispatch, ownPro
 var ConnectedImageProcessTabTool = reactRedux.connect(mapStateToProps$c, {
   setActiveTool: setActiveTool,
   activeDicomFunction: activeDicomFunction,
-  switchMprPerspective: switchMprPerspective
+  switchMprPerspective: switchMprPerspective,
+  setActionStateByKey: setActionStateByKey
 }, mergeProps$c)(ImageProcessTabTool);
 
 var css_248z$k = ".paladin-reference-tool {\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n  flex: 1;\n  color: #b0b0b0;\n  font-size: 12px;\n  text-align: center;\n  cursor: pointer;\n  padding-left: 20px;\n  border: 1px solid #5b5b5b;\n  border-right: none;\n}\n.paladin-reference-tool:hover {\n  color: #fff;\n}\n.paladin-reference-tool-active {\n  color: #fff;\n  background: #0d5075;\n}\n.paladin-reference-tool-more {\n  padding: 0 7px;\n  height: 100%;\n}\n.paladin-reference-tool-more svg {\n  width: 7px !important;\n  color: #c0c0c0;\n}\n.paladin-reference-tool-more:hover {\n  background: #53585f;\n}\n.paladin-reference-tool-menu {\n  background: #fff;\n}\n.paladin-reference-tool-menu div {\n  padding: 3px 25px;\n  font-size: 14px;\n  color: #53585f;\n  cursor: pointer;\n  white-space: nowrap;\n}\n.paladin-reference-tool-menu div:hover {\n  color: #fff;\n  background: #777777;\n}\n.paladin-reference-tool-menu .paladin-reference-tool-menu-match {\n  color: #fff;\n  background: #7f8592;\n}\n";
@@ -50066,7 +50098,8 @@ var mapStateToProps$p = function mapStateToProps(state) {
       keyImages = _state$paladin$tools$3.keyImages,
       displayShutter = _state$paladin$tools$3.displayShutter,
       Fusion = _state$paladin$tools$3.Fusion,
-      showFilmPrinterEntrance = _state$paladin$tools$3.showFilmPrinterEntrance;
+      showFilmPrinterEntrance = _state$paladin$tools$3.showFilmPrinterEntrance,
+      originNo3DActiveTool = _state$paladin$tools$3.originNo3DActiveTool;
   var isMobile = ua.isDeviceTypeMobile();
   var _state$paladin$viewpo = state.paladin.viewport,
       activeIndex = _state$paladin$viewpo.activeIndex,
@@ -50191,7 +50224,8 @@ var mapStateToProps$p = function mapStateToProps(state) {
     fusionPetColorMap: fusionPetColorMap,
     fusionPetSUV: fusionPetSUV,
     showFilmPrinterEntrance: showFilmPrinterEntrance,
-    language: language
+    language: language,
+    originNo3DActiveTool: originNo3DActiveTool
   };
 };
 
@@ -50518,6 +50552,16 @@ var mergeProps$p = function mergeProps(propsFromState, propsFromDispatch, ownPro
     // scroll重置、激活十字定位线、重置mpr视角
     // 先校验mpr是否可以加载 通过后再进入mpr、vr界面、手术路径规划
     start3D: function start3D(key) {
+      var isThree = MPR || VR || MIP || CPR;
+
+      if (!isThree) {
+        // 从二维进入三维要存一下当前激活工具
+        propsFromDispatch.setActionStateByKey({
+          key: 'originNo3DActiveTool',
+          value: propsFromState.activeTool
+        });
+      }
+
       reset();
       Modal.create( /*#__PURE__*/React__default.createElement(ThreeDLoadingModal, {
         currentSeries: currentSeries,
@@ -50566,8 +50610,8 @@ var mergeProps$p = function mergeProps(propsFromState, propsFromDispatch, ownPro
       });
     },
     exit3D: function exit3D(key) {
-      // 退出mpr 激活调窗
-      propsFromDispatch.setActiveTool('Wwwc');
+      // 退出mpr
+      propsFromDispatch.setActiveTool(propsFromState.originNo3DActiveTool || 'Wwwc');
 
       if (key === 'Surgery') {
         propsFromDispatch.activeDicomFunction('Surgery');
@@ -51405,7 +51449,8 @@ var ConnectedDicomTool = reactRedux.connect(mapStateToProps$p, {
   closeGlobalLoading: closeGlobalLoading,
   toggleDisplayShutter: toggleDisplayShutter,
   setFusionReduxValue: setFusionReduxValue,
-  toggleFilmPrinterEntrance: toggleFilmPrinterEntrance
+  toggleFilmPrinterEntrance: toggleFilmPrinterEntrance,
+  setActionStateByKey: setActionStateByKey
 }, mergeProps$p)(DicomTool);
 
 function _extends$1u() { _extends$1u = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$1u.apply(this, arguments); }
@@ -53982,6 +54027,7 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
     });
 
     defineProperty(assertThisInitialized(_this), "onContextMenu", function (event) {
+      _this.props.onContextMenu && _this.props.onContextMenu(event);
       event.preventDefault();
     });
 
@@ -55787,6 +55833,52 @@ var DicomLayout = /*#__PURE__*/function (_Component) {
       _this.props.changeTaskPoolPriority && _this.props.changeTaskPoolPriority(seriesInstanceUID);
     });
 
+    defineProperty(assertThisInitialized(_this), "handleContextMenu", function (e, index) {
+      e.persist();
+
+      if (isMobile$4) {
+        return;
+      }
+
+      var currentTime = new Date().getTime();
+      var timeSinceLastClick = currentTime - _this.lastRightClickTime;
+
+      if (timeSinceLastClick < 500) {
+        var series = _this.props.series;
+        var selectEle = getElement(index);
+        var toolData = cornerstoneTools.getToolState(selectEle, 'ArrowAnnotate');
+        var active = false;
+
+        if (toolData && toolData.data && toolData.data.length > 0) {
+          var _iterator = _createForOfIteratorHelper$c(toolData.data),
+              _step;
+
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var handler = _step.value;
+
+              if (handler && handler.active) {
+                active = true;
+                return;
+              }
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        }
+
+        if (!active) {
+          _this.props.onViewPortDoubleClick && _this.props.onViewPortDoubleClick(index, series[index]);
+        }
+
+        _this.lastRightClickTime = 0;
+      } else {
+        _this.lastRightClickTime = currentTime;
+      }
+    });
+
     defineProperty(assertThisInitialized(_this), "handleViewPortClick", function (e, index) {
       e.persist();
       var _this$props3 = _this.props,
@@ -55835,12 +55927,12 @@ var DicomLayout = /*#__PURE__*/function (_Component) {
             var active = false;
 
             if (toolData && toolData.data && toolData.data.length > 0) {
-              var _iterator = _createForOfIteratorHelper$c(toolData.data),
-                  _step;
+              var _iterator2 = _createForOfIteratorHelper$c(toolData.data),
+                  _step2;
 
               try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  var handler = _step.value;
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  var handler = _step2.value;
 
                   if (handler && handler.active) {
                     active = true;
@@ -55848,9 +55940,9 @@ var DicomLayout = /*#__PURE__*/function (_Component) {
                   }
                 }
               } catch (err) {
-                _iterator.e(err);
+                _iterator2.e(err);
               } finally {
-                _iterator.f();
+                _iterator2.f();
               }
             }
 
@@ -55867,6 +55959,8 @@ var DicomLayout = /*#__PURE__*/function (_Component) {
 
     _this.clickCount = 0; // 点击次数 判断单双击
 
+    _this.lastRightClickTime = 0; // 右键
+
     _this.clientX = 0; // 上一次点击的记录
 
     _this.clientY = 0; // 上一次点击的记录
@@ -55976,6 +56070,9 @@ var DicomLayout = /*#__PURE__*/function (_Component) {
             onClick: function onClick(e) {
               _this2.handleViewPortClick(e, index);
             },
+            onContextMenu: function onContextMenu(e) {
+              _this2.handleContextMenu(e, index);
+            },
             onMouseWheel: _this2.onMouseWheel,
             handleCtrlSelect: handleCtrlSelect,
             setViewportState: handleViewportState,
@@ -56201,7 +56298,11 @@ var mergeProps$r = function mergeProps(propsFromState, propsFromDispatch, ownPro
     },
     // 滚动的捕获 触发task-pool的排序
     changeTaskPoolPriority: function changeTaskPoolPriority(uid) {
-      changePriorityBySeries(uid);
+      var series = ownProps.series;
+      var selectSeries = lodash$1.find(series, {
+        seriesInstanceUID: uid
+      });
+      changePriorityBySeries(uid, selectSeries);
     },
     // 主界面垂直滚动 修改scrollLine 和 current
     customScrollPan: function customScrollPan(value) {