hellfire 0.27.0 → 0.27.2

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.1...v0.27.2) (2023-08-16)
+
+
+
+## [0.27.1](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.0...v0.27.1) (2023-08-02)
+
+
+
 # [0.27.0](http://10.16.100.57/diffusion/115/paladin/compare/v0.26.9...v0.27.0) (2023-08-01)
 
 

package/dist/index.js

@@ -28408,7 +28408,8 @@ cornerstoneTools.linkImageModeSynchronizer = linkImageModeSynchronizer;
 cornerstoneTools.mprSynchronizer = mprSynchronizer;
 cornerstoneTools.autoCine = autoCine;
 cornerstoneTools.getImagesLength = getImagesLength;
-cornerstoneTools.scrollToIndex = scrollToIndex; // 自定义tools
+cornerstoneTools.scrollToIndex = scrollToIndex;
+cornerstoneTools.scroll = scroll; // 自定义tools
 
 cornerstoneTools.CrosshairsMPRTool = CrosshairsMPRTool;
 cornerstoneTools.CentesisTool = CentesisTool;
@@ -44513,7 +44514,7 @@ var KeyImagesTool = /*#__PURE__*/function (_Component) {
           key: 'key-image-' + i
         }, /*#__PURE__*/React__default.createElement(Col, {
           xs: 8
-        }, "\u5E8F\u5217\u53F7 (Se:".concat(item.seriesNumber, "/").concat(item.numberOfSeries, ", Im:").concat(item.instanceNumber + 1, "/").concat(item.numberOfInstances, ")")), /*#__PURE__*/React__default.createElement(Col, {
+        }, "\u5E8F\u5217\u53F7 (Se:".concat(item.seriesNumber, ", Im:").concat(item.instanceNumber, ")")), /*#__PURE__*/React__default.createElement(Col, {
           xs: 4
         }, /*#__PURE__*/React__default.createElement("div", {
           className: 'paladin-key-image-item-action'
@@ -45791,8 +45792,7 @@ var mergeProps$j = function mergeProps(propsFromState, propsFromDispatch, ownPro
         var imageCount = 0;
         lodash$1.map(study, function (studyItem) {
           lodash$1.map(studyItem.series, function (seriesItem) {
-            var instanceCount = seriesItem.imageIds && seriesItem.imageIds.length || 0;
-            imageCount += instanceCount;
+            imageCount += seriesItem.numberOfSeriesRelatedInstances;
           });
         });
 
@@ -46627,22 +46627,56 @@ var mergeProps$j = function mergeProps(propsFromState, propsFromDispatch, ownPro
       });
 
       function handleAddKeyImage() {
-        var activeElement = getElement(realActiveIndex);
-        var enabled = cornerstone.getEnabledElement(activeElement);
-        var imageInfo = {
-          studyInstanceUID: currentSeries.studyInstanceUID,
-          seriesInstanceUID: currentSeries.seriesInstanceUID,
-          SOPInstanceUID: SOPInstanceUID,
-          seriesNumber: currentSeries.seriesNumber,
-          numberOfSeries: currentSeries.seriesCount,
-          numberOfInstances: currentSeries.imageIds.length,
-          instanceNumber: currentSeriesIndex
-        };
-        var dataUrl = enabled.canvas.toDataURL('image/jpeg');
-        ownProps.operateKeyImages('add', {
-          dataUrl: dataUrl,
-          imageInfo: imageInfo
-        });
+        return _handleAddKeyImage.apply(this, arguments);
+      }
+
+      function _handleAddKeyImage() {
+        _handleAddKeyImage = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee10() {
+          var activeElement, enabled, dicom, instanceNumber, imageInfo, dataUrl;
+          return regenerator.wrap(function _callee10$(_context10) {
+            while (1) {
+              switch (_context10.prev = _context10.next) {
+                case 0:
+                  activeElement = getElement(realActiveIndex);
+                  enabled = cornerstone.getEnabledElement(activeElement);
+                  _context10.next = 4;
+                  return loadAndCacheDicom(enabled.image.imageId);
+
+                case 4:
+                  dicom = _context10.sent;
+
+                  if (dicom) {
+                    _context10.next = 7;
+                    break;
+                  }
+
+                  return _context10.abrupt("return");
+
+                case 7:
+                  instanceNumber = dicom.InstanceNumber.toString();
+                  imageInfo = {
+                    studyInstanceUID: currentSeries.studyInstanceUID,
+                    seriesInstanceUID: currentSeries.seriesInstanceUID,
+                    SOPInstanceUID: SOPInstanceUID,
+                    seriesNumber: currentSeries.seriesNumber,
+                    numberOfSeries: currentSeries.seriesCount,
+                    numberOfInstances: currentSeries.imageIds.length,
+                    instanceNumber: instanceNumber
+                  };
+                  dataUrl = enabled.canvas.toDataURL('image/jpeg');
+                  ownProps.operateKeyImages('add', {
+                    dataUrl: dataUrl,
+                    imageInfo: imageInfo
+                  });
+
+                case 11:
+                case "end":
+                  return _context10.stop();
+              }
+            }
+          }, _callee10);
+        }));
+        return _handleAddKeyImage.apply(this, arguments);
       }
 
       if (selectImage) {
@@ -46990,7 +47024,7 @@ var ThumbContent = function ThumbContent(props) {
   var series = props.series,
       loaded = props.loaded;
   var loadedCount = loaded && loaded[series.seriesInstanceUID];
-  var totalCount = series && series.imageIds && series.imageIds.length;
+  var totalCount = series && series.numberOfSeriesRelatedInstances;
   var width = 0;
 
   if (loadedCount && totalCount) {
@@ -51275,7 +51309,7 @@ var mergeProps$m = function mergeProps(propsFromState, propsFromDispatch, ownPro
       seriesInstanceUID: currentSeries.seriesInstanceUID,
       currentImageIdIndex: 0,
       seriesCount: currentSeries.seriesCount,
-      instanceCount: instanceCount
+      instanceCount: currentSeries.numberOfSeriesRelatedInstances
     };
   });
   var showVerticalScroll = series && series.length / col > row;
@@ -53561,14 +53595,13 @@ var mergeProps$s = function mergeProps(propsFromState, propsFromDispatch, ownPro
   lodash$1.map(study, function (studyItem) {
     lodash$1.map(studyItem.series, function (seriesItem) {
       // seriesCount和instanceCount为了overlay的正确显示
-      var instanceCount = seriesItem.imageIds.length;
       lodash$1.map(seriesItem.imageIds, function (image) {
         var data = {
           imageIds: [image],
           seriesInstanceUID: seriesItem.seriesInstanceUID,
           currentImageIdIndex: 0,
           seriesCount: seriesItem.seriesCount,
-          instanceCount: instanceCount
+          instanceCount: seriesItem.numberOfSeriesRelatedInstances
         };
         allSeries.push(data);
       });
@@ -53699,6 +53732,31 @@ var mergeProps$s = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
 var ConnectedDicomAllImageModeLayout = reactRedux.connect(mapStateToProps$t, mapDispatchToProps$5, mergeProps$s)(DicomLayout);
 
+function ownKeys$S(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$T(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$S(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$S(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+/**
+ * 一些情况下传入paladin的numberOfSeriesRelatedInstances不是实际的序列图像数量
+ * 所以在study传入的时候需进行修正
+ */
+
+function studySeriesDataCheck (studies) {
+  return lodash$1.map(studies, function (study) {
+    if (study.checked) {
+      return study;
+    } else {
+      return _objectSpread$T(_objectSpread$T({}, study), {}, {
+        series: lodash$1.map(study.series, function (series) {
+          return _objectSpread$T(_objectSpread$T({}, series), {}, {
+            numberOfSeriesRelatedInstances: series.imageIds.length || 0
+          });
+        }),
+        checked: true
+      });
+    }
+  });
+}
+
 function _createForOfIteratorHelper$e(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$g(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$g(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$g(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$g(o, minLen); }
@@ -53810,7 +53868,7 @@ var DicomView = /*#__PURE__*/function (_Component) {
     });
 
     _this.state = {
-      study: _this.props.study,
+      study: studySeriesDataCheck(_this.props.study),
       resize: 0,
       windowLayoutType: _this.props.windowLayoutType
     }; // 窗口变化要重新渲染滚动条的距离
@@ -53861,7 +53919,7 @@ var DicomView = /*#__PURE__*/function (_Component) {
        */
       if (JSON.stringify(nextProps.study) !== JSON.stringify(this.props.study)) {
         this.setState({
-          study: nextProps.study
+          study: studySeriesDataCheck(nextProps.study)
         }, function () {
           _this3.props.initSeries(nextProps.study);
         });
@@ -54349,10 +54407,9 @@ function _unsupportedIterableToArray$h(o, minLen) { if (!o) return; if (typeof o
 
 function _arrayLikeToArray$h(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function ownKeys$S(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 ownKeys$T(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$T(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$S(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$S(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-var scroll$1 = cornerstoneTools.importInternal('util/scroll');
+function _objectSpread$U(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$T(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$T(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var throttle$9 = cornerstoneTools.importInternal('util/throttle');
 
 var mapStateToProps$u = function mapStateToProps(state) {
@@ -54480,7 +54537,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
     if (threeDMode) {
       changeMprPositionWithElement(activeElement, -1, threeScrollType);
     } else {
-      scroll$1(activeElement, -1, true, true);
+      cornerstoneTools.scroll(activeElement, -1, true, true);
     }
   };
 
@@ -54491,7 +54548,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
     if (threeDMode) {
       changeMprPositionWithElement(activeElement, 1, threeScrollType);
     } else {
-      scroll$1(activeElement, 1, true, true);
+      cornerstoneTools.scroll(activeElement, 1, true, true);
     }
   };
 
@@ -54512,7 +54569,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
    *
    */
 
-  return _objectSpread$T(_objectSpread$T(_objectSpread$T({}, ownProps), propsFromState), {}, {
+  return _objectSpread$U(_objectSpread$U(_objectSpread$U({}, ownProps), propsFromState), {}, {
     showDicomThumbnail: showDicomThumbnail,
     viewMode: viewMode,
     keyMap: {
@@ -54869,7 +54926,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                   }
                 }
 
-                _study = lodash$1.cloneDeep(ownProps.study);
+                _study = studySeriesDataCheck(lodash$1.cloneDeep(ownProps.study));
                 series = _study[0].series; // 设置ai结果
 
                 if (ownProps.aiResult && ownProps.aiResult.inspectionDetails && ownProps.aiResult.inspectionDetails.length > 0) {
@@ -54881,11 +54938,6 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                 needCheckMultiFrame = true;
                 hasMultiFrame = false;
                 lodash$1.forEach(series, function (v) {
-                  // numberOfSeriesRelatedInstances修正 避免多次上传和实际数量不一致的情况
-                  if (v.imageIds && v.imageIds.length > 0) {
-                    v.numberOfSeriesRelatedInstances = v.imageIds.length;
-                  }
-
                   if (v.numberOfSeriesRelatedInstances && v.numberOfSeriesRelatedInstances > 1) {
                     needCheckMultiFrame = false;
                   }
@@ -54932,7 +54984,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                     imageIds.push(imageId);
                   }
 
-                  series[i] = _objectSpread$T(_objectSpread$T({}, item), {}, {
+                  series[i] = _objectSpread$U(_objectSpread$U({}, item), {}, {
                     imageIds: imageIds,
                     numberOfSeriesRelatedInstances: numFrames,
                     isMultiFrame: true
@@ -54997,7 +55049,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
                 callback && callback({
                   hasChange: hasMultiFrame,
-                  study: [_objectSpread$T(_objectSpread$T({}, ownProps.study[0]), {}, {
+                  study: [_objectSpread$U(_objectSpread$U({}, _study[0]), {}, {
                     series: series
                   })]
                 }); // 如果有frameTime的话设置fps