hellfire 0.28.13 → 0.28.15

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.28.15](http://10.16.100.57/diffusion/115/paladin/compare/v0.28.14...v0.28.15) (2025-01-14)
+
+
+
+## [0.28.14](http://10.16.100.57/diffusion/115/paladin/compare/v0.28.13...v0.28.14) (2024-12-30)
+
+
+
 ## [0.28.13](http://10.16.100.57/diffusion/115/paladin/compare/v0.28.12...v0.28.13) (2024-12-30)
 
 

package/dist/index.js

@@ -40,9 +40,9 @@ var vtkMapper = _interopDefault(require('vtk.js/Sources/Rendering/Core/Mapper'))
 var vtkInteractorStyle = _interopDefault(require('vtk.js/Sources/Rendering/Core/InteractorStyle'));
 var vtkInteractorStyleConstants = _interopDefault(require('vtk.js/Sources/Rendering/Core/InteractorStyle/Constants'));
 var Hammer = _interopDefault(require('hammerjs'));
-var reactRedux = require('react-redux');
 var React = require('react');
 var React__default = _interopDefault(React);
+var reactRedux = require('react-redux');
 var PropTypes$1 = _interopDefault(require('prop-types'));
 var ReactDOM = require('react-dom');
 var ReactDOM__default = _interopDefault(ReactDOM);
@@ -43852,7 +43852,6 @@ var DicomToolFlattenMode = /*#__PURE__*/function (_Component) {
           toggleImageMode = _this$props3.toggleImageMode,
           toggleMeasure = _this$props3.toggleMeasure,
           handleFullscreen = _this$props3.handleFullscreen,
-          openDicomModal = _this$props3.openDicomModal,
           operateKeyImages = _this$props3.operateKeyImages,
           openSettingModal = _this$props3.openSettingModal,
           handleFilmPrint = _this$props3.handleFilmPrint,
@@ -44057,25 +44056,7 @@ var DicomToolFlattenMode = /*#__PURE__*/function (_Component) {
         onClick: toggleOverlayText
       }, showOverlayText ? '隐藏图像信息' : '显示图像信息')), showDicomTools && /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flex-row"
-      }, /*#__PURE__*/React__default.createElement(LargeToolItem, {
-        onClick: function onClick(e) {
-          e.stopPropagation();
-          openDicomModal('dicomInfo', 'DICOM详情信息');
-        }
-      }, "\u56FE\u50CF\u4FE1\u606F"), /*#__PURE__*/React__default.createElement(LargeToolItem, {
-        onClick: function onClick(e) {
-          e.stopPropagation();
-          openDicomModal('scanInfo', '扫描参数');
-        }
-      }, "\u626B\u63CF\u4FE1\u606F"), /*#__PURE__*/React__default.createElement(LargeToolItem, {
-        active: displayShutter,
-        onClick: toggleDisplayShutter
-      }, "\u906E\u7F69")), !MIP && /*#__PURE__*/React__default.createElement("div", {
-        className: "paladin-flex-row"
-      }, /*#__PURE__*/React__default.createElement(LargeToolItem, {
-        active: Fullscreen,
-        onClick: handleFullscreen
-      }, "\u5168\u5C4F"), showSurgeryTool && /*#__PURE__*/React__default.createElement(LargeToolItem, {
+      }, showSurgeryTool && /*#__PURE__*/React__default.createElement(LargeToolItem, {
         active: Surgery,
         onClick: function onClick() {
           if (Surgery) {
@@ -44085,6 +44066,14 @@ var DicomToolFlattenMode = /*#__PURE__*/function (_Component) {
           }
         }
       }, Surgery ? '退出手术路径' : '手术路径'), /*#__PURE__*/React__default.createElement(LargeToolItem, {
+        active: displayShutter,
+        onClick: toggleDisplayShutter
+      }, "\u906E\u7F69")), !MIP && /*#__PURE__*/React__default.createElement("div", {
+        className: "paladin-flex-row"
+      }, /*#__PURE__*/React__default.createElement(LargeToolItem, {
+        active: Fullscreen,
+        onClick: handleFullscreen
+      }, "\u5168\u5C4F"), /*#__PURE__*/React__default.createElement(LargeToolItem, {
         onClick: function onClick(e) {
           e.stopPropagation();
           openSettingModal();
@@ -44179,7 +44168,6 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
           toggleOverlayText = _this$props3.toggleOverlayText,
           toggleImageMode = _this$props3.toggleImageMode,
           toggleMeasure = _this$props3.toggleMeasure,
-          openDicomModal = _this$props3.openDicomModal,
           handleFullscreen = _this$props3.handleFullscreen,
           setCustomWindowLayoutType = _this$props3.setCustomWindowLayoutType,
           operateKeyImages = _this$props3.operateKeyImages,
@@ -44223,7 +44211,6 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
       var showMPRTools = (MPR || VR) && !MIP;
       var showBaseTools = !MIP;
       var showLengthTools = !MIP;
-      var showDicomTools = !isThree;
       var showMeasureAndOverlayTool = !MIP;
       var showSurgeryTool = !MPR && !MIP && IODisconnect && mode && mode !== 'allImageMode';
       return /*#__PURE__*/React__default.createElement("div", {
@@ -44399,29 +44386,19 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
         onClick: toggleMeasure
       }, "\u8FDE\u7EED\u6D4B\u91CF"), /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
         onClick: toggleOverlayText
-      }, showOverlayText ? '隐藏图像信息' : '显示图像信息')), showDicomTools && /*#__PURE__*/React__default.createElement("div", {
+      }, showOverlayText ? '隐藏图像信息' : '显示图像信息')), /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flex-row"
       }, /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
         onClick: function onClick(e) {
           e.stopPropagation();
-          openDicomModal('dicomInfo', 'DICOM详情信息');
-        }
-      }, "\u56FE\u50CF\u4FE1\u606F"), /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
-        onClick: function onClick(e) {
-          e.stopPropagation();
-          openDicomModal('scanInfo', '扫描参数');
+          openSettingModal();
         }
-      }, "\u626B\u63CF\u4FE1\u606F"), /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
-        active: Fullscreen,
-        onClick: handleFullscreen
-      }, "\u5168\u5C4F")), isThree && !MIP && /*#__PURE__*/React__default.createElement("div", {
-        className: "paladin-flex-row"
-      }, /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
+      }, "\u529F\u80FD\u8BBE\u7F6E"), /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
         active: Fullscreen,
         onClick: handleFullscreen
-      }, "\u5168\u5C4F")), showSurgeryTool && /*#__PURE__*/React__default.createElement("div", {
+      }, "\u5168\u5C4F")), !MIP && /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flex-row"
-      }, /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
+      }, showSurgeryTool && /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
         active: Surgery,
         onClick: function onClick() {
           if (Surgery) {
@@ -44430,14 +44407,7 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
             start3D('Surgery');
           }
         }
-      }, Surgery ? '退出手术路径' : '手术路径')), !MIP && /*#__PURE__*/React__default.createElement("div", {
-        className: "paladin-flex-row"
-      }, /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
-        onClick: function onClick(e) {
-          e.stopPropagation();
-          openSettingModal();
-        }
-      }, "\u529F\u80FD\u8BBE\u7F6E"), /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
+      }, Surgery ? '退出手术路径' : '手术路径'), /*#__PURE__*/React__default.createElement(LargeToolItem$1, {
         active: displayShutter,
         onClick: toggleDisplayShutter
       }, "\u906E\u7F69")), !isThree && allowFilmPrint && /*#__PURE__*/React__default.createElement("div", {
@@ -49121,21 +49091,6 @@ function _createSuper$1t(Derived) { var hasNativeReflectConstruct = _isNativeRef
 
 function _isNativeReflectConstruct$1t() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
 
-var getCompression = function getCompression(dicom) {
-  var lossyImageCompression = dicom.LossyImageCompression.toString(),
-      lossyImageCompressionRatio = dicom.LossyImageCompressionRatio.toString(),
-      lossyImageCompressionMethod = dicom.LossyImageCompressionMethod.toString();
-
-  if (lossyImageCompression === '01' && lossyImageCompressionRatio !== '') {
-    var compressionMethod = lossyImageCompressionMethod || 'Lossy: ';
-    var compressionRatio = formatNumberPrecision(lossyImageCompressionRatio, 2);
-    return compressionMethod + compressionRatio + ' : 1';
-  } // return 'Lossless / Uncompressed';
-
-
-  return '';
-};
-
 var getStudyDateTime = function getStudyDateTime(dicom) {
   // 因为检查时间部分数据可能未传, 根据以下顺序进行获取
   var fetchTagList = ['Content', 'Acquisition', 'Series', 'Study'];
@@ -49473,7 +49428,9 @@ 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) : ''; // 右上
+      var thk = actualSpacingBetweenSlices || sliceThickness ? "THK: ".concat(sliceThickness && parseFloat(sliceThickness).toFixed(1), "/").concat(actualSpacingBetweenSlices) : ''; // 当长度大于20时，不显示
+
+      var imageComments = dicom.ImageComments.toString(); // 右上
 
       var studyDateTime = getStudyDateTime(dicom);
       var seriesNumber = dicom.SeriesNumber.toString();
@@ -49481,8 +49438,8 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
       // 当前层数 多帧dicom的情况下取currentImageIdIndex
 
       var instanceNumber = stack && stack.isMultiFrame ? stack.currentImageIdIndex + 1 : dicom.InstanceNumber.toString();
-      var seriesCount = stack.seriesCount ? stack.seriesCount : '';
-      var compression = getCompression(dicom);
+      var seriesCount = stack.seriesCount ? stack.seriesCount : ''; // const compression = getCompression(dicom)
+
       var inPlanePhaseEncodingDirection = dicom.InPlanePhaseEncodingDirection.toString(); // 右下
       // 从viewport里面动态获取
 
@@ -49490,9 +49447,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
       var windowWidth = parseFloat(viewport.voi.windowWidth) || 0;
       var windowCenter = parseFloat(viewport.voi.windowCenter) || 0;
       var acquisitionMatrix = dicom.AcquisitionMatrix.value;
-      var sliceLocation = dicom.SliceLocation.value && parseFloat(dicom.SliceLocation.value).toFixed(2); // 当长度大于20时，不显示
-
-      var imageComments = dicom.ImageComments.toString();
+      var sliceLocation = dicom.SliceLocation.value && parseFloat(dicom.SliceLocation.value).toFixed(2);
       return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", {
         style: {
           position: 'absolute',
@@ -49511,7 +49466,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
           fontSize: "".concat(fontSize, "px"),
           display: "".concat(hide ? 'none' : 'block')
         }
-      }, /*#__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)), /*#__PURE__*/React__default.createElement("div", {
+      }, /*#__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,
@@ -49520,7 +49475,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, compression), /*#__PURE__*/React__default.createElement("div", null, formatInPlanePhaseEncodingDirection(inPlanePhaseEncodingDirection))), /*#__PURE__*/React__default.createElement("div", {
+      }, /*#__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,
@@ -49529,7 +49484,7 @@ var ViewportOverlay = /*#__PURE__*/function (_PureComponent) {
           fontSize: "".concat(fontSize, "px"),
           display: "".concat(hide ? 'none' : 'block')
         }
-      }, /*#__PURE__*/React__default.createElement("div", null, "W: ", windowWidth.toFixed(0)), /*#__PURE__*/React__default.createElement("div", null, "C: ", windowCenter.toFixed(0)), /*#__PURE__*/React__default.createElement("div", null, zoom, "X"), /*#__PURE__*/React__default.createElement("div", null, getFov(dicom, imageId)), /*#__PURE__*/React__default.createElement("div", null, getMat(acquisitionMatrix)), (sliceLocation || sliceLocation === 0) && /*#__PURE__*/React__default.createElement("div", null, "Location: ", sliceLocation), imageComments && imageComments.length < 20 && /*#__PURE__*/React__default.createElement("div", null, imageComments)));
+      }, /*#__PURE__*/React__default.createElement("div", null, "W: ", windowWidth.toFixed(0)), /*#__PURE__*/React__default.createElement("div", null, "C: ", windowCenter.toFixed(0)), /*#__PURE__*/React__default.createElement("div", null, zoom, "X"), /*#__PURE__*/React__default.createElement("div", null, getFov(dicom, imageId)), /*#__PURE__*/React__default.createElement("div", null, getMat(acquisitionMatrix)), (sliceLocation || sliceLocation === 0) && /*#__PURE__*/React__default.createElement("div", null, "Location: ", sliceLocation)));
     }
   }]);
 
@@ -66667,20 +66622,6 @@ var FilmTool = /*#__PURE__*/function (_Component) {
   return FilmTool;
 }(React.Component);
 
-var getCompression$1 = function getCompression(dicom) {
-  var lossyImageCompression = dicom.LossyImageCompression.toString(),
-      lossyImageCompressionRatio = dicom.LossyImageCompressionRatio.toString(),
-      lossyImageCompressionMethod = dicom.LossyImageCompressionMethod.toString();
-
-  if (lossyImageCompression === '01' && lossyImageCompressionRatio !== '') {
-    var compressionMethod = lossyImageCompressionMethod || 'Lossy: ';
-    var compressionRatio = formatNumberPrecision(lossyImageCompressionRatio, 2);
-    return compressionMethod + compressionRatio + ' : 1';
-  }
-
-  return '';
-};
-
 var getStudyDateTime$1 = function getStudyDateTime(dicom) {
   // 因为检查时间部分数据可能未传, 根据以下顺序进行获取
   var fetchTagList = ['Content', 'Acquisition', 'Series', 'Study'];
@@ -67372,8 +67313,8 @@ var drawRightTop = function drawRightTop(dicom, ctx, width, stack) {
   var instanceCount = stack.instanceCount || '';
   var instanceNumber = stack.instanceNumber.toString() || '';
   var seriesCount = stack.seriesCount || '';
-  var seriesNumber = stack.seriesNumber.toString() || '';
-  var compression = getCompression$1(dicom);
+  var seriesNumber = stack.seriesNumber.toString() || ''; // const compression = getCompression(dicom)
+
   var inPlanePhaseEncodingDirection = dicom.InPlanePhaseEncodingDirection.toString();
   var contentX = width - dicomInfoPaddingX;
   var contentY = dicomInfoPaddingY;
@@ -67389,12 +67330,10 @@ var drawRightTop = function drawRightTop(dicom, ctx, width, stack) {
   ctx.fillText("Se: ".concat(seriesNumber, "/").concat(seriesCount), contentX, contentY);
   contentY += spacing;
   ctx.fillText("Im: ".concat(instanceNumber, "/").concat(instanceCount), contentX, contentY);
-  contentY += spacing;
-
-  if (compression) {
-    ctx.fillText(compression, contentX, contentY);
-    contentY += spacing;
-  }
+  contentY += spacing; // if (compression) {
+  //     ctx.fillText(compression, contentX, contentY);
+  //     contentY += spacing;
+  // }
 
   var _inPlanePhaseEncodingDirection = formatInPlanePhaseEncodingDirection$1(inPlanePhaseEncodingDirection);
 
@@ -69711,7 +69650,8 @@ var mergeProps$x = function mergeProps(propsFromState, propsFromDispatch, ownPro
       KEYC: ['key-c'],
       KEYA: ['key-a'],
       KEYD: ['key-d'],
-      KEYX: ['key-x']
+      KEYX: ['key-x'],
+      DICOMMODAL: ['ctrl+alt+key-d']
     },
     handlers: {
       PAUSE: function PAUSE() {
@@ -70077,6 +70017,36 @@ var mergeProps$x = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
 
         propsFromDispatch.toggleOverlayText();
+      },
+      DICOMMODAL: function DICOMMODAL() {
+        // 显示dicom信息modal
+        paladinModalOpenEvent({
+          key: 'dicom_modal',
+          value: {
+            tag: "dicomInfo",
+            title: "DICOM详情信息"
+          }
+        });
+        var realActiveIndex = getCurrentRealActiveIndex();
+        var activeElement = getElement(realActiveIndex);
+        var image = cornerstone.getImage(activeElement);
+        Modal.create( /*#__PURE__*/React__default.createElement(DicomInfoModal, {
+          dicomModalTag: "dicomInfo",
+          imageId: image.imageId
+        }), {
+          title: "DICOM详情信息",
+          okText: '关闭',
+          cancelButtonProps: {
+            show: false
+          },
+          style: {
+            top: 0,
+            transform: 'translate(-50%,0)'
+          },
+          onCancel: function onCancel() {
+            paladinModalCloseEvent();
+          }
+        });
       }
     },
     getCurrentElement: getCurrentElement,