hellfire 0.22.1 → 0.22.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.22.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.22.1...v0.22.2) (2022-07-08)
+
+
+
 ## [0.22.1](http://10.16.100.57/diffusion/115/paladin/compare/v0.22.0...v0.22.1) (2022-07-07)
 
 

package/dist/index.js

@@ -14200,6 +14200,10 @@ var ImageProcessorWorkerBase = /*#__PURE__*/function () {
         throw new InvalidImageException("LoadImage 参数不能为空.");
       }
 
+      if (param.images.length <= 3) {
+        throw new LoadImageException("序列影像数必须多于3张");
+      }
+
       if (!ImageProcessorWorkerBase.canImagesProcess(param.images)) {
         throw new InvalidImageException("该序列中影像参数不一致[如 宽/高/方位].");
       }
@@ -14208,7 +14212,6 @@ var ImageProcessorWorkerBase = /*#__PURE__*/function () {
 
       try {
         if (param.images === undefined) throw new LoadImageException("LoadImage 参数不能为空");
-        if (param.images.length <= 3) throw new LoadImageException("序列影像数不能少于3张");
         var logger = new RuntimeLogger(this.loadImages.name);
         this.init(param);
         this.loadImagesInternal(ImageProcessorWorkerBase.converToImageModel(param.images), param);
@@ -14515,13 +14518,31 @@ var ImageProcessorWorkerBase = /*#__PURE__*/function () {
   }], [{
     key: "canImagesProcess",
     value: function canImagesProcess(images) {
-      if (!images || images.length < 3) return false;
       var imageModels = ImageProcessorWorkerBase.converToImageModel(images, false);
       var firstImage = imageModels[0];
 
       for (var i = 1; i < imageModels.length; i++) {
         var checkImage = imageModels[i];
-        if (firstImage.imageWidth !== checkImage.imageWidth || firstImage.imageHeight !== checkImage.imageHeight || Math.abs(firstImage.orientation[0] - checkImage.orientation[0]) > 0.0001 || Math.abs(firstImage.orientation[1] - checkImage.orientation[1]) > 0.0001 || Math.abs(firstImage.orientation[2] - checkImage.orientation[2]) > 0.0001 || Math.abs(firstImage.orientation[3] - checkImage.orientation[3]) > 0.0001 || Math.abs(firstImage.orientation[4] - checkImage.orientation[4]) > 0.0001 || Math.abs(firstImage.orientation[5] - checkImage.orientation[5]) > 0.0001) return false;
+
+        if (!firstImage.imageWidth || !firstImage.imageHeight || !checkImage.imageWidth || !checkImage.imageHeight) {
+          console.log('[vtk - image process check] 宽高缺失');
+          return false;
+        }
+
+        if (!firstImage.orientation || !checkImage.orientation) {
+          console.log('[vtk - image process check] 方位缺失');
+          return false;
+        }
+
+        if (firstImage.imageWidth !== checkImage.imageWidth || firstImage.imageHeight !== checkImage.imageHeight) {
+          console.log('[vtk - image process check] 宽高不一致');
+          return false;
+        }
+
+        if (Math.abs(firstImage.orientation[0] - checkImage.orientation[0]) > 0.0001 || Math.abs(firstImage.orientation[1] - checkImage.orientation[1]) > 0.0001 || Math.abs(firstImage.orientation[2] - checkImage.orientation[2]) > 0.0001 || Math.abs(firstImage.orientation[3] - checkImage.orientation[3]) > 0.0001 || Math.abs(firstImage.orientation[4] - checkImage.orientation[4]) > 0.0001 || Math.abs(firstImage.orientation[5] - checkImage.orientation[5]) > 0.0001) {
+          console.log('[vtk - image process check] 方位不一致');
+          return false;
+        }
       }
 
       return true;
@@ -45685,35 +45706,35 @@ var DicomToolFlattenMode = /*#__PURE__*/function (_Component) {
         onClick: function onClick(e) {
           e.stopPropagation();
 
-          if (!MIP) {
+          if (!VR) {
             if (isThree) {
               exit3D();
             }
 
-            start3D('MIP');
+            start3D('VR');
           }
         },
-        className: MIP ? 'paladin-tool-nav paladin-tool-nav-active' : 'paladin-tool-nav',
+        className: VR ? 'paladin-tool-nav paladin-tool-nav-active' : 'paladin-tool-nav',
         style: {
           borderRight: '1px solid #5b5b5b'
         }
-      }, "MIP"), IODisconnect && /*#__PURE__*/React__default.createElement("div", {
+      }, "VR"), IODisconnect && /*#__PURE__*/React__default.createElement("div", {
         onClick: function onClick(e) {
           e.stopPropagation();
 
-          if (!VR) {
+          if (!MIP) {
             if (isThree) {
               exit3D();
             }
 
-            start3D('VR');
+            start3D('MIP');
           }
         },
-        className: VR ? 'paladin-tool-nav paladin-tool-nav-active' : 'paladin-tool-nav',
+        className: MIP ? 'paladin-tool-nav paladin-tool-nav-active' : 'paladin-tool-nav',
         style: {
           borderRight: '1px solid #5b5b5b'
         }
-      }, "VR")), showBaseTools && /*#__PURE__*/React__default.createElement("div", {
+      }, "MIP")), showBaseTools && /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flex-row"
       }, commonTools && commonTools.map(function (item, i) {
         return /*#__PURE__*/React__default.createElement(DicomToolItemPlus, _extends_1({}, _this2.props, {
@@ -46025,32 +46046,32 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
         onClick: function onClick(e) {
           e.stopPropagation();
 
-          if (!MIP) {
+          if (!VR) {
             if (isThree) {
               exit3D();
             }
 
-            start3D('MIP');
+            start3D('VR');
           }
         },
-        className: MIP ? 'paladin-tool-nav paladin-tool-nav-active' : 'paladin-tool-nav',
-        style: {
-          borderRight: '1px solid #5b5b5b'
-        }
-      }, "MIP"), IODisconnect && /*#__PURE__*/React__default.createElement("div", {
+        className: VR ? 'paladin-tool-nav paladin-tool-nav-active' : 'paladin-tool-nav'
+      }, "VR"), IODisconnect && /*#__PURE__*/React__default.createElement("div", {
         onClick: function onClick(e) {
           e.stopPropagation();
 
-          if (!VR) {
+          if (!MIP) {
             if (isThree) {
               exit3D();
             }
 
-            start3D('VR');
+            start3D('MIP');
           }
         },
-        className: VR ? 'paladin-tool-nav paladin-tool-nav-active' : 'paladin-tool-nav'
-      }, "VR")), showBaseTools && /*#__PURE__*/React__default.createElement("div", {
+        className: MIP ? 'paladin-tool-nav paladin-tool-nav-active' : 'paladin-tool-nav',
+        style: {
+          borderRight: '1px solid #5b5b5b'
+        }
+      }, "MIP")), showBaseTools && /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-flex-col paladin-flex-1 paladin-hor-border",
         style: {
           flex: MPR ? 3 : 2
@@ -47174,7 +47195,7 @@ var _default$_ = function _default(images) {
 
 
   if (images.length <= 3) {
-    return "序列影像数不能少于3张";
+    return "序列影像数必须多于3张";
   }
 
   var checkResult = imageProcessCheckError(images);