hellfire 0.21.1 → 0.21.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 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.21.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.21.1...v0.21.2) (2022-06-24)
+
+
+
 ## [0.21.1](http://10.16.100.57/diffusion/115/paladin/compare/v0.21.0...v0.21.1) (2022-06-22)
 
 

package/dist/index.js

@@ -859,7 +859,12 @@ var MessagerKeys = {
    * 完成裁剪操作
    * 消息参数类型: null
    */
-  MipFinishClipPathExport: "2001"
+  MipFinishClipPathExport: "2001",
+
+  /**
+   * 调窗操作
+   */
+  MipWwwcChange: "2002"
 };
 var _default$1 = {
   MessagerKeys: MessagerKeys
@@ -21228,8 +21233,6 @@ var MipImageProcessorWorkerImpl = /*#__PURE__*/function (_ImageProcessorWorker)
 
         last = aSegment.endPixel;
       });
-      this.opacityTransformFunction.addPoint(ImageProcessorWorkerBase.ctValueToImageValue(last + 0.5, this.rescaleSlop, this.rescaleIntercept), //last+0.5,
-      1);
       if (this._canRender) this.renderWindow.render();
     }
   }, {
@@ -21416,8 +21419,14 @@ var MipImageProcessorWorkerImpl = /*#__PURE__*/function (_ImageProcessorWorker)
         var maxValue = this.windowMaxPixel; //  mip 在窗宽范围内线性变化
 
         if (this.actionParameter.reconstructMethodType === ReconstructMethodType.MIP) {
-          colorSegments = [new MipPixelSegment(minValue, 0x5A5A5A, maxValue, 0xFFFFFF)];
-          opacitySegments = [new MipPixelSegment(minValue, 0.02, maxValue, 0.99)];
+          colorSegments = [new MipPixelSegment(minValue, 0xFFFFFF, maxValue, 0xFFFFFF)];
+          var range = maxValue - minValue;
+          opacitySegments = [new MipPixelSegment(Math.floor(minValue), 0.01, Math.floor(minValue + range * 0.15), 0.1), new MipPixelSegment(Math.floor(minValue + range * 0.15), 0.25, Math.floor(minValue + range * 0.75), 0.97), new MipPixelSegment(Math.floor(minValue + range * 0.75), 0.97, Math.floor(maxValue), 1)]; // colorSegments = [
+          //     new MipPixelSegment(minValue, 0x5A5A5A, maxValue, 0xFFFFFF),
+          // ];
+          // opacitySegments = [
+          //     new MipPixelSegment(minValue, 0.02, maxValue, 0.99),
+          // ];
         } else {
           colorSegments = [new MipPixelSegment(minValue, 0x555555, minValue + (maxValue - minValue) * 0.3, 0x888888), new MipPixelSegment(minValue + (maxValue - minValue) * 0.3, 0xBFAE96, minValue + (maxValue - minValue) * 2, 0xBFAE96), new MipPixelSegment(minValue + (maxValue - minValue) * 2, 0xBFAE96, minValue + (maxValue - minValue) * 100, 0xffffff)];
           opacitySegments = [new MipPixelSegment(minValue, 0, minValue + (maxValue - minValue) * 0.3, 0.1), new MipPixelSegment(minValue + (maxValue - minValue) * 2, 0.6, minValue + (maxValue - minValue) * 100, 0.99)];
@@ -21429,7 +21438,10 @@ var MipImageProcessorWorkerImpl = /*#__PURE__*/function (_ImageProcessorWorker)
         this.actionParameter.addTailOpacityTransformSegments(opacitySegments);
         this.updateColorFunction();
         this.updateOpacityTransform();
-      }
+      } // 窗宽窗值
+
+
+      Messager.Instance.call(_default$1.MessagerKeys.MipWwwcChange, this.messageGroupId, this.volumeWindowLevel);
     }
   }, {
     key: "releaseVTKComponent",
@@ -53441,7 +53453,7 @@ var _default$16 = ConnectedSurgeryLayout;
 var css_248z$r = ".paladin-main-wrapper svg {\n  width: 100%;\n  height: 100%;\n}\n.paladin-main-wrapper span,\n.paladin-main-wrapper div {\n  user-select: none;\n}\n.paladin-main-wrapper .paladin-dicomView-dicomToolWrapper {\n  background-color: #353535;\n  z-index: 2;\n}\n.paladin-main-wrapper .paladin-dicomView-dicomThumbnailWrapper {\n  background-color: #353535;\n  border: 1px solid #727882;\n}\n.paladin-main-wrapper .paladin-dicomView-pcmobileWrapper {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  width: 0;\n}\nbutton:focus {\n  outline: none;\n}\n.paladin-flex {\n  display: flex;\n}\n.paladin-flex-row {\n  display: flex;\n  box-sizing: border-box;\n  flex-direction: row;\n  flex-wrap: wrap;\n  flex: 0 1 auto;\n}\n.paladin-flex-col {\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n  flex: 0 0 auto;\n}\n.paladin-flex-center {\n  justify-content: center;\n  align-items: center;\n}\n.paladin-flex-end {\n  justify-content: flex-end;\n}\n.paladin-flex-1 {\n  flex: 1;\n}\n.paladin-full-content {\n  width: 100%;\n  height: 100%;\n}\n.paladin-full-height {\n  height: 100%;\n}\n.paladin-full-width {\n  width: 100%;\n}\n.paladin-text-center {\n  text-align: center;\n}\n";
 styleInject$1(css_248z$r);
 
-var css_248z$s = ".image-processing-container {\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  text-align: center;\n  background: black;\n  display: flex;\n  align-items: center;\n  justify-content: space-around;\n  flex-direction: column;\n  z-index: 999;\n}\n.image-processing-container-content {\n  cursor: pointer;\n}\n.image-processing-container-content svg {\n  width: 50px;\n  height: 50px;\n  display: block;\n  margin: 15px auto 0 auto;\n  color: #999;\n}\n.paladin-three-wrapper {\n  width: 100%;\n  height: 100%;\n  color: white;\n  display: flex;\n}\n.paladin-three-horizontal-left {\n  width: 66.6%;\n  height: 100%;\n}\n.paladin-three-horizontal-right {\n  width: 33.4%;\n  height: 100%;\n  display: flex;\n  flex-direction: column;\n}\n.paladin-three-vertical-top {\n  width: 100%;\n  height: 66.6%;\n  flex-direction: row;\n}\n.paladin-three-vertical-bottom {\n  width: 100%;\n  height: 33.4%;\n  display: flex;\n  flex-direction: row;\n}\n.paladin-three-height-50 {\n  width: 100%;\n  height: 50%;\n}\n.paladin-three-width-50 {\n  width: 50%;\n  height: 100%;\n}\n.paladin-three-height-33 {\n  width: 100%;\n  height: 33.333%;\n}\n.paladin-three-width-33 {\n  height: 100%;\n  width: 33.333%;\n}\n.paladin-three-relative {\n  position: relative;\n}\n";
+var css_248z$s = ".image-processing-container {\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  text-align: center;\n  background: black;\n  display: flex;\n  align-items: center;\n  justify-content: space-around;\n  flex-direction: column;\n  z-index: 999;\n}\n.image-processing-container-content {\n  cursor: pointer;\n}\n.image-processing-container-content svg {\n  width: 50px;\n  height: 50px;\n  display: block;\n  margin: 15px auto 0 auto;\n  color: #999;\n}\n.paladin-three-wrapper {\n  width: 100%;\n  height: 100%;\n  color: white;\n  display: flex;\n}\n.paladin-three-horizontal-left {\n  width: 66.6%;\n  height: 100%;\n}\n.paladin-three-horizontal-right {\n  width: 33.4%;\n  height: 100%;\n  display: flex;\n  flex-direction: column;\n}\n.paladin-three-vertical-top {\n  width: 100%;\n  height: 66.6%;\n  flex-direction: row;\n}\n.paladin-three-vertical-bottom {\n  width: 100%;\n  height: 33.4%;\n  display: flex;\n  flex-direction: row;\n}\n.paladin-three-height-50 {\n  width: 100%;\n  height: 50%;\n}\n.paladin-three-width-50 {\n  width: 50%;\n  height: 100%;\n}\n.paladin-three-height-33 {\n  width: 100%;\n  height: 33.333%;\n}\n.paladin-three-width-33 {\n  height: 100%;\n  width: 33.333%;\n}\n.paladin-three-relative {\n  position: relative;\n}\n.mip-wwwc {\n  position: absolute;\n  bottom: 15px;\n  left: 15px;\n}\n.mip-wwwc p {\n  color: #ffffff;\n  margin: 0;\n  text-align: right;\n}\n";
 styleInject$1(css_248z$s);
 
 (function () {
@@ -54347,7 +54359,9 @@ var MIPLayout = /*#__PURE__*/function (_Component) {
 
     _this.state = {
       processing: true,
-      error: null
+      error: null,
+      windowWidth: 0,
+      windowCenter: 0
     };
     _this.vr = '';
     return _this;
@@ -54357,6 +54371,9 @@ var MIPLayout = /*#__PURE__*/function (_Component) {
     key: "initVR",
     value: function () {
       var _initVR = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(currentSeries, instanceImages) {
+        var _this2 = this;
+
+        var volumeWindowLevel;
         return regenerator.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -54374,12 +54391,27 @@ var MIPLayout = /*#__PURE__*/function (_Component) {
                 this.vr = _context.sent;
                 // mip左键默认工具是调窗
                 this.vr.ActionParameter.mouseActionMode = InteractorStyleActionMode.WindowLevel;
-                this.props.set3DActiveTool('MipWWWc');
-                _context.next = 13;
+                this.props.set3DActiveTool('MipWWWc'); // 窗值初始值
+
+                volumeWindowLevel = this.vr.volumeWindowLevel;
+                this.setState({
+                  windowWidth: Math.floor(volumeWindowLevel.level),
+                  windowCenter: Math.floor(volumeWindowLevel.center)
+                }); // 调窗监听
+
+                Messager.Instance.regist(_default$1.MessagerKeys.MipWwwcChange, this.vr.messageGroupId, function (param) {
+                  if (param) {
+                    _this2.setState({
+                      windowWidth: param.level,
+                      windowCenter: param.center
+                    });
+                  }
+                });
+                _context.next = 16;
                 break;
 
-              case 8:
-                _context.prev = 8;
+              case 11:
+                _context.prev = 11;
                 _context.t0 = _context["catch"](0);
                 console.error(_context.t0);
                 this.setState({
@@ -54388,19 +54420,19 @@ var MIPLayout = /*#__PURE__*/function (_Component) {
                 });
                 return _context.abrupt("return");
 
-              case 13:
+              case 16:
                 this.setState({
                   processingMessage: null,
                   processing: false,
                   error: null
                 });
 
-              case 14:
+              case 17:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this, [[0, 8]]);
+        }, _callee, this, [[0, 11]]);
       }));
 
       function initVR(_x, _x2) {
@@ -54413,7 +54445,7 @@ var MIPLayout = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function () {
       var _componentDidMount = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2() {
-        var _this2 = this;
+        var _this3 = this;
 
         var currentSeries, instanceImages, i;
         return regenerator.wrap(function _callee2$(_context2) {
@@ -54444,7 +54476,7 @@ var MIPLayout = /*#__PURE__*/function (_Component) {
                     error: null
                   }, function () {
                     setTimeout(function () {
-                      _this2.initVR(currentSeries, instanceImages);
+                      _this3.initVR(currentSeries, instanceImages);
                     }, 50);
                   });
                 }
@@ -54496,7 +54528,9 @@ var MIPLayout = /*#__PURE__*/function (_Component) {
       var _this$state = this.state,
           processing = _this$state.processing,
           processingMessage = _this$state.processingMessage,
-          error = _this$state.error;
+          error = _this$state.error,
+          windowWidth = _this$state.windowWidth,
+          windowCenter = _this$state.windowCenter;
       return /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-three-wrapper",
         style: {
@@ -54515,7 +54549,9 @@ var MIPLayout = /*#__PURE__*/function (_Component) {
           height: '100%'
         },
         id: 'mipContainer'
-      })));
+      }), /*#__PURE__*/React__default.createElement("div", {
+        className: "mip-wwwc"
+      }, /*#__PURE__*/React__default.createElement("p", null, "W:", windowWidth), /*#__PURE__*/React__default.createElement("p", null, "C:", windowCenter))));
     }
   }, {
     key: "__reactstandin__regenerateByEval",
@@ -55749,6 +55785,7 @@ var mergeProps$l = function mergeProps(propsFromState, propsFromDispatch, ownPro
       },
       FORWARD: function FORWARD() {
         var activeElement = getCurrentElement();
+        if (!activeElement) return;
 
         if (threeDMode) {
           changeMprPositionWithElement(activeElement, -1, threeScrollType);
@@ -55758,6 +55795,7 @@ var mergeProps$l = function mergeProps(propsFromState, propsFromDispatch, ownPro
       },
       BACKWARD: function BACKWARD() {
         var activeElement = getCurrentElement();
+        if (!activeElement) return;
 
         if (threeDMode) {
           changeMprPositionWithElement(activeElement, 1, threeScrollType);
@@ -55797,12 +55835,15 @@ var mergeProps$l = function mergeProps(propsFromState, propsFromDispatch, ownPro
         });
       },
       SCROLL_START: function SCROLL_START() {
-        _default$E.scrollToIndex(getCurrentElement(), 0, true, {
+        var activeElement = getCurrentElement();
+        if (!activeElement) return;
+        _default$E.scrollToIndex(activeElement, 0, true, {
           backToStart: true
         });
       },
       SCROLL_END: function SCROLL_END() {
         var activeElement = getCurrentElement();
+        if (!activeElement) return;
         var max = _default$E.getImagesLength(activeElement) - 1;
         _default$E.scrollToIndex(activeElement, max, tement, max, true, {
           backToEnd: true
@@ -55819,43 +55860,63 @@ var mergeProps$l = function mergeProps(propsFromState, propsFromDispatch, ownPro
       },
       WWWC1: function WWWC1() {
         if (!wwwcCustomDic[0]) return;
-        setWwwc(getCurrentElement(), wwwcCustomDic[0].ww, wwwcCustomDic[0].wc);
+        var activeElement = getCurrentElement();
+        if (!activeElement) return;
+        setWwwc(activeElement, wwwcCustomDic[0].ww, wwwcCustomDic[0].wc);
       },
       WWWC2: function WWWC2() {
         if (!wwwcCustomDic[1]) return;
-        setWwwc(getCurrentElement(), wwwcCustomDic[1].ww, wwwcCustomDic[1].wc);
+        var activeElement = getCurrentElement();
+        if (!activeElement) return;
+        setWwwc(activeElement, wwwcCustomDic[1].ww, wwwcCustomDic[1].wc);
       },
       WWWC3: function WWWC3() {
         if (!wwwcCustomDic[2]) return;
-        setWwwc(getCurrentElement(), wwwcCustomDic[2].ww, wwwcCustomDic[2].wc);
+        var activeElement = getCurrentElement();
+        if (!activeElement) return;
+        setWwwc(activeElement, wwwcCustomDic[2].ww, wwwcCustomDic[2].wc);
       },
       WWWC4: function WWWC4() {
         if (!wwwcCustomDic[3]) return;
-        setWwwc(getCurrentElement(), wwwcCustomDic[3].ww, wwwcCustomDic[3].wc);
+        var activeElement = getCurrentElement();
+        if (!activeElement) return;
+        setWwwc(activeElement, wwwcCustomDic[3].ww, wwwcCustomDic[3].wc);
       },
       WWWC5: function WWWC5() {
         if (!wwwcCustomDic[4]) return;
-        setWwwc(getCurrentElement(), wwwcCustomDic[4].ww, wwwcCustomDic[4].wc);
+        var activeElement = getCurrentElement();
+        if (!activeElement) return;
+        setWwwc(activeElement, wwwcCustomDic[4].ww, wwwcCustomDic[4].wc);
       },
       WWWC6: function WWWC6() {
         if (!wwwcCustomDic[5]) return;
-        setWwwc(getCurrentElement(), wwwcCustomDic[5].ww, wwwcCustomDic[5].wc);
+        var activeElement = getCurrentElement();
+        if (!activeElement) return;
+        setWwwc(activeElement, wwwcCustomDic[5].ww, wwwcCustomDic[5].wc);
       },
       WWWC7: function WWWC7() {
         if (!wwwcCustomDic[6]) return;
-        setWwwc(getCurrentElement(), wwwcCustomDic[6].ww, wwwcCustomDic[6].wc);
+        var activeElement = getCurrentElement();
+        if (!activeElement) return;
+        setWwwc(activeElement, wwwcCustomDic[6].ww, wwwcCustomDic[6].wc);
       },
       WWWC8: function WWWC8() {
         if (!wwwcCustomDic[7]) return;
-        setWwwc(getCurrentElement(), wwwcCustomDic[7].ww, wwwcCustomDic[7].wc);
+        var activeElement = getCurrentElement();
+        if (!activeElement) return;
+        setWwwc(activeElement, wwwcCustomDic[7].ww, wwwcCustomDic[7].wc);
       },
       WWWC9: function WWWC9() {
         if (!wwwcCustomDic[8]) return;
-        setWwwc(getCurrentElement(), wwwcCustomDic[8].ww, wwwcCustomDic[8].wc);
+        var activeElement = getCurrentElement();
+        if (!activeElement) return;
+        setWwwc(activeElement, wwwcCustomDic[8].ww, wwwcCustomDic[8].wc);
       },
       WWWC0: function WWWC0() {
         if (!wwwcCustomDic[9]) return;
-        setWwwc(getCurrentElement(), wwwcCustomDic[9].ww, wwwcCustomDic[9].wc);
+        var activeElement = getCurrentElement();
+        if (!activeElement) return;
+        setWwwc(activeElement, wwwcCustomDic[9].ww, wwwcCustomDic[9].wc);
       }
     },
     getCurrentElement: getCurrentElement,