hellfire 0.31.2 → 0.31.4

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.31.4](http://10.16.100.57/diffusion/115/paladin/compare/v0.31.3...v0.31.4) (2025-11-09)
+
+
+
+## [0.31.3](http://10.16.100.57/diffusion/115/paladin/compare/v0.31.2...v0.31.3) (2025-11-04)
+
+
+
 ## [0.31.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.31.1...v0.31.2) (2025-10-29)
 
 

package/dist/index.js

@@ -52385,16 +52385,66 @@ var formatInPlanePhaseEncodingDirection = function formatInPlanePhaseEncodingDir
   }
 };
 
+var checkFloatFixed = function checkFloatFixed(num) {
+  var decimalPart = num.toString().split('.')[1];
+
+  if (decimalPart && decimalPart.length > 2) {
+    return num.toFixed(2);
+  } else {
+    return num.toFixed(1);
+  }
+};
+
+var checkFloatFixed3 = function checkFloatFixed3(num) {
+  var decimalPart = num.toString().split('.')[1] || '';
+  var decimalLength = decimalPart.length;
+
+  if (decimalLength >= 3) {
+    return num.toFixed(3);
+  } else if (decimalLength === 2) {
+    return num.toFixed(2);
+  } else {
+    return num.toFixed(1);
+  }
+};
+
 var getActualSpacingBetweenSlices = function getActualSpacingBetweenSlices(spacingBetweenSlices, sliceThickness) {
   if (spacingBetweenSlices && sliceThickness) {
     // 获取实际的层间距 减去上下层各 1/2的层厚
     var actualSpacingBetweenSlices = parseFloat(spacingBetweenSlices) - parseFloat(sliceThickness);
-    return actualSpacingBetweenSlices && actualSpacingBetweenSlices.toFixed(1);
+    return actualSpacingBetweenSlices && checkFloatFixed(actualSpacingBetweenSlices);
   } else {
     return '';
   }
 };
 
+var formatThkText = function formatThkText(sliceThickness, spacingBetweenSlices) {
+  var actualSpacingBetweenSlices = getActualSpacingBetweenSlices(sliceThickness, spacingBetweenSlices);
+  return actualSpacingBetweenSlices || sliceThickness ? "THK: ".concat(sliceThickness && checkFloatFixed(parseFloat(sliceThickness)), "/").concat(actualSpacingBetweenSlices) : '';
+};
+
+var formatDetText = function formatDetText(dicom) {
+  var _dicom$TotalCollimati, _dicom$SingleCollimat, _dicom$SpiralPitchFac;
+
+  var totalCollimationWidth = (_dicom$TotalCollimati = dicom.TotalCollimationWidth) === null || _dicom$TotalCollimati === void 0 ? void 0 : _dicom$TotalCollimati.value;
+  var singleCollimationWidth = (_dicom$SingleCollimat = dicom.SingleCollimationWidth) === null || _dicom$SingleCollimat === void 0 ? void 0 : _dicom$SingleCollimat.value;
+  var spiralPitchFactor = (_dicom$SpiralPitchFac = dicom.SpiralPitchFactor) === null || _dicom$SpiralPitchFac === void 0 ? void 0 : _dicom$SpiralPitchFac.value;
+
+  if (!totalCollimationWidth || !totalCollimationWidth[0] || !singleCollimationWidth || !singleCollimationWidth[0] || !spiralPitchFactor || !spiralPitchFactor[0]) {
+    return '';
+  }
+
+  var detectorRows = Math.round(parseFloat(totalCollimationWidth[0]) / parseFloat(singleCollimationWidth[0]));
+
+  if (detectorRows > 10000) {
+    return '';
+  }
+
+  var collimationWidth = checkFloatFixed3(parseFloat(singleCollimationWidth[0]));
+  var pitch = checkFloatFixed(parseFloat(spiralPitchFactor[0]));
+  return "Det: ".concat(detectorRows, "x").concat(collimationWidth, "/p: ").concat(pitch);
+};
+
 var getFov = function getFov(dicom, imageId) {
   var rows = dicom.Rows.value;
   var columns = dicom.Columns.value;
@@ -52775,13 +52825,14 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
 
       var diffusionBValue = dicom.DiffusionBValue.toString();
       var seriesDescription = dicom.SeriesDescription.toString();
-      var actualSpacingBetweenSlices = getActualSpacingBetweenSlices(sliceThickness, spacingBetweenSlices);
-      var thk = actualSpacingBetweenSlices || sliceThickness ? "THK: ".concat(sliceThickness && parseFloat(sliceThickness).toFixed(1), "/").concat(actualSpacingBetweenSlices) : ''; // 当长度大于20时，不显示
+      var thk = formatThkText(sliceThickness, spacingBetweenSlices);
+      var det = formatDetText(dicom); // 当长度大于20时，不显示
 
       var imageComments = dicom.ImageComments.toString(); // DX DR CR专属属性
 
       var modality = dicom.Modality.toString();
       var showDXDRCR = modality === 'DX' || modality === 'DR' || modality === 'CR';
+      var showCT = modality === 'CT';
       var kvp = dicom.KVP.toString();
       var exposureTime = dicom.ExposureTime.toString();
       var xRayTubeCurrent = dicom.XRayTubeCurrent.toString();
@@ -52821,7 +52872,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
           fontSize: "".concat(fontSize, "px"),
           display: "".concat(hide ? 'none' : 'block')
         }
-      }, showDXDRCR && /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo('kV', kvp)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo('mA', xRayTubeCurrent)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo('Time', exposureTime)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo('mAs', exposure))), /*#__PURE__*/React__default.createElement("div", null, patientOrientation), /*#__PURE__*/React__default.createElement("div", null, protocolName), /*#__PURE__*/React__default.createElement("div", null, sequenceName), /*#__PURE__*/React__default.createElement("div", null, getTRAndTE(repetitionTime, echoTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('TI', inversionTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('FA', flipAngle)), /*#__PURE__*/React__default.createElement("div", null, getADAndNEX(acquisitionDuration, numberOfAverages)), /*#__PURE__*/React__default.createElement("div", null, thk), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('B', diffusionBValue, false)), seriesDescription && seriesDescription !== protocolName && /*#__PURE__*/React__default.createElement("div", null, seriesDescription), imageComments && imageComments.length < 20 && /*#__PURE__*/React__default.createElement("div", null, imageComments)), /*#__PURE__*/React__default.createElement("div", {
+      }, showDXDRCR && /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo('kV', kvp)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo('mA', xRayTubeCurrent)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo('Time', exposureTime)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo('mAs', exposure))), /*#__PURE__*/React__default.createElement("div", null, patientOrientation), /*#__PURE__*/React__default.createElement("div", null, protocolName), /*#__PURE__*/React__default.createElement("div", null, sequenceName), /*#__PURE__*/React__default.createElement("div", null, getTRAndTE(repetitionTime, echoTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('TI', inversionTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('FA', flipAngle)), /*#__PURE__*/React__default.createElement("div", null, getADAndNEX(acquisitionDuration, numberOfAverages)), showCT && /*#__PURE__*/React__default.createElement("div", null, thk), /*#__PURE__*/React__default.createElement("div", null, det), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('B', diffusionBValue, false)), seriesDescription && seriesDescription !== protocolName && /*#__PURE__*/React__default.createElement("div", null, seriesDescription), imageComments && imageComments.length < 20 && /*#__PURE__*/React__default.createElement("div", null, imageComments)), /*#__PURE__*/React__default.createElement("div", {
         style: {
           position: 'absolute',
           top: 4,
@@ -76332,7 +76383,7 @@ var mergeProps$D = function mergeProps(propsFromState, propsFromDispatch, ownPro
     },
     initSeries: function () {
       var _initSeries2 = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(changeStudy, callback) {
-        var data, resetToolMergeState, 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, linkToolLocalDefaultState, realActiveIndex, continuousMeasureLocalDefaultState, referenceLineLocalDefaultState, shutterLocalDefaultState, autoLinkSyncWindowLevelDefaultState, autoLinkSyncOtherDefaultState, autoLinkSyncAbsoluteDefaultState, mprCrossModeDefaultState, mprVertLayout, mprHozLayout;
+        var data, resetToolMergeState, synchronizer, linkSynchronizer, linkImageModeSynchronizer, linkScrollSynchronizer, options, _study, series, needCheckMultiFrame, hasMultiFrame, modalitiesInStudy, i, item, wado, url, dataSet, numFrames, imageIds, _i, imageId, seriesCurrentIndex, firstReady, maxRequest, retry, clearCacheEveryLoad, initTaskPoolSeries, size, dicom, frameTime, linkToolLocalDefaultState, realActiveIndex, continuousMeasureLocalDefaultState, referenceLineLocalDefaultState, shutterLocalDefaultState, autoLinkSyncWindowLevelDefaultState, autoLinkSyncOtherDefaultState, autoLinkSyncAbsoluteDefaultState, mprCrossModeDefaultState, mprVertLayout, mprHozLayout;
 
         return regenerator.wrap(function _callee2$(_context2) {
           while (1) {
@@ -76521,10 +76572,22 @@ var mergeProps$D = function mergeProps(propsFromState, propsFromDispatch, ownPro
                   maxRequest = 1;
                   retry = 0;
                   clearCacheEveryLoad = true;
-                } // 多帧的情况不要预加载 只要初始化设置
+                }
+                /**
+                 * 预加载：
+                 * 1.多帧的情况不要预加载 只要初始化设置
+                 * 2.如果外部传入initImageLoadManual为true，则只加载初始视窗个数序列
+                 */
 
 
-                initTaskPool(hasMultiFrame ? [] : series, {
+                initTaskPoolSeries = series;
+
+                if (ownProps.initImageLoadManual) {
+                  size = propsFromState.row * propsFromState.col || 1;
+                  initTaskPoolSeries = series.slice(0, size);
+                }
+
+                initTaskPool(hasMultiFrame ? [] : initTaskPoolSeries, {
                   maxRequest: maxRequest,
                   retry: retry,
                   clearCacheEveryLoad: clearCacheEveryLoad,
@@ -76557,10 +76620,10 @@ var mergeProps$D = function mergeProps(propsFromState, propsFromDispatch, ownPro
                   })]
                 }); // 如果有frameTime的话设置fps
 
-                _context2.next = 62;
+                _context2.next = 64;
                 return loadAndCacheDicom(series[0].imageIds[0]);
 
-              case 62:
+              case 64:
                 dicom = _context2.sent;
 
                 if (dicom && dicom.FrameTime && dicom.FrameTime.value) {
@@ -76651,7 +76714,7 @@ var mergeProps$D = function mergeProps(propsFromState, propsFromDispatch, ownPro
                   propsFromDispatch.setMprLayout('horizontal', mprHozLayout);
                 }
 
-              case 84:
+              case 86:
               case "end":
                 return _context2.stop();
             }