hellfire 0.27.9 → 0.27.10

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.27.10](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.9...v0.27.10) (2024-04-08)
+
+
+
 ## [0.27.9](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.8...v0.27.9) (2024-01-02)
 
 

package/dist/index.js

@@ -45550,6 +45550,117 @@ function getMinMaxPixelData(pixels) {
   return [minPixelValue, maxPixelValue];
 }
 
+var scrollToIndex$3 = cornerstoneTools.scrollToIndex;
+/**
+ * 过滤出要联动的element:
+ * 1.numberOfSeriesRelatedInstances相同
+ * 2.两个层平行
+ * 过滤后:
+ * 1.手动同步一次当前instance索引
+ * 2.同步links到redux
+ * 3.同步links到Synchronizer
+ */
+
+function openAutoLink (_x) {
+  return _ref$1m.apply(this, arguments);
+}
+
+function _ref$1m() {
+  _ref$1m = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(props) {
+    var col, row, currentScrollLine, activeIndex, seriesCurrentIndex, series, setLinkSeries, linkSynchronizer, linkScrollSynchronizer, realActiveIndex, realSeriesIndex, _currentImageIdIndex, _currentSeries, currentImageId, currentDicom, currentPos, links, startIndex, endIndex, currentLayoutSeries, _series, i, seriesItem, imageId, dicom, comparePos, angle, activeElement;
+
+    return regenerator.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            col = props.col, row = props.row, currentScrollLine = props.currentScrollLine, activeIndex = props.activeIndex, seriesCurrentIndex = props.seriesCurrentIndex, series = props.series, setLinkSeries = props.setLinkSeries, linkSynchronizer = props.linkSynchronizer, linkScrollSynchronizer = props.linkScrollSynchronizer, realActiveIndex = props.realActiveIndex;
+            realSeriesIndex = col * currentScrollLine + activeIndex;
+            _currentImageIdIndex = seriesCurrentIndex[realSeriesIndex];
+            _currentSeries = series[realSeriesIndex];
+            currentImageId = _currentSeries.imageIds[_currentImageIdIndex];
+            _context.next = 7;
+            return loadAndCacheDicom(currentImageId);
+
+          case 7:
+            currentDicom = _context.sent;
+            currentPos = getPosFromDicom(currentDicom);
+            links = [];
+
+            if (!currentPos) {
+              _context.next = 28;
+              break;
+            }
+
+            // 当前layout中的series集合
+            startIndex = col * currentScrollLine;
+            endIndex = startIndex + col * row;
+            currentLayoutSeries = series.slice(startIndex, endIndex);
+            _series = lodash$1.cloneDeep(currentLayoutSeries);
+            i = 0;
+
+          case 16:
+            if (!(i < _series.length)) {
+              _context.next = 28;
+              break;
+            }
+
+            seriesItem = _series[i];
+
+            if (!(seriesItem.seriesInstanceUID !== _currentSeries.seriesInstanceUID && seriesItem.numberOfSeriesRelatedInstances === _currentSeries.numberOfSeriesRelatedInstances)) {
+              _context.next = 25;
+              break;
+            }
+
+            imageId = seriesItem.imageIds[_currentImageIdIndex];
+            _context.next = 22;
+            return loadAndCacheDicom(imageId);
+
+          case 22:
+            dicom = _context.sent;
+            comparePos = getPosFromDicom(dicom);
+
+            if (comparePos) {
+              angle = comparePosSameLayer(currentPos, comparePos);
+
+              if (angle === 0) {
+                links.push(i);
+              }
+            }
+
+          case 25:
+            i++;
+            _context.next = 16;
+            break;
+
+          case 28:
+            if (links && links.length > 0) {
+              lodash$1.forEach(links, function (link) {
+                scrollToIndex$3(getElement(link), _currentImageIdIndex);
+              });
+            }
+
+            setLinkSeries(links);
+            activeElement = getElement(realActiveIndex);
+
+            if (links && links.length > 0) {
+              lodash$1.forEach(links, function (link) {
+                linkSynchronizer.add(getElement(link));
+                linkScrollSynchronizer.add(getElement(link));
+              });
+              linkSynchronizer.add(activeElement);
+              linkScrollSynchronizer.add(activeElement);
+            }
+
+          case 32:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _ref$1m.apply(this, arguments);
+}
+
 function _createForOfIteratorHelper$9(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$b(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray$b(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$b(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$b(o, minLen); }
@@ -45559,7 +45670,7 @@ function _arrayLikeToArray$b(arr, len) { if (len == null || len > arr.length) le
 function ownKeys$H(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$I(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$H(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$H(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-var scrollToIndex$3 = cornerstoneTools.scrollToIndex;
+var scrollToIndex$4 = cornerstoneTools.scrollToIndex;
 
 var mapStateToProps$j = function mapStateToProps(state) {
   var _state$paladin$tools$ = state.paladin.tools.customization,
@@ -45846,7 +45957,7 @@ var mergeProps$j = function mergeProps(propsFromState, propsFromDispatch, ownPro
         prevIndex = maxIndex;
       }
 
-      scrollToIndex$3(activeElement, prevIndex);
+      scrollToIndex$4(activeElement, prevIndex);
     },
     nextImage: function nextImage() {
       // 下一张
@@ -45870,7 +45981,7 @@ var mergeProps$j = function mergeProps(propsFromState, propsFromDispatch, ownPro
         nextIndex = 0;
       }
 
-      scrollToIndex$3(activeElement, nextIndex);
+      scrollToIndex$4(activeElement, nextIndex);
     },
     // 切换模式
     // key: 1.SeriesMode返回序列模式 2.ImageMode进入图像模式
@@ -45952,8 +46063,7 @@ var mergeProps$j = function mergeProps(propsFromState, propsFromDispatch, ownPro
     },
     autoLink: function () {
       var _autoLink = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(refresh) {
-        var setLinkSeries, realSeriesIndex, _currentImageIdIndex, _currentSeries, currentImageId, currentDicom, currentPos, links, startIndex, endIndex, currentLayoutSeries, _series, i, seriesItem, imageId, dicom, comparePos, angle, activeElement;
-
+        var setLinkSeries;
         return regenerator.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -45963,106 +46073,30 @@ var mergeProps$j = function mergeProps(propsFromState, propsFromDispatch, ownPro
                 linkSynchronizer.destroy();
                 linkScrollSynchronizer.destroy();
 
-                if (!(Link && !refresh)) {
-                  _context.next = 7;
-                  break;
-                }
-
-                // 关闭
-                setLinkSeries([]);
-                _context.next = 38;
-                break;
-
-              case 7:
-                // 开启 or 刷新
-
-                /**
-                 * 过滤出要联动的element:
-                 * 1.numberOfSeriesRelatedInstances相同
-                 * 2.两个层平行
-                 * 过滤后:
-                 * 1.手动同步一次当前instance索引
-                 * 2.同步links到redux
-                 * 3.同步links到Synchronizer
-                 */
-                realSeriesIndex = col * currentScrollLine + activeIndex;
-                _currentImageIdIndex = seriesCurrentIndex[realSeriesIndex];
-                _currentSeries = series[realSeriesIndex];
-                currentImageId = _currentSeries.imageIds[_currentImageIdIndex];
-                _context.next = 13;
-                return loadAndCacheDicom(currentImageId);
-
-              case 13:
-                currentDicom = _context.sent;
-                currentPos = getPosFromDicom(currentDicom);
-                links = [];
-
-                if (!currentPos) {
-                  _context.next = 34;
-                  break;
-                }
-
-                // 当前layout中的series集合
-                startIndex = col * currentScrollLine;
-                endIndex = startIndex + col * row;
-                currentLayoutSeries = series.slice(startIndex, endIndex);
-                _series = lodash$1.cloneDeep(currentLayoutSeries);
-                i = 0;
-
-              case 22:
-                if (!(i < _series.length)) {
-                  _context.next = 34;
-                  break;
-                }
-
-                seriesItem = _series[i];
-
-                if (!(seriesItem.seriesInstanceUID !== _currentSeries.seriesInstanceUID && seriesItem.numberOfSeriesRelatedInstances === _currentSeries.numberOfSeriesRelatedInstances)) {
-                  _context.next = 31;
-                  break;
-                }
-
-                imageId = seriesItem.imageIds[_currentImageIdIndex];
-                _context.next = 28;
-                return loadAndCacheDicom(imageId);
-
-              case 28:
-                dicom = _context.sent;
-                comparePos = getPosFromDicom(dicom);
-
-                if (comparePos) {
-                  angle = comparePosSameLayer(currentPos, comparePos);
-
-                  if (angle === 0) {
-                    links.push(i);
-                  }
-                }
-
-              case 31:
-                i++;
-                _context.next = 22;
-                break;
-
-              case 34:
-                if (links && links.length > 0) {
-                  lodash$1.forEach(links, function (link) {
-                    scrollToIndex$3(getElement(link), _currentImageIdIndex);
-                  });
-                }
-
-                setLinkSeries(links);
-                activeElement = getElement(realActiveIndex);
-
-                if (links && links.length > 0) {
-                  lodash$1.forEach(links, function (link) {
-                    linkSynchronizer.add(getElement(link));
-                    linkScrollSynchronizer.add(getElement(link));
+                if (Link && !refresh) {
+                  // 关闭
+                  window.localStorage.setItem('hellfire-link-tool-default-state', 'close');
+                  setLinkSeries([]);
+                } else {
+                  // 开启 or 刷新
+                  // 1.本地记忆联动的初始状态
+                  window.localStorage.setItem('hellfire-link-tool-default-state', 'open'); // 2.处理
+
+                  openAutoLink({
+                    col: col,
+                    row: row,
+                    currentScrollLine: currentScrollLine,
+                    activeIndex: activeIndex,
+                    seriesCurrentIndex: seriesCurrentIndex,
+                    series: series,
+                    setLinkSeries: setLinkSeries,
+                    linkSynchronizer: linkSynchronizer,
+                    linkScrollSynchronizer: linkScrollSynchronizer,
+                    realActiveIndex: realActiveIndex
                   });
-                  linkSynchronizer.add(activeElement);
-                  linkScrollSynchronizer.add(activeElement);
                 }
 
-              case 38:
+              case 4:
               case "end":
                 return _context.stop();
             }
@@ -46841,7 +46875,7 @@ styleInject$1(css_248z$r);
 
 function _extends$1o() { _extends$1o = 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$1o.apply(this, arguments); }
 
-var _ref$1m = /*#__PURE__*/React__default.createElement("path", {
+var _ref$1n = /*#__PURE__*/React__default.createElement("path", {
   d: "M3658.026 10.064c5.915-.329 11.359 2.241 14.432 6.357l-5.498 2.292 14.488 7.78 4.678-15.768-5.437 2.266c-4.491-7.516-13.347-12.235-23.194-11.634-12.153.737-22.056 9.888-23.034 21.285l8.693.746c.612-7.121 7.003-12.847 14.872-13.324zM3661.635 45.864c-6.105.345-11.715-2.402-14.729-6.753l4.887-2.037-13.401-7.196-4.324 14.584 4.657-1.941c4.157 7.321 12.398 12.102 21.752 12.102.558 0 1.121-.017 1.687-.051 12.151-.737 22.054-9.888 23.032-21.285l-8.691-.746c-.615 7.12-7.005 12.846-14.87 13.323z"
 });
 
@@ -46850,7 +46884,7 @@ const SvgRefresh$1 = props => /*#__PURE__*/React__default.createElement("svg", _
   height: 56,
   viewBox: "3630 0 60 56",
   fill: "currentColor"
-}, props), _ref$1m);
+}, props), _ref$1n);
 
 var css_248z$s = ".loadingIndicator {\n  position: absolute;\n  top: 0;\n  background: black;\n  opacity: 1;\n  width: 100%;\n  height: 100%;\n  text-align: center;\n  z-index: 1;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\n.loadingIndicator .lds-ring {\n  color: #999;\n  position: absolute;\n  left: 0;\n  right: 0;\n  top: 0;\n  bottom: 0;\n  width: 40px;\n  height: 40px;\n  margin: auto;\n}\n.loadingIndicator .lds-ring div {\n  box-sizing: border-box;\n  display: block;\n  position: absolute;\n  width: 40px;\n  height: 40px;\n  border: 4px solid silver;\n  border-radius: 50%;\n  animation: lds-ring 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;\n  border-color: silver transparent transparent transparent;\n}\n.loadingIndicator .lds-ring div:nth-child(1) {\n  animation-delay: -0.45s;\n}\n.loadingIndicator .lds-ring div:nth-child(2) {\n  animation-delay: -0.3s;\n}\n.loadingIndicator .lds-ring div:nth-child(3) {\n  animation-delay: -0.15s;\n}\n@keyframes lds-ring {\n  0% {\n    transform: rotate(0deg);\n  }\n  100% {\n    transform: rotate(360deg);\n  }\n}\n.loadingIndicator .loadingIndicator-retry {\n  width: 40px;\n  color: #999;\n  margin: 0 auto;\n  font-size: 14px;\n}\n.loadingIndicator .indicatorContents h4 {\n  font-size: 18px;\n  margin: 0 auto 10px 0;\n}\n.loadingIndicator .indicatorContents h5 {\n  font-size: 16px;\n  margin: 0 auto 10px 0;\n}\n.loadingIndicator .indicatorContents p {\n  margin: 4px auto;\n  color: #999;\n  font-size: 14px;\n}\n.loadingIndicator .indicatorContents .loadingIndicator-retry {\n  width: 40px;\n  margin: 20px auto 0 auto;\n}\n.loadingIndicator .indicatorContents-mini h4 {\n  color: #fff;\n  font-size: 12px;\n  margin: 5px 0 5px 0;\n}\n.loadingIndicator .indicatorContents-mini .loadingIndicator-retry {\n  width: 20px;\n  font-size: 12px;\n}\n";
 styleInject$1(css_248z$s);
@@ -47821,7 +47855,7 @@ styleInject$1(css_248z$u);
 
 function _extends$1p() { _extends$1p = 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$1p.apply(this, arguments); }
 
-var _ref$1n = /*#__PURE__*/React__default.createElement("path", {
+var _ref$1o = /*#__PURE__*/React__default.createElement("path", {
   d: "M30.054 23.768l-2.964 2.946q-.339.339-.804.339t-.804-.339L16 17.232l-9.482 9.482q-.339.339-.804.339t-.804-.339l-2.964-2.946q-.339-.339-.339-.813t.339-.813L15.196 8.91q.339-.339.804-.339t.804.339l13.25 13.232q.339.339.339.813t-.339.813z"
 });
 
@@ -47830,11 +47864,11 @@ const SvgChevronUp = props => /*#__PURE__*/React__default.createElement("svg", _
   height: 32,
   viewBox: "0 0 32 32",
   fill: "currentColor"
-}, props), _ref$1n);
+}, props), _ref$1o);
 
 function _extends$1q() { _extends$1q = 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$1q.apply(this, arguments); }
 
-var _ref$1o = /*#__PURE__*/React__default.createElement("path", {
+var _ref$1p = /*#__PURE__*/React__default.createElement("path", {
   d: "M30.054 14.429l-13.25 13.232Q16.465 28 16 28t-.804-.339L1.946 14.429q-.339-.339-.339-.813t.339-.813L4.91 9.857q.339-.339.804-.339t.804.339L16 19.339l9.482-9.482q.339-.339.804-.339t.804.339l2.964 2.946q.339.339.339.813t-.339.813z"
 });
 
@@ -47843,7 +47877,7 @@ const SvgChevronDown = props => /*#__PURE__*/React__default.createElement("svg",
   height: 32,
   viewBox: "0 0 32 32",
   fill: "currentColor"
-}, props), _ref$1o);
+}, props), _ref$1p);
 
 var css_248z$v = ".paladin-aiTips-wrapper {\n  width: 100%;\n  height: 100%;\n}\n.paladin-aiTips-content {\n  width: 1px;\n  height: 100%;\n  background: #ffff00;\n  position: absolute;\n  top: 0;\n}\n";
 styleInject$1(css_248z$v);
@@ -54614,6 +54648,10 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
   var getCurrentElement = function getCurrentElement() {
     return getActiveElement(mode, activeIndex, imageActiveIndex, threeDMode, mprActiveIndex, Surgery, surgeryActiveIndex, CPR);
   };
+
+  var getCurrentRealActiveIndex = function getCurrentRealActiveIndex() {
+    return getRealActiveIndex(mode, activeIndex, imageActiveIndex, MPR, mprActiveIndex, Surgery, surgeryActiveIndex, CPR);
+  };
   /**
    * 前进、后退快捷键，加入频率控制
    * 频率依据序列数量决定
@@ -55005,7 +55043,7 @@ var mergeProps$t = 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, modalitiesInStudy, i, item, wado, url, dataSet, numFrames, imageIds, _i, imageId, seriesCurrentIndex, firstReady, maxRequest, retry, clearCacheEveryLoad, dicom, frameTime;
+        var data, 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, toolLocalDefaultState, realActiveIndex;
 
         return regenerator.wrap(function _callee$(_context) {
           while (1) {
@@ -55023,6 +55061,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                  * - 初始化viewport缓存池
                  * - 初始化图像预加载
                  * - 如果有frameTime的话设置fps
+                 * - 初始化本地存储的工具初始状态（目前包含：自动联动）
                  *
                  * 检查io是否为true是的话打开同屏开关
                  */
@@ -55221,9 +55260,29 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                 if (dicom && dicom.FrameTime && dicom.FrameTime.value) {
                   frameTime = dicom.FrameTime.value;
                   propsFromDispatch.setCineFps(lodash$1.round(1000 / frameTime, 3) || 3);
+                } // 初始化本地存储的工具初始状态（目前包含：自动联动）
+
+
+                toolLocalDefaultState = window.localStorage.getItem('hellfire-link-tool-default-state');
+
+                if (toolLocalDefaultState && toolLocalDefaultState === 'open') {
+                  propsFromDispatch.activeDicomFunction("Link");
+                  realActiveIndex = getCurrentRealActiveIndex();
+                  openAutoLink({
+                    col: col,
+                    row: row,
+                    currentScrollLine: currentScrollLine,
+                    activeIndex: activeIndex,
+                    seriesCurrentIndex: seriesCurrentIndex,
+                    series: series,
+                    setLinkSeries: propsFromDispatch.setLinkSeries,
+                    linkSynchronizer: linkSynchronizer,
+                    linkScrollSynchronizer: linkScrollSynchronizer,
+                    realActiveIndex: realActiveIndex
+                  });
                 }
 
-              case 61:
+              case 63:
               case "end":
                 return _context.stop();
             }
@@ -55324,7 +55383,8 @@ var ConnectedDicomView = reactRedux.connect(mapStateToProps$u, {
   setKeyImage: setKeyImage,
   setOriginStudyData: setOriginStudyData,
   setSeriesCurrentIndex: setSeriesCurrentIndex,
-  setSeries: setSeries
+  setSeries: setSeries,
+  setLinkSeries: setLinkSeries
 }, mergeProps$t, withRef())(DicomView);
 
 function withRef() {