hellfire 0.29.0 → 0.29.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.29.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.29.1...v0.29.2) (2025-03-18)
+
+
+
+## [0.29.1](http://10.16.100.57/diffusion/115/paladin/compare/v0.29.0...v0.29.1) (2025-03-13)
+
+
+
 # [0.29.0](http://10.16.100.57/diffusion/115/paladin/compare/v0.28.20...v0.29.0) (2025-03-10)
 
 

package/dist/index.js

@@ -44595,11 +44595,13 @@ var DicomToolFlattenMode = /*#__PURE__*/function (_Component) {
 
       var isThree = MPR || VR || Surgery || MIP || CPR || Fusion; // 非同屏互通模式下
 
-      var IODisconnect = !IO;
-      var commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'Reset', 'Fusion']; // 只有传入了关键图像操作的方法 才显示这个按钮
+      var IODisconnect = !IO; // let commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'Reset', 'Fusion'];
+
+      var commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'Reset']; // 只有传入了关键图像操作的方法 才显示这个按钮
 
       if (operateKeyImages) {
-        commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'KeyImages', 'Reset', 'Fusion'];
+        // commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'KeyImages', 'Reset', 'Fusion'];
+        commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'KeyImages', 'Reset'];
       }
 
       if (mode !== 'seriesMode') {
@@ -44964,11 +44966,13 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
           fusionPetColorMap = _this$props4.fusionPetColorMap,
           fusionPetSUV = _this$props4.fusionPetSUV;
       var isThree = MPR || VR || Surgery || MIP || Fusion;
-      var IODisconnect = !IO;
-      var commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'Reset', 'Fusion']; // 只有传入了关键图像操作的方法 才显示这个按钮
+      var IODisconnect = !IO; // let commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'Reset', 'Fusion'];
+
+      var commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'Reset']; // 只有传入了关键图像操作的方法 才显示这个按钮
 
       if (operateKeyImages) {
-        commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'KeyImages', 'Reset', 'Fusion'];
+        // commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'KeyImages', 'Reset', 'Fusion'];
+        commonTools = ['Layout', 'StackScroll', 'Wwwc', 'Zoom', 'Pan', 'Rotate', 'ReverseColor', 'Sharpen', 'Cine', 'FalseColor', 'Link', 'ReferencePosition', 'KeyImages', 'Reset'];
       }
 
       if (mode !== 'seriesMode') {
@@ -50157,6 +50161,23 @@ var formatDicomInfo = function formatDicomInfo(label, value) {
   return formated ? "".concat(label, ": ").concat(formated) : '';
 };
 
+var formatDRDXInfo = function formatDRDXInfo(label, value) {
+  var text = '';
+
+  if (!value) {
+    return text;
+  }
+
+  var _v = Number(value);
+
+  if (!_v) {
+    return text;
+  }
+
+  text = formatNumberPrecision(value, 1);
+  return "".concat(label, ": ").concat(text);
+};
+
 var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
   inherits(ViewportOverlay, _PureComponent);
 
@@ -50173,11 +50194,17 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
       var _this$state = _this.state,
           dicom = _this$state.dicom,
           basicInfoFrom = _this$state.basicInfoFrom;
-      var basicInfoFromStudy = _this.props.basicInfoFromStudy;
+      var _this$props = _this.props,
+          basicInfoFromStudy = _this$props.basicInfoFromStudy,
+          originDicomInfo = _this$props.originDicomInfo;
 
       if (basicInfoFrom && basicInfoFrom === 'study' && basicInfoFromStudy && basicInfoFromStudy.name) {
         return basicInfoFromStudy.name;
       } else {
+        if (originDicomInfo) {
+          return originDicomInfo.PatientName.toString();
+        }
+
         return dicom.PatientName.toString();
       }
     });
@@ -50186,11 +50213,17 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
       var _this$state2 = _this.state,
           dicom = _this$state2.dicom,
           basicInfoFrom = _this$state2.basicInfoFrom;
-      var basicInfoFromStudy = _this.props.basicInfoFromStudy;
+      var _this$props2 = _this.props,
+          basicInfoFromStudy = _this$props2.basicInfoFromStudy,
+          originDicomInfo = _this$props2.originDicomInfo;
 
       if (basicInfoFrom && basicInfoFrom === 'study' && basicInfoFromStudy && basicInfoFromStudy.patientSex) {
         return basicInfoFromStudy.patientSex;
       } else {
+        if (originDicomInfo) {
+          return originDicomInfo.PatientSex.toString();
+        }
+
         return dicom.PatientSex.toString();
       }
     });
@@ -50199,11 +50232,17 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
       var _this$state3 = _this.state,
           dicom = _this$state3.dicom,
           basicInfoFrom = _this$state3.basicInfoFrom;
-      var basicInfoFromStudy = _this.props.basicInfoFromStudy;
+      var _this$props3 = _this.props,
+          basicInfoFromStudy = _this$props3.basicInfoFromStudy,
+          originDicomInfo = _this$props3.originDicomInfo;
 
       if (basicInfoFrom && basicInfoFrom === 'study' && basicInfoFromStudy && basicInfoFromStudy.patientAge) {
         return basicInfoFromStudy.patientAge;
       } else {
+        if (originDicomInfo) {
+          return originDicomInfo.PatientAge.toString();
+        }
+
         return dicom.PatientAge.toString();
       }
     });
@@ -50212,11 +50251,17 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
       var _this$state4 = _this.state,
           dicom = _this$state4.dicom,
           basicInfoFrom = _this$state4.basicInfoFrom;
-      var basicInfoFromStudy = _this.props.basicInfoFromStudy;
+      var _this$props4 = _this.props,
+          basicInfoFromStudy = _this$props4.basicInfoFromStudy,
+          originDicomInfo = _this$props4.originDicomInfo;
 
       if (basicInfoFrom && basicInfoFrom === 'study' && basicInfoFromStudy && basicInfoFromStudy.patientID) {
         return basicInfoFromStudy.patientID;
       } else {
+        if (originDicomInfo) {
+          return originDicomInfo.PatientID.toString();
+        }
+
         return dicom.PatientID.toString();
       }
     });
@@ -50309,16 +50354,18 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
       }
 
       return loadDicom;
-    }()
+    }() // originDicomInfo是mpr模式下的
+
   }, {
     key: "render",
     value: function render() {
-      var _this$props = this.props,
-          imageId = _this$props.imageId,
-          stack = _this$props.stack,
-          viewport = _this$props.viewport,
-          hide = _this$props.hide,
-          mpr = _this$props.mpr;
+      var _this$props5 = this.props,
+          imageId = _this$props5.imageId,
+          stack = _this$props5.stack,
+          viewport = _this$props5.viewport,
+          hide = _this$props5.hide,
+          mpr = _this$props5.mpr,
+          originDicomInfo = _this$props5.originDicomInfo;
 
       if (!imageId || !stack) {
         return null;
@@ -50333,6 +50380,22 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
       }
 
       if (mpr) {
+        var _institutionName = originDicomInfo && originDicomInfo.InstitutionName.toString();
+
+        var _manufacturer = originDicomInfo && originDicomInfo.Manufacturer.toString();
+
+        var _manufacturerModelName = originDicomInfo && originDicomInfo.ManufacturerModelName.toString();
+
+        var _patientName = originDicomInfo && this.getPatientNameData();
+
+        var _patientSex = originDicomInfo && this.getPatientSexData();
+
+        var _patientAge = originDicomInfo && this.getPatientAgeData();
+
+        var _patientID = originDicomInfo && this.getPatientIDData();
+
+        var _bodyPartExamined = originDicomInfo && originDicomInfo.BodyPartExamined.toString();
+
         var _zoom = viewport.scale.toFixed(2);
 
         var _windowWidth = parseFloat(viewport.voi.windowWidth) || 0;
@@ -50341,7 +50404,19 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
 
         var spaceBetweenSlice = stack.spaceBetweenSlice && stack.spaceBetweenSlice.toFixed(1);
         var _sliceThickness = this.props.sliceThickness;
-        return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", {
+
+        var _studyDateTime = originDicomInfo && getStudyDateTime(originDicomInfo);
+
+        return /*#__PURE__*/React__default.createElement("div", null, originDicomInfo && /*#__PURE__*/React__default.createElement("div", {
+          style: {
+            position: 'absolute',
+            top: 4,
+            left: 4,
+            textAlign: 'left',
+            fontSize: "".concat(fontSize, "px"),
+            display: "".concat(hide ? 'none' : 'block')
+          }
+        }, /*#__PURE__*/React__default.createElement("div", null, _institutionName), /*#__PURE__*/React__default.createElement("div", null, _manufacturer, " ", _manufacturerModelName), /*#__PURE__*/React__default.createElement("div", null, _patientName, "/", _patientSex, "/", _patientAge), /*#__PURE__*/React__default.createElement("div", null, _patientID), /*#__PURE__*/React__default.createElement("div", null, _bodyPartExamined)), /*#__PURE__*/React__default.createElement("div", {
           style: {
             position: 'absolute',
             bottom: 4,
@@ -50350,7 +50425,16 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
             fontSize: "".concat(fontSize, "px"),
             display: "".concat(hide ? 'none' : 'block')
           }
-        }, /*#__PURE__*/React__default.createElement("div", null, "T: ", spaceBetweenSlice, "mm", _sliceThickness && _sliceThickness !== 1 && 'X' + _sliceThickness, " L")), /*#__PURE__*/React__default.createElement("div", {
+        }, /*#__PURE__*/React__default.createElement("div", null, "T: ", spaceBetweenSlice, "mm", _sliceThickness && _sliceThickness !== 1 && 'X' + _sliceThickness, " L")), originDicomInfo && /*#__PURE__*/React__default.createElement("div", {
+          style: {
+            position: 'absolute',
+            top: 4,
+            right: 4,
+            textAlign: 'right',
+            fontSize: "".concat(fontSize, "px"),
+            display: "".concat(hide ? 'none' : 'block')
+          }
+        }, /*#__PURE__*/React__default.createElement("div", null, _studyDateTime && _studyDateTime.format('YYYY-MM-DD HH:mm:ss'))), /*#__PURE__*/React__default.createElement("div", {
           style: {
             position: 'absolute',
             bottom: 4,
@@ -50435,7 +50519,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, formatDicomInfo('kV', kvp, false)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('mA', xRayTubeCurrent, false)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('Time', exposureTime, false)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo('mAs', exposure, false))), /*#__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)), /*#__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", {
         style: {
           position: 'absolute',
           top: 4,
@@ -52635,6 +52719,7 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
         basicInfoFromStudy: basicInfoFromStudy,
         sliceThickness: sliceThickness,
         cpr: CPR,
+        originDicomInfo: !this.props.VR && mpr && mpr === this.props.mprPerspective && !this.props.VR && this.props.originDicomInfo,
         mpr: mpr
       }), isKey && /*#__PURE__*/React__default.createElement("div", {
         className: 'paladin-key-image-tip'
@@ -52685,12 +52770,7 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
         imageId: imageId,
         imageProcessType: _imageProcessType,
         mpr: mpr
-      })), mpr && !Surgery && /*#__PURE__*/React__default.createElement("div", {
-        className: "paladin-mpr-direaction-tip",
-        style: {
-          background: MPR_DIRECTION_COLOR[mpr]
-        }
-      }), directionToggle && direction && index !== 3 && /*#__PURE__*/React__default.createElement("div", {
+      })), directionToggle && direction && index !== 3 && /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-mpr-direaction-toggle-box",
         onClick: this.props.directionToggle
       }, /*#__PURE__*/React__default.createElement("span", {
@@ -53412,7 +53492,8 @@ var mapStateToProps$o = function mapStateToProps(state) {
       CPR = _state$paladin$tools$.CPR,
       referenceLineType = _state$paladin$tools$.referenceLineType,
       keyImages = _state$paladin$tools$.keyImages,
-      displayShutter = _state$paladin$tools$.displayShutter;
+      displayShutter = _state$paladin$tools$.displayShutter,
+      VR = _state$paladin$tools$.VR;
   var _state$paladin$tools$2 = state.paladin.tools.layout,
       col = _state$paladin$tools$2.col,
       currentScrollLine = _state$paladin$tools$2.currentScrollLine,
@@ -53424,7 +53505,8 @@ var mapStateToProps$o = function mapStateToProps(state) {
       linkImageModeSynchronizer = _state$paladin$viewpo.linkImageModeSynchronizer,
       seriesCurrentIndex = _state$paladin$viewpo.seriesCurrentIndex,
       positionSynchronizer = _state$paladin$viewpo.positionSynchronizer,
-      originStudy = _state$paladin$viewpo.originStudy;
+      originStudy = _state$paladin$viewpo.originStudy,
+      mprPerspective = _state$paladin$viewpo.mprPerspective;
   return {
     activeTool: activeTool,
     originActiveTool: originActiveTool,
@@ -53449,7 +53531,9 @@ var mapStateToProps$o = function mapStateToProps(state) {
     referenceLineType: referenceLineType,
     keyImages: keyImages,
     originStudy: originStudy,
-    displayShutter: displayShutter
+    displayShutter: displayShutter,
+    mprPerspective: mprPerspective,
+    VR: VR
   };
 };
 
@@ -55501,7 +55585,8 @@ var ThreeDLayout = /*#__PURE__*/function (_Component) {
 
     _this.state = {
       processing: props.showProcessing !== false,
-      error: null
+      error: null,
+      originDicomInfo: null
     };
     _this.mpr = null;
 
@@ -55663,11 +55748,14 @@ var ThreeDLayout = /*#__PURE__*/function (_Component) {
                 break;
 
               case 12:
-                _context2.next = 18;
+                this.setState({
+                  originDicomInfo: instanceImages[0]
+                });
+                _context2.next = 19;
                 break;
 
-              case 14:
-                _context2.prev = 14;
+              case 15:
+                _context2.prev = 15;
                 _context2.t0 = _context2["catch"](3);
                 processing && this.setState({
                   processingMessage: "\u56FE\u50CF\u52A0\u8F7D\u5931\u8D25: ".concat(_context2.t0.message || '未知错误', "\uFF0C\u8BF7\u91CD\u65B0\u6253\u5F00\u8F6F\u4EF6"),
@@ -55675,22 +55763,22 @@ var ThreeDLayout = /*#__PURE__*/function (_Component) {
                 });
                 return _context2.abrupt("return");
 
-              case 18:
+              case 19:
                 // 能进入到这个组件中的已经默认是符合前期条件+选择了继续重建的，所以做一遍filter
                 instanceImages = filterRebuildImages(instanceImages);
 
                 if (processing) {
-                  _context2.next = 23;
+                  _context2.next = 24;
                   break;
                 }
 
-                _context2.next = 22;
+                _context2.next = 23;
                 return this.initMPR(currentSeries, instanceImages);
 
-              case 22:
+              case 23:
                 return _context2.abrupt("return");
 
-              case 23:
+              case 24:
                 this.setState({
                   processingMessage: "\u6B63\u5728\u5904\u7406\u56FE\u50CF...",
                   error: null
@@ -55700,12 +55788,12 @@ var ThreeDLayout = /*#__PURE__*/function (_Component) {
                   }, 50);
                 });
 
-              case 24:
+              case 25:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, this, [[3, 14]]);
+        }, _callee2, this, [[3, 15]]);
       }));
 
       function componentDidMount() {
@@ -55736,7 +55824,8 @@ var ThreeDLayout = /*#__PURE__*/function (_Component) {
           transverseStack = _this$state.transverseStack,
           coronalStack = _this$state.coronalStack,
           screenDirection = _this$state.screenDirection,
-          error = _this$state.error;
+          error = _this$state.error,
+          originDicomInfo = _this$state.originDicomInfo;
       var _this$props = this.props,
           mprActiveIndex = _this$props.mprActiveIndex,
           showOverlayText = _this$props.showOverlayText,
@@ -55768,7 +55857,8 @@ var ThreeDLayout = /*#__PURE__*/function (_Component) {
         setViewportState: handleViewportState,
         getCacheViewport: getCacheViewport,
         onSyncOpen: onSyncOpen,
-        availableToolsConfig: this.availableToolsConfig
+        availableToolsConfig: this.availableToolsConfig,
+        originDicomInfo: originDicomInfo
       }); // 矢状面
 
       var sagittalEle = /*#__PURE__*/React__default.createElement(ConnectedDicomViewport, {
@@ -55788,7 +55878,8 @@ var ThreeDLayout = /*#__PURE__*/function (_Component) {
         setViewportState: handleViewportState,
         getCacheViewport: getCacheViewport,
         onSyncOpen: onSyncOpen,
-        availableToolsConfig: this.availableToolsConfig
+        availableToolsConfig: this.availableToolsConfig,
+        originDicomInfo: originDicomInfo
       }); // 冠状面
 
       var coronalEle = /*#__PURE__*/React__default.createElement(ConnectedDicomViewport, {
@@ -55808,7 +55899,8 @@ var ThreeDLayout = /*#__PURE__*/function (_Component) {
         setViewportState: handleViewportState,
         getCacheViewport: getCacheViewport,
         onSyncOpen: onSyncOpen,
-        availableToolsConfig: this.availableToolsConfig
+        availableToolsConfig: this.availableToolsConfig,
+        originDicomInfo: originDicomInfo
       }); // 视角
 
       var perspective1 = mprPerspective === ImagePlanDirection.Transverse ? transverseEle : mprPerspective === ImagePlanDirection.Sagittal ? sagittalEle : coronalEle;