hellfire 0.23.2 → 0.23.5

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.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)
+
+
+
 ## [0.23.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.23.1...v0.23.2) (2022-08-11)
 
 

package/dist/index.js

@@ -30542,7 +30542,6 @@ var _default$x = function _default(element) {
 var __signature__$1N = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
-var scrollToIndex$1 = cornerstoneTools.importInternal('util/scrollToIndex');
 var getToolState$f = cornerstoneTools.getToolState;
 var globalCineTimer;
 
@@ -30576,7 +30575,7 @@ function startAutoCine(activeElement, options) {
       newImageIndex = max;
     }
 
-    scrollToIndex$1(activeElement, newImageIndex);
+    cornerstoneTools.scrollToIndex(activeElement, newImageIndex);
   }, timeStap);
 }
 
@@ -30599,7 +30598,6 @@ var _default$y = {
     return;
   }
 
-  reactHotLoader.register(scrollToIndex$1, "scrollToIndex", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/custom/autoCine.js");
   reactHotLoader.register(getToolState$f, "getToolState", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/custom/autoCine.js");
   reactHotLoader.register(globalCineTimer, "globalCineTimer", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/custom/autoCine.js");
   reactHotLoader.register(startAutoCine, "startAutoCine", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/custom/autoCine.js");
@@ -43609,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'
         }
@@ -43794,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) {
@@ -43807,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);
 
@@ -44377,7 +44375,8 @@ var mapStateToProps$9 = function mapStateToProps(state) {
     activeElement: activeElement,
     MPR: MPR,
     mode: mode,
-    Surgery: Surgery
+    Surgery: Surgery,
+    CPR: CPR
   };
 };
 
@@ -44389,7 +44388,8 @@ var mergeProps$9 = function mergeProps(propsFromState, propsFromDispatch, ownPro
   var activeElement = propsFromState.activeElement,
       MPR = propsFromState.MPR,
       mode = propsFromState.mode,
-      Surgery = propsFromState.Surgery;
+      Surgery = propsFromState.Surgery,
+      CPR = propsFromState.CPR;
   return _objectSpread$t(_objectSpread$t({}, ownProps), {}, {
     onRowClick: function onRowClick(key) {
       switch (key) {
@@ -44399,6 +44399,11 @@ var mergeProps$9 = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
         case 'zoom':
           resetZoom(activeElement, MPR);
+
+          if (MPR || Surgery || CPR) {
+            set('scale')(activeElement, 0);
+          }
+
           break;
 
         case 'pan':
@@ -44416,7 +44421,7 @@ var mergeProps$9 = function mergeProps(propsFromState, propsFromDispatch, ownPro
         case 'all':
           reset$1(activeElement, mode);
 
-          if (MPR || Surgery) {
+          if (MPR || Surgery || CPR) {
             set('scale')(activeElement, 0);
           }
 
@@ -50262,7 +50267,7 @@ function _objectSpread$B(target) { for (var i = 1; i < arguments.length; i++) {
 var __signature__$2$ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
-var scrollToIndex$2 = _default$E.importInternal('util/scrollToIndex');
+var scrollToIndex$1 = _default$E.scrollToIndex;
 
 var mapStateToProps$e = function mapStateToProps(state) {
   var _state$paladin$tools$ = state.paladin.tools.customization,
@@ -50453,11 +50458,10 @@ var mergeProps$e = function mergeProps(propsFromState, propsFromDispatch, ownPro
     reset: function reset() {
       // 重置
       var activeElement = getElement(realActiveIndex);
-      console.log('activeElement', activeElement);
 
       reset$1(activeElement, mode);
 
-      if (MPR || Surgery) {
+      if (MPR || Surgery || CPR) {
         set('scale')(activeElement, 0);
       }
     },
@@ -50486,7 +50490,7 @@ var mergeProps$e = function mergeProps(propsFromState, propsFromDispatch, ownPro
         prevIndex = maxIndex;
       }
 
-      scrollToIndex$2(activeElement, prevIndex);
+      scrollToIndex$1(activeElement, prevIndex);
     },
     nextImage: function nextImage() {
       // 下一张
@@ -50510,7 +50514,7 @@ var mergeProps$e = function mergeProps(propsFromState, propsFromDispatch, ownPro
         nextIndex = 0;
       }
 
-      scrollToIndex$2(activeElement, nextIndex);
+      scrollToIndex$1(activeElement, nextIndex);
     },
     // 切换模式
     // key: 1.SeriesMode返回序列模式 2.ImageMode进入图像模式
@@ -50686,7 +50690,7 @@ var mergeProps$e = function mergeProps(propsFromState, propsFromDispatch, ownPro
               case 34:
                 if (links && links.length > 0) {
                   lodash$1.forEach(links, function (link) {
-                    scrollToIndex$2(getElement(link), _currentImageIdIndex);
+                    scrollToIndex$1(getElement(link), _currentImageIdIndex);
                   });
                 }
 
@@ -51293,7 +51297,7 @@ var _default$11 = ConnectedDicomTool;
     return;
   }
 
-  reactHotLoader.register(scrollToIndex$2, "scrollToIndex", "/Users/huyeqing/workspace/chainz/paladin/src/Viewer/DicomTool/ConnectedDicomTool.js");
+  reactHotLoader.register(scrollToIndex$1, "scrollToIndex", "/Users/huyeqing/workspace/chainz/paladin/src/Viewer/DicomTool/ConnectedDicomTool.js");
   reactHotLoader.register(mapStateToProps$e, "mapStateToProps", "/Users/huyeqing/workspace/chainz/paladin/src/Viewer/DicomTool/ConnectedDicomTool.js");
   reactHotLoader.register(mergeProps$e, "mergeProps", "/Users/huyeqing/workspace/chainz/paladin/src/Viewer/DicomTool/ConnectedDicomTool.js");
   reactHotLoader.register(ConnectedDicomTool, "ConnectedDicomTool", "/Users/huyeqing/workspace/chainz/paladin/src/Viewer/DicomTool/ConnectedDicomTool.js");
@@ -56038,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
@@ -56100,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;
 
@@ -60085,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, 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) {
@@ -60102,6 +60156,7 @@ var mergeProps$o = function mergeProps(propsFromState, propsFromDispatch, ownPro
                  * - 设置当前series
                  * - 初始化viewport缓存池
                  * - 初始化图像预加载
+                 * - 如果有frameTime的话设置fps
                  *
                  * 检查io是否为true是的话打开同屏开关
                  */
@@ -60217,7 +60272,7 @@ var mergeProps$o = function mergeProps(propsFromState, propsFromDispatch, ownPro
                   });
                 }
 
-                cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.unload(url);
+                cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.purge();
 
               case 38:
                 i++;
@@ -60278,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();
             }
@@ -60349,7 +60415,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() {