hellfire 0.23.2 → 0.23.3

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.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");
@@ -43725,7 +43723,9 @@ var __signature__$2z = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoa
 };
 
 var mapStateToProps$6 = function mapStateToProps(state) {
-  var activeIndex = state.paladin.viewport.activeIndex;
+  var _state$paladin$viewpo = state.paladin.viewport,
+      activeIndex = _state$paladin$viewpo.activeIndex,
+      currentSeries = _state$paladin$viewpo.currentSeries;
   var _state$paladin$tools$ = state.paladin.tools.action,
       cineFps = _state$paladin$tools$.cineFps,
       Cine = _state$paladin$tools$.Cine,
@@ -43734,7 +43734,8 @@ var mapStateToProps$6 = function mapStateToProps(state) {
     activeElement: getElement(activeIndex),
     cineFps: cineFps,
     Cine: Cine,
-    cineDireaction: cineDireaction
+    cineDireaction: cineDireaction,
+    currentSeries: currentSeries
   };
 };
 
@@ -43742,7 +43743,8 @@ var mergeProps$6 = function mergeProps(propsFromState, propsFromDispatch, ownPro
   var activeElement = propsFromState.activeElement,
       cineFps = propsFromState.cineFps,
       Cine = propsFromState.Cine,
-      cineDireaction = propsFromState.cineDireaction;
+      cineDireaction = propsFromState.cineDireaction,
+      currentSeries = propsFromState.currentSeries;
   var setCineFps = propsFromDispatch.setCineFps,
       setCineDireaction = propsFromDispatch.setCineDireaction,
       activeDicomFunction = propsFromDispatch.activeDicomFunction;
@@ -43763,9 +43765,16 @@ 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);
 
@@ -43776,9 +43785,16 @@ 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);
 
@@ -44377,7 +44393,8 @@ var mapStateToProps$9 = function mapStateToProps(state) {
     activeElement: activeElement,
     MPR: MPR,
     mode: mode,
-    Surgery: Surgery
+    Surgery: Surgery,
+    CPR: CPR
   };
 };
 
@@ -44389,7 +44406,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 +44417,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 +44439,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 +50285,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 +50476,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 +50508,7 @@ var mergeProps$e = function mergeProps(propsFromState, propsFromDispatch, ownPro
         prevIndex = maxIndex;
       }
 
-      scrollToIndex$2(activeElement, prevIndex);
+      scrollToIndex$1(activeElement, prevIndex);
     },
     nextImage: function nextImage() {
       // 下一张
@@ -50510,7 +50532,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 +50708,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);
                   });
                 }
 
@@ -50732,9 +50754,16 @@ 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);
       }
@@ -51282,7 +51311,8 @@ var ConnectedDicomTool = reactRedux.connect(mapStateToProps$e, {
   closeOnePickLayout: closeOnePickLayout,
   setActiveIndex: setActiveIndex,
   setLayout: setLayout,
-  setLastLayout: setLastLayout
+  setLastLayout: setLastLayout,
+  setCineFps: setCineFps
 }, mergeProps$e)(DicomTool);
 var _default$11 = ConnectedDicomTool;
 
@@ -51293,7 +51323,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");
@@ -60085,7 +60115,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, frameTime, fps, seriesCurrentIndex, firstReady, maxRequest, retry, clearCacheEveryLoad;
 
         return regenerator.wrap(function _callee$(_context) {
           while (1) {
@@ -60210,10 +60240,13 @@ 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
+                    isMultiFrame: true,
+                    frameFps: fps
                   });
                 }