hellfire 0.23.3 → 0.24.0

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.24.0](http://10.16.100.57/diffusion/115/paladin/compare/v0.23.5...v0.24.0) (2022-08-23)
+
+
+
+## [0.23.5](http://10.16.100.57/diffusion/115/paladin/compare/v0.23.4...v0.23.5) (2022-08-17)
+
+
+
+## [0.23.4](http://10.16.100.57/diffusion/115/paladin/compare/v0.23.3...v0.23.4) (2022-08-15)
+
+
+
 ## [0.23.3](http://10.16.100.57/diffusion/115/paladin/compare/v0.23.2...v0.23.3) (2022-08-15)
 
 

package/dist/index.js

@@ -43607,7 +43607,7 @@ var Cine = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React__default.createElement(Input$1, {
         type: "tel",
         disabled: true,
-        value: cineFps,
+        value: lodash$1.round(cineFps),
         style: {
           textAlign: 'center'
         }
@@ -43723,9 +43723,7 @@ var __signature__$2z = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoa
 };
 
 var mapStateToProps$6 = function mapStateToProps(state) {
-  var _state$paladin$viewpo = state.paladin.viewport,
-      activeIndex = _state$paladin$viewpo.activeIndex,
-      currentSeries = _state$paladin$viewpo.currentSeries;
+  var activeIndex = state.paladin.viewport.activeIndex;
   var _state$paladin$tools$ = state.paladin.tools.action,
       cineFps = _state$paladin$tools$.cineFps,
       Cine = _state$paladin$tools$.Cine,
@@ -43734,8 +43732,7 @@ var mapStateToProps$6 = function mapStateToProps(state) {
     activeElement: getElement(activeIndex),
     cineFps: cineFps,
     Cine: Cine,
-    cineDireaction: cineDireaction,
-    currentSeries: currentSeries
+    cineDireaction: cineDireaction
   };
 };
 
@@ -43743,8 +43740,7 @@ var mergeProps$6 = function mergeProps(propsFromState, propsFromDispatch, ownPro
   var activeElement = propsFromState.activeElement,
       cineFps = propsFromState.cineFps,
       Cine = propsFromState.Cine,
-      cineDireaction = propsFromState.cineDireaction,
-      currentSeries = propsFromState.currentSeries;
+      cineDireaction = propsFromState.cineDireaction;
   var setCineFps = propsFromDispatch.setCineFps,
       setCineDireaction = propsFromDispatch.setCineDireaction,
       activeDicomFunction = propsFromDispatch.activeDicomFunction;
@@ -43765,16 +43761,9 @@ var mergeProps$6 = function mergeProps(propsFromState, propsFromDispatch, ownPro
           break;
 
         case 'forward':
-          var _cineFps = cineFps;
-
-          if (currentSeries.frameFps) {
-            setCineFps(currentSeries.frameFps);
-            _cineFps = currentSeries.frameFps;
-          }
-
           _default$E.autoCine.startAutoCine(activeElement, {
             direction: -1,
-            fps: _cineFps
+            fps: cineFps
           });
           setCineDireaction(-1);
 
@@ -43785,16 +43774,9 @@ var mergeProps$6 = function mergeProps(propsFromState, propsFromDispatch, ownPro
           break;
 
         case 'backward':
-          var __cineFps = cineFps;
-
-          if (currentSeries.frameFps) {
-            setCineFps(currentSeries.frameFps);
-            __cineFps = currentSeries.frameFps;
-          }
-
           _default$E.autoCine.startAutoCine(activeElement, {
             direction: 1,
-            fps: __cineFps
+            fps: cineFps
           });
           setCineDireaction(1);
 
@@ -43810,7 +43792,7 @@ var mergeProps$6 = function mergeProps(propsFromState, propsFromDispatch, ownPro
           break;
 
         case 'fpsAdd':
-          var fps = cineFps < 10 ? cineFps + 1 : 10;
+          var fps = cineFps < 10 ? lodash$1.round(cineFps) + 1 : 10;
           setCineFps(fps); // 如果正在播放 则重置播放属性
 
           if (Cine) {
@@ -43823,7 +43805,7 @@ var mergeProps$6 = function mergeProps(propsFromState, propsFromDispatch, ownPro
           break;
 
         case 'fpsMinus':
-          var _fps = cineFps > 1 ? cineFps - 1 : 1;
+          var _fps = cineFps > 1 ? lodash$1.round(cineFps) - 1 : 1;
 
           setCineFps(_fps);
 
@@ -50754,16 +50736,9 @@ var mergeProps$e = function mergeProps(propsFromState, propsFromDispatch, ownPro
       if (Cine) {
         _default$E.autoCine.stopAutoCine();
       } else {
-        var _cineFps = cineFps;
-
-        if (currentSeries.frameFps) {
-          propsFromDispatch.setCineFps(currentSeries.frameFps);
-          _cineFps = currentSeries.frameFps;
-        }
-
         _default$E.autoCine.startAutoCine(activeElement, {
           direction: 1,
-          fps: _cineFps
+          fps: cineFps
         });
         propsFromDispatch.setCineDireaction(1);
       }
@@ -51311,8 +51286,7 @@ var ConnectedDicomTool = reactRedux.connect(mapStateToProps$e, {
   closeOnePickLayout: closeOnePickLayout,
   setActiveIndex: setActiveIndex,
   setLayout: setLayout,
-  setLastLayout: setLastLayout,
-  setCineFps: setCineFps
+  setLastLayout: setLastLayout
 }, mergeProps$e)(DicomTool);
 var _default$11 = ConnectedDicomTool;
 
@@ -56068,38 +56042,87 @@ var mergeProps$g = function mergeProps(propsFromState, propsFromDispatch, ownPro
     },
     // 需求：当前选中的序列默认在同步中
     // 当同步未开启，mousedown时把即将激活的元素加入sync中
-    onViewPortCellClick: function onViewPortCellClick(e, index, series) {
-      var activeIndex = propsFromState.activeIndex,
-          Sync = propsFromState.Sync;
+    onViewPortCellClick: function () {
+      var _onViewPortCellClick = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(e, index, series) {
+        var activeIndex, Sync, oldActiveElement, element, dicom, frameTime;
+        return regenerator.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                activeIndex = propsFromState.activeIndex, Sync = propsFromState.Sync;
 
-      if (!Sync && !e.ctrlKey && e.button === 0) {
-        if (!_.includes(linkSeriesIndex, activeIndex)) {
-          var oldActiveElement = getElement(activeIndex);
+                if (!(!Sync && !e.ctrlKey && e.button === 0)) {
+                  _context.next = 14;
+                  break;
+                }
 
-          if (!oldActiveElement) {
-            return;
-          }
+                if (_.includes(linkSeriesIndex, activeIndex)) {
+                  _context.next = 8;
+                  break;
+                }
 
-          linkSynchronizer.remove(oldActiveElement);
-          linkScrollSynchronizer.remove(oldActiveElement);
-        }
+                oldActiveElement = getElement(activeIndex);
 
-        if (!_.includes(linkSeriesIndex, index)) {
-          var element = getElement(index);
+                if (oldActiveElement) {
+                  _context.next = 6;
+                  break;
+                }
 
-          if (!element) {
-            return;
-          }
+                return _context.abrupt("return");
 
-          linkSynchronizer.add(element);
-          linkScrollSynchronizer.add(element);
-        }
-      } // 单击 1.激活当前影像框 2.设置当前series
+              case 6:
+                linkSynchronizer.remove(oldActiveElement);
+                linkScrollSynchronizer.remove(oldActiveElement);
 
+              case 8:
+                if (_.includes(linkSeriesIndex, index)) {
+                  _context.next = 14;
+                  break;
+                }
 
-      propsFromDispatch.setActiveIndex(index);
-      propsFromDispatch.setCurrentSeries(series);
-    },
+                element = getElement(index);
+
+                if (element) {
+                  _context.next = 12;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 12:
+                linkSynchronizer.add(element);
+                linkScrollSynchronizer.add(element);
+
+              case 14:
+                // 单击 1.激活当前影像框 2.设置当前series
+                propsFromDispatch.setActiveIndex(index);
+                propsFromDispatch.setCurrentSeries(series); // 如果有frameTime的话设置fps
+
+                _context.next = 18;
+                return loadAndCacheDicom(series.imageIds[0]);
+
+              case 18:
+                dicom = _context.sent;
+
+                if (dicom && dicom.FrameTime && dicom.FrameTime.value) {
+                  frameTime = dicom.FrameTime.value;
+                  propsFromDispatch.setCineFps(lodash$1.round(1000 / frameTime, 3) || 3);
+                }
+
+              case 20:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      function onViewPortCellClick(_x, _x2, _x3) {
+        return _onViewPortCellClick.apply(this, arguments);
+      }
+
+      return onViewPortCellClick;
+    }(),
     onDrop: function onDrop(ev, i, stack) {
       // 下方缩略图拖动到布局中的回调
       // 功能注释同ConnectedDicomThumbnail.js中的selectThumb
@@ -56130,7 +56153,8 @@ var ConnectedDicomLayout = reactRedux.connect(mapStateToProps$h, {
   setScrollLine: setScrollLine,
   setLinkSeries: setLinkSeries,
   openOnePickLayout: openOnePickLayout,
-  closeOnePickLayout: closeOnePickLayout
+  closeOnePickLayout: closeOnePickLayout,
+  setCineFps: setCineFps
 }, mergeProps$g)(DicomLayout);
 var _default$17 = ConnectedDicomLayout;
 
@@ -60115,7 +60139,7 @@ var mergeProps$o = function mergeProps(propsFromState, propsFromDispatch, ownPro
     },
     initSeries: function () {
       var _initSeries2 = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(changeStudy, callback) {
-        var data, synchronizer, linkSynchronizer, linkImageModeSynchronizer, linkScrollSynchronizer, options, _study, series, needCheckMultiFrame, hasMultiFrame, i, item, wado, url, dataSet, numFrames, imageIds, _i, imageId, frameTime, fps, seriesCurrentIndex, firstReady, maxRequest, retry, clearCacheEveryLoad;
+        var data, synchronizer, linkSynchronizer, linkImageModeSynchronizer, linkScrollSynchronizer, options, _study, series, needCheckMultiFrame, hasMultiFrame, i, item, wado, url, dataSet, numFrames, imageIds, _i, imageId, seriesCurrentIndex, firstReady, maxRequest, retry, clearCacheEveryLoad, dicom, frameTime;
 
         return regenerator.wrap(function _callee$(_context) {
           while (1) {
@@ -60132,6 +60156,7 @@ var mergeProps$o = function mergeProps(propsFromState, propsFromDispatch, ownPro
                  * - 设置当前series
                  * - 初始化viewport缓存池
                  * - 初始化图像预加载
+                 * - 如果有frameTime的话设置fps
                  *
                  * 检查io是否为true是的话打开同屏开关
                  */
@@ -60240,17 +60265,14 @@ var mergeProps$o = function mergeProps(propsFromState, propsFromDispatch, ownPro
                     imageIds.push(imageId);
                   }
 
-                  frameTime = dataSet.intString('x00181063');
-                  fps = parseInt(1000 / frameTime, 10) || 3;
                   series[i] = _objectSpread$M(_objectSpread$M({}, item), {}, {
                     imageIds: imageIds,
                     numberOfSeriesRelatedInstances: numFrames,
-                    isMultiFrame: true,
-                    frameFps: fps
+                    isMultiFrame: true
                   });
                 }
 
-                cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.unload(url);
+                cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.purge();
 
               case 38:
                 i++;
@@ -60311,9 +60333,20 @@ var mergeProps$o = function mergeProps(propsFromState, propsFromDispatch, ownPro
                   study: [_objectSpread$M(_objectSpread$M({}, ownProps.study[0]), {}, {
                     series: series
                   })]
-                });
+                }); // 如果有frameTime的话设置fps
 
-              case 54:
+                _context.next = 56;
+                return loadAndCacheDicom(series[0].imageIds[0]);
+
+              case 56:
+                dicom = _context.sent;
+
+                if (dicom && dicom.FrameTime && dicom.FrameTime.value) {
+                  frameTime = dicom.FrameTime.value;
+                  propsFromDispatch.setCineFps(lodash$1.round(1000 / frameTime, 3) || 3);
+                }
+
+              case 58:
               case "end":
                 return _context.stop();
             }
@@ -60333,11 +60366,20 @@ var mergeProps$o = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
       if (onePickMode) {
         propsFromDispatch.closeOnePickLayout();
-      } // 清除image缓存和dicom缓存
+      } // 清除dicom缓存
 
 
-      cornerstone.imageCache.purgeCache();
-      purgeDicomCache();
+      purgeDicomCache(); // 清除imageCache时做判断，超出60%的时候删除前30%
+
+      var cacheInfo = cornerstone.imageCache.getCacheInfo();
+      var maximumSizeInBytes = cacheInfo.maximumSizeInBytes,
+          cacheSizeInBytes = cacheInfo.cacheSizeInBytes;
+
+      if (cacheSizeInBytes > maximumSizeInBytes * 0.6) {
+        // 暂未找到更合适的接口,setMaximumSizeBytes时会触发purgeCacheIfNecessary,可以达到效果
+        cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes * 0.3);
+        cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes);
+      }
     },
     // 匹配序列 切换到指定图像位置
     scrollSeriesImageToIndex: function scrollSeriesImageToIndex(seriesUID, SOPInstanceUID) {
@@ -60382,7 +60424,8 @@ var ConnectedDicomView = reactRedux.connect(mapStateToProps$p, {
   activeDicomFunction: activeDicomFunction,
   openIO: openIO,
   closeIO: closeIO,
-  setActiveTool: setActiveTool
+  setActiveTool: setActiveTool,
+  setCineFps: setCineFps
 }, mergeProps$o, withRef())(DicomView);
 
 function withRef() {