hellfire 0.31.9 → 0.31.11

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.11](http://10.16.100.57/diffusion/115/paladin/compare/v0.31.10...v0.31.11) (2025-12-08)
+
+
+
+## [0.31.10](http://10.16.100.57/diffusion/115/paladin/compare/v0.31.9...v0.31.10) (2025-12-02)
+
+
+
 ## [0.31.9](http://10.16.100.57/diffusion/115/paladin/compare/v0.31.8...v0.31.9) (2025-12-01)
 
 

package/dist/index.js

@@ -52903,7 +52903,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
             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", {
+        }, /*#__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,
@@ -52921,7 +52921,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
             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", {
+        }, /*#__PURE__*/React__default.createElement("div", null, _institutionName), /*#__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,
@@ -52999,7 +52999,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
           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", null, laterality, " ", viewPosition)), /*#__PURE__*/React__default.createElement("div", {
+      }, /*#__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", null, laterality, " ", viewPosition)), /*#__PURE__*/React__default.createElement("div", {
         style: {
           position: 'absolute',
           bottom: 4,
@@ -53008,7 +53008,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), showCT && /*#__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", {
+      }, 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, /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo('kV', kvp)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo('mAs', exposure))), /*#__PURE__*/React__default.createElement("div", null, thk), showCT && /*#__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,
@@ -53017,7 +53017,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
           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", null, "Se: ", seriesNumber, "/", seriesCount), /*#__PURE__*/React__default.createElement("div", null, "Im: ", instanceNumber, "/", instanceCount), /*#__PURE__*/React__default.createElement("div", null, formatInPlanePhaseEncodingDirection(inPlanePhaseEncodingDirection))), /*#__PURE__*/React__default.createElement("div", {
+      }, /*#__PURE__*/React__default.createElement("div", null, institutionName), /*#__PURE__*/React__default.createElement("div", null, studyDateTime && studyDateTime.format('YYYY-MM-DD HH:mm:ss')), /*#__PURE__*/React__default.createElement("div", null, "Se: ", seriesNumber, "/", seriesCount), /*#__PURE__*/React__default.createElement("div", null, "Im: ", instanceNumber, "/", instanceCount), /*#__PURE__*/React__default.createElement("div", null, formatInPlanePhaseEncodingDirection(inPlanePhaseEncodingDirection))), /*#__PURE__*/React__default.createElement("div", {
         style: {
           position: 'absolute',
           bottom: 4,
@@ -71325,6 +71325,23 @@ function calcImageFontSize(width, height) {
   rulerOverlayTickPatch = 6 * ratioX;
   rulerOverlayLineWidth = 2 + ratioX * 0.5;
 }
+
+var formatDRDXInfo$1 = 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);
+};
 /**
  * 1.根据打印的真实宽高，确定尺寸
  * 2.获得films的虚拟画布图像数据
@@ -71728,7 +71745,6 @@ var addDicomInfoOnCanvas = /*#__PURE__*/function () {
 
 
 var drawLeftTop = function drawLeftTop(dicom, ctx) {
-  var institutionName = dicom.InstitutionName.toString();
   var patientName = dicom.PatientName.toString();
   var patientSex = dicom.PatientSex.toString();
   var patientAge = dicom.PatientAge.toString();
@@ -71739,12 +71755,6 @@ var drawLeftTop = function drawLeftTop(dicom, ctx) {
   var contentX = dicomInfoPaddingX;
   var contentY = dicomInfoPaddingY;
   var spacing = dicomInfoSpacing;
-
-  if (institutionName) {
-    ctx.fillText(institutionName, contentX, contentY);
-    contentY += spacing;
-  }
-
   ctx.fillText("".concat(patientName || ''), contentX, contentY);
   contentY += spacing;
   ctx.fillText("".concat(patientSex || '', "/").concat(patientAge || ''), contentX, contentY);
@@ -71777,6 +71787,13 @@ var drawLeftTop = function drawLeftTop(dicom, ctx) {
 
 
 var drawLeftBottom = function drawLeftBottom(dicom, ctx, height) {
+  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();
+  var exposure = dicom.Exposure.toString();
   var patientOrientation = dicom.PatientOrientation.toString();
   var protocolName = dicom.ProtocolName.toString();
   var repetitionTime = dicom.RepetitionTime.toString();
@@ -71813,6 +71830,18 @@ var drawLeftBottom = function drawLeftBottom(dicom, ctx, height) {
     contentY -= spacing;
   }
 
+  if (showCT) {
+    if (kvp) {
+      ctx.fillText(formatDRDXInfo$1('kV', kvp), contentX, contentY);
+      contentY -= spacing;
+    }
+
+    if (exposure) {
+      ctx.fillText(formatDRDXInfo$1('mAs', exposure), contentX, contentY);
+      contentY -= spacing;
+    }
+  }
+
   var _flipAngle = formatDicomInfo$1('FA', flipAngle);
 
   if (_flipAngle) {
@@ -71836,11 +71865,34 @@ var drawLeftBottom = function drawLeftBottom(dicom, ctx, height) {
 
   if (patientOrientation) {
     ctx.fillText(patientOrientation, contentX, contentY);
+    contentY -= spacing;
+  }
+
+  if (showDXDRCR) {
+    if (kvp) {
+      ctx.fillText(formatDRDXInfo$1('kV', kvp), contentX, contentY);
+      contentY -= spacing;
+    }
+
+    if (xRayTubeCurrent) {
+      ctx.fillText(formatDRDXInfo$1('mA', xRayTubeCurrent), contentX, contentY);
+      contentY -= spacing;
+    }
+
+    if (exposureTime) {
+      ctx.fillText(formatDRDXInfo$1('Time', exposureTime), contentX, contentY);
+      contentY -= spacing;
+    }
+
+    if (exposure) {
+      ctx.fillText(formatDRDXInfo$1('mAs', exposure), contentX, contentY);
+    }
   }
 }; // 右上
 
 
 var drawRightTop = function drawRightTop(dicom, ctx, width, stack) {
+  var institutionName = dicom.InstitutionName.toString();
   var studyDateTime = getStudyDateTime$1(dicom);
   var instanceCount = stack.instanceCount || '';
   var instanceNumber = stack.instanceNumber.toString() || '';
@@ -71851,6 +71903,11 @@ var drawRightTop = function drawRightTop(dicom, ctx, width, stack) {
   var contentY = dicomInfoPaddingY;
   var spacing = dicomInfoSpacing;
 
+  if (institutionName) {
+    ctx.fillText(institutionName, contentX, contentY);
+    contentY += spacing;
+  }
+
   if (studyDateTime) {
     var _v = studyDateTime.format('YYYY-MM-DD HH:mm:ss');
 
@@ -72705,7 +72762,7 @@ var formatDicomInfo$2 = function formatDicomInfo(label, value) {
   return formated ? "".concat(label, ": ").concat(formated) : '';
 };
 
-var formatDRDXInfo$1 = function formatDRDXInfo(label, value) {
+var formatDRDXInfo$2 = function formatDRDXInfo(label, value) {
   var text = '';
 
   if (!value) {
@@ -72948,6 +73005,7 @@ var ViewportOverlay$1 = /*#__PURE__*/function (_PureComponent) {
 
       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();
@@ -72977,7 +73035,7 @@ var ViewportOverlay$1 = /*#__PURE__*/function (_PureComponent) {
           fontSize: "".concat(fontSize, "px"),
           display: "".concat(hide ? 'none' : 'block')
         }
-      }, /*#__PURE__*/React__default.createElement("div", null, institutionName), /*#__PURE__*/React__default.createElement("div", null, patientName), /*#__PURE__*/React__default.createElement("div", null, patientSex, "/", patientAge), /*#__PURE__*/React__default.createElement("div", null, patientID), /*#__PURE__*/React__default.createElement("div", null, bodyPartExamined), /*#__PURE__*/React__default.createElement("div", null, laterality, " ", viewPosition)), /*#__PURE__*/React__default.createElement("div", {
+      }, /*#__PURE__*/React__default.createElement("div", null, patientName), /*#__PURE__*/React__default.createElement("div", null, patientSex, "/", patientAge), /*#__PURE__*/React__default.createElement("div", null, patientID), /*#__PURE__*/React__default.createElement("div", null, bodyPartExamined), /*#__PURE__*/React__default.createElement("div", null, laterality, " ", viewPosition)), /*#__PURE__*/React__default.createElement("div", {
         style: {
           position: 'absolute',
           bottom: 4,
@@ -72986,7 +73044,7 @@ var ViewportOverlay$1 = /*#__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$1('kV', kvp)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo$1('mA', xRayTubeCurrent)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo$1('Time', exposureTime)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo$1('mAs', exposure))), /*#__PURE__*/React__default.createElement("div", null, patientOrientation), /*#__PURE__*/React__default.createElement("div", null, getTRAndTE$2(repetitionTime, echoTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo$2('TI', inversionTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo$2('FA', flipAngle)), /*#__PURE__*/React__default.createElement("div", null, thk), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo$2('B', diffusionBValue, false)), seriesDescription && seriesDescription !== protocolName && /*#__PURE__*/React__default.createElement("div", null, seriesDescription)), /*#__PURE__*/React__default.createElement("div", {
+      }, showDXDRCR && /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo$2('kV', kvp)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo$2('mA', xRayTubeCurrent)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo$2('Time', exposureTime)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo$2('mAs', exposure))), /*#__PURE__*/React__default.createElement("div", null, patientOrientation), /*#__PURE__*/React__default.createElement("div", null, getTRAndTE$2(repetitionTime, echoTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo$2('TI', inversionTime)), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo$2('FA', flipAngle)), showCT && /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo$2('kV', kvp)), /*#__PURE__*/React__default.createElement("div", null, formatDRDXInfo$2('mAs', exposure))), /*#__PURE__*/React__default.createElement("div", null, thk), /*#__PURE__*/React__default.createElement("div", null, formatDicomInfo$2('B', diffusionBValue, false)), seriesDescription && seriesDescription !== protocolName && /*#__PURE__*/React__default.createElement("div", null, seriesDescription)), /*#__PURE__*/React__default.createElement("div", {
         style: {
           position: 'absolute',
           top: 4,
@@ -72995,7 +73053,7 @@ var ViewportOverlay$1 = /*#__PURE__*/function (_PureComponent) {
           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", null, "Se: ", seriesNumber, "/", seriesCount), /*#__PURE__*/React__default.createElement("div", null, "Im: ", instanceNumber, "/", instanceCount), /*#__PURE__*/React__default.createElement("div", null, formatInPlanePhaseEncodingDirection$2(inPlanePhaseEncodingDirection))), /*#__PURE__*/React__default.createElement("div", {
+      }, /*#__PURE__*/React__default.createElement("div", null, institutionName), /*#__PURE__*/React__default.createElement("div", null, studyDateTime && studyDateTime.format('YYYY-MM-DD HH:mm:ss')), /*#__PURE__*/React__default.createElement("div", null, "Se: ", seriesNumber, "/", seriesCount), /*#__PURE__*/React__default.createElement("div", null, "Im: ", instanceNumber, "/", instanceCount), /*#__PURE__*/React__default.createElement("div", null, formatInPlanePhaseEncodingDirection$2(inPlanePhaseEncodingDirection))), /*#__PURE__*/React__default.createElement("div", {
         style: {
           position: 'absolute',
           bottom: 4,