hellfire 0.30.12 → 0.31.0

package/dist/index.js

@@ -72,6 +72,8 @@ function _defineProperty(obj, key, value) {
 
 var defineProperty = _defineProperty;
 
+var SOCKET_INIT_REDUX = 'SOCKET_INIT_REDUX';
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -106,12 +108,12 @@ var phoneTools = ["Prev", "Next", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset",
 var mprTools = ["MprExit", "PrevNext", "MprSwitchPerspective", "CrosshairsMPR", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "Fullscreen", "MprRefresh"];
 var mprPhoneTools = ["MprExit", "StackScroll", "MprSwitchPerspective", "CrosshairsMPR", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "MprRefresh"]; // VR 允许使用的工具, 及其排序
 
-var vrTools = ["MprExit", "PrevNext", "VRMode", "VRPresentColor", "VRCenterPointShow", "VRDirection", "VRClip", "VRRefresh", "VRInfo", "MprSwitchPerspective", "CrosshairsMPR", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "Fullscreen", "MprRefresh"];
+var vrTools = ["MprExit", "PrevNext", "VRMode", "VRPresentColor", "VRCenterPointShow", "VRDirection", "VRClip", "VRResetClip", "VRRefresh", "VRInfo", "MprSwitchPerspective", "CrosshairsMPR", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "Fullscreen", "MprRefresh"];
 var vrPhoneTools = ["MprExit", "VRMode", "VRPresentColor", "VRCenterPointShow", "VRDirection", "VRClip", "VRInfo", "Prev", "Next", "MprSwitchPerspective", "CrosshairsMPR", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "MprRefresh"];
 var surgeryTools = ["SurgeryExit", "CentesisStart", "CentesisEnd", "CentesisSave", "PrevNext", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length", "Fullscreen"];
 var surgeryPhoneTools = ["SurgeryExit", "CentesisStart", "CentesisEnd", "CentesisSave", "Prev", "Next", "StackScroll", "Wwwc", "Zoom", "Pan", "Reset", "Rotate", "Tool", "Length"]; // MIP 允许使用的工具, 及其排序
 
-var mipTools = ["MprExit", "MipWWWc", "MipRotate", "MipZoom", "VRDirection", "VRCine", "VRRefresh"]; // 初始化时工具栏平铺or单列
+var mipTools = ["MprExit", "MipWWWc", "MipRotate", "MipZoom", "VRDirection", "VRCine", "VRResetClip", "VRRefresh"]; // 初始化时工具栏平铺or单列
 
 var initToolMode = 'flatten'; // const localToolMode = window.localStorage.getItem('hellfire-custom-toolMode');
 // if (localToolMode) {
@@ -12614,6 +12616,7 @@ var resources = {
       tool_center_show: 'Show Center Point',
       tool_center_hide: 'Hide Center Point',
       tool_clip: 'Clip',
+      reset_clip: 'Reset Clip',
       tool_mode_tooltip: 'View Mode, Click to switch',
       tool_mode_std: 'Std',
       tool_mode_std_detail: 'Standard Mode',
@@ -12836,6 +12839,8 @@ var resources = {
       tool_center_show: '显示中心点',
       tool_center_hide: '隐藏中心点',
       tool_clip: '裁剪',
+      reset_clip: '撤销',
+      reset_clip_tooltip: '撤销裁剪',
       tool_mode_tooltip: '看图模式，可点击后修改',
       tool_mode_std: '常规',
       tool_mode_std_detail: '常规',
@@ -16973,7 +16978,12 @@ var InteractorStyleActionMode = {
   /**
    * 填充区域
    */
-  FillInClip: 71024
+  FillInClip: 71024,
+
+  /**
+   * 自定义裁剪撤销
+   */
+  ResetClip: 91024
 };
 
 /*
@@ -18219,23 +18229,6 @@ var CameraHelper = /*#__PURE__*/function () {
 
 defineProperty(CameraHelper, "_eyeSightFuncs", new Map([[ImagePlanViewDirection.eRALP, CameraEyeSightHelper_RALP.Instance], [ImagePlanViewDirection.eAHPF, CameraEyeSightHelper_AHPF.Instance], [ImagePlanViewDirection.eRHLF, CameraEyeSightHelper_RHLF.Instance]]));
 
-/*
- *****************************************************************
- *                 C O P Y R I G H T  (c) 2018-2019
- *            Suzhou Chainz Medical Technology Co.
- *                    All Rights Reserved
- *****************************************************************
- *
- *       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF
- *              Suzhou Chainz Medical Technology Co.
- *      The copyright notice above does not evidence any
- *     actual or intended publication of such source code.
- *
- *****************************************************************
- *
- *  Author: Zhang Jiaqi
- *
- */
 var States = vtkInteractorStyleConstants.States;
 var vtkErrorMacro$2 = macro.vtkErrorMacro,
     vtkDebugMacro$1 = macro.vtkDebugMacro;
@@ -18289,23 +18282,28 @@ function vtkInteractorStyleEx(publicAPI, model) {
       case InteractorStyleActionMode.SelectClipIn:
       case InteractorStyleActionMode.SelectClipOut:
       case InteractorStyleActionMode.FillInClip:
-        model._clipRect.bottomRight = [pos.x, pos.y];
-        model._clipRect.topRight = [pos.x, model._clipRect.topRight[1]];
-        model._clipRect.bottomLeft = [model._clipRect.bottomLeft[0], pos.y];
-        model._clipRect3D.topRight = publicAPI.displayToWorld(model._clipRect.topRight, callData);
-        model._clipRect3D.bottomLeft = publicAPI.displayToWorld(model._clipRect.bottomLeft, callData);
-        model._clipRect3D.bottomRight = publicAPI.displayToWorld(model._clipRect.bottomRight, callData);
-        model._clipRect3D.topLeft2 = publicAPI.displayToWorld({
-          x: model._clipRect.topLeft[0],
-          y: model._clipRect.topLeft[1]
-        }, callData);
-        var clipNormal = normalizeVector([model._clipRect3D.topLeft2[0] - model._clipRect3D.topLeft[0], model._clipRect3D.topLeft2[1] - model._clipRect3D.topLeft[1], model._clipRect3D.topLeft2[2] - model._clipRect3D.topLeft[2]]);
+        var newPoint2D = [pos.x, pos.y];
+        var newPoint3D = publicAPI.displayToWorld(newPoint2D, callData);
+
+        model._clipPath2D.push(newPoint2D);
+
+        model._clipPath3D.push(newPoint3D);
+
+        if (model._clipPath3D.length === 1) {
+          var nearPoint = model._clipPath3D[0];
+          var farPoint = publicAPI.displayToWorld({
+            x: newPoint2D[0],
+            y: newPoint2D[1]
+          }, callData);
+          model._clipPath3D2 = farPoint;
+          model._clipNormal = normalizeVector([farPoint[0] - nearPoint[0], farPoint[1] - nearPoint[1], farPoint[2] - nearPoint[2]]);
+        }
 
         if (model.isMouseButtonPress) {
           Messager.Instance.call(MessagerKeys.MipAddClipPathPoint, model.messageGroupId, {
-            clipRect: model._clipRect,
-            clipRect3D: model._clipRect3D,
-            clipNormal: clipNormal,
+            clipPath2D: model._clipPath2D,
+            clipPath3D: model._clipPath3D,
+            clipNormal: model._clipNormal,
             clipId: model.currentClipGuid
           });
         }
@@ -18387,34 +18385,47 @@ function vtkInteractorStyleEx(publicAPI, model) {
       case InteractorStyleActionMode.SelectClipOut:
       case InteractorStyleActionMode.FillInClip:
         {
-          model._clipRect = {
-            topLeft: [pos.x, pos.y],
-            topRight: [pos.x, pos.y],
-            bottomLeft: [pos.x, pos.y],
-            bottomRight: [pos.x, pos.y]
-          };
-          model._clipRect3D = {
-            topLeft: [0, 0, 0],
-            topRight: [0, 0, 0],
-            bottomLeft: [0, 0, 0],
-            bottomRight: [0, 0, 0]
-          };
-          model._clipRect3D.topLeft = publicAPI.displayToWorld(model._clipRect.topLeft, callData);
-          model._clipRect3D.topRight = publicAPI.displayToWorld(model._clipRect.topRight, callData);
-          model._clipRect3D.bottomLeft = publicAPI.displayToWorld(model._clipRect.bottomLeft, callData);
-          model._clipRect3D.bottomRight = publicAPI.displayToWorld(model._clipRect.bottomRight, callData);
-          model._clipRect3D.topLeft2 = publicAPI.displayToWorld({
-            x: model._clipRect.topLeft[0],
-            y: model._clipRect.topLeft[1]
-          }, callData);
-          var clipNormal = normalizeVector([model._clipRect3D.topLeft2[0] - model._clipRect3D.topLeft[0], model._clipRect3D.topLeft2[1] - model._clipRect3D.topLeft[1], model._clipRect3D.topLeft2[2] - model._clipRect3D.topLeft[2]]);
-          model.currentClipGuid = guid();
-          Messager.Instance.call(MessagerKeys.MipAddClipPathPoint, model.messageGroupId, {
-            clipRect: model._clipRect,
-            clipRect3D: model._clipRect3D,
-            clipNormal: clipNormal,
-            clipId: model.currentClipGuid
-          });
+          if (!model.currentClipGuid) {
+            model.currentClipGuid = guid();
+          }
+
+          if (!Array.isArray(model._clipPath2D)) {
+            model._clipPath2D = [];
+          }
+
+          if (!Array.isArray(model._clipPath3D)) {
+            model._clipPath3D = [];
+          }
+
+          if (!Array.isArray(model._clipNormal)) {
+            model._clipNormal = [];
+          }
+
+          var newPoint2D = [pos.x, pos.y];
+          var newPoint3D = publicAPI.displayToWorld(newPoint2D, callData);
+
+          model._clipPath2D.push(newPoint2D);
+
+          model._clipPath3D.push(newPoint3D);
+
+          if (model._clipPath3D.length === 1) {
+            var nearPoint = model._clipPath3D[0];
+            var farPoint = publicAPI.displayToWorld({
+              x: newPoint2D[0],
+              y: newPoint2D[1]
+            }, callData);
+            model._clipPath3D2 = farPoint;
+            model._clipNormal = normalizeVector([farPoint[0] - nearPoint[0], farPoint[1] - nearPoint[1], farPoint[2] - nearPoint[2]]);
+          }
+
+          if (model.isMouseButtonPress) {
+            Messager.Instance.call(MessagerKeys.MipAddClipPathPoint, model.messageGroupId, {
+              clipPath2D: model._clipPath2D,
+              clipPath3D: model._clipPath3D,
+              clipNormal: model._clipNormal,
+              clipId: model.currentClipGuid
+            });
+          }
         }
         break;
 
@@ -18469,28 +18480,19 @@ function vtkInteractorStyleEx(publicAPI, model) {
       case InteractorStyleActionMode.SelectClipOut:
       case InteractorStyleActionMode.FillInClip:
         {
-          model._clipRect.bottomRight = [pos.x, pos.y];
-          model._clipRect.topRight = [pos.x, model._clipRect.topRight[1]];
-          model._clipRect.bottomLeft = [model._clipRect.bottomLeft[0], pos.y];
-          model._clipRect3D.topLeft = publicAPI.displayToWorld(model._clipRect.topLeft, callData);
-          model._clipRect3D.topRight = publicAPI.displayToWorld(model._clipRect.topRight, callData);
-          model._clipRect3D.bottomLeft = publicAPI.displayToWorld(model._clipRect.bottomLeft, callData);
-          model._clipRect3D.bottomRight = publicAPI.displayToWorld(model._clipRect.bottomRight, callData);
-          model._clipRect3D.topLeft2 = publicAPI.displayToWorld({
-            x: model._clipRect.topLeft[0],
-            y: model._clipRect.topLeft[1]
-          }, callData);
-          var clipNormal = normalizeVector([model._clipRect3D.topLeft2[0] - model._clipRect3D.topLeft[0], model._clipRect3D.topLeft2[1] - model._clipRect3D.topLeft[1], model._clipRect3D.topLeft2[2] - model._clipRect3D.topLeft[2]]);
           var clipPositions = publicAPI.createValidClipPositions2D(callData);
           Messager.Instance.call(MessagerKeys.MipFinishClipPath, model.messageGroupId, {
-            clipRect: model._clipRect,
-            clipRect3D: model._clipRect3D,
-            clipNormal: clipNormal,
-            clipPositions: clipPositions,
+            clipPath2D: toConsumableArray(model._clipPath2D),
+            clipPath3D: toConsumableArray(model._clipPath3D),
+            clipNormal: toConsumableArray(model._clipNormal),
             clipId: model.currentClipGuid,
-            mode: model.interactorStyleActionMode
+            clipPath3D2: model._clipPath3D2,
+            clipPolygonPositions: clipPositions
           });
           model.currentClipGuid = null;
+          model._clipPath2D = [];
+          model._clipPath3D = [];
+          model._clipNormal = null;
           Messager.Instance.call(MessagerKeys.GlobalMprCommandReconstruct, MessagerKeys.Empty);
           Messager.Instance.call(MessagerKeys.MipFinishClipPathExport, model.messageGroupId, null);
         }
@@ -18536,17 +18538,54 @@ function vtkInteractorStyleEx(publicAPI, model) {
   };
 
   publicAPI.createValidClipPositions2D = function (callData) {
-    var left = Math.round(Math.min(model._clipRect.topLeft[0], model._clipRect.bottomRight[0]));
-    var right = Math.round(Math.max(model._clipRect.topLeft[0], model._clipRect.bottomRight[0]));
-    var top = Math.round(Math.min(model._clipRect.topLeft[1], model._clipRect.bottomRight[1]));
-    var bottom = Math.round(Math.max(model._clipRect.topLeft[1], model._clipRect.bottomRight[1]));
-    var size = (right - left + 1) * (bottom - top + 1);
-    var positions = new Array(size);
+    var polygon = model._clipPath2D;
+
+    if (!Array.isArray(polygon) || polygon.length < 3) {
+      return [];
+    }
+
+    var xs = polygon.map(function (p) {
+      return p[0];
+    });
+    var ys = polygon.map(function (p) {
+      return p[1];
+    });
+    var minX = Math.floor(Math.min.apply(Math, toConsumableArray(xs)));
+    var maxX = Math.ceil(Math.max.apply(Math, toConsumableArray(xs)));
+    var minY = Math.floor(Math.min.apply(Math, toConsumableArray(ys)));
+    var maxY = Math.ceil(Math.max.apply(Math, toConsumableArray(ys)));
+
+    function isPointInPolygon(x, y, poly) {
+      var inside = false;
+
+      for (var i = 0, j = poly.length - 1; i < poly.length; j = i++) {
+        var xi = poly[i][0],
+            yi = poly[i][1];
+        var xj = poly[j][0],
+            yj = poly[j][1];
+        var intersect = yi > y !== yj > y && x < (xj - xi) * (y - yi) / (yj - yi || 0.00001) + xi;
+        if (intersect) inside = !inside;
+      }
+
+      return inside;
+    }
+
+    var count = 0;
+
+    for (var x = minX; x <= maxX; ++x) {
+      for (var y = minY; y <= maxY; ++y) {
+        if (isPointInPolygon(x, y, polygon)) count++;
+      }
+    }
+
+    var positions = new Array(count);
     var index = 0;
 
-    for (var i = left; i <= right; ++i) {
-      for (var j = top; j <= bottom; ++j) {
-        positions[index++] = publicAPI.displayToWorld([i, j], callData);
+    for (var _x = minX; _x <= maxX; ++_x) {
+      for (var _y = minY; _y <= maxY; ++_y) {
+        if (isPointInPolygon(_x, _y, polygon)) {
+          positions[index++] = publicAPI.displayToWorld([_x, _y], callData);
+        }
       }
     }
 
@@ -19930,51 +19969,50 @@ var MipImageProcessorWorkerImpl = /*#__PURE__*/function (_ImageProcessorWorker)
   }, {
     key: "displayClipPath",
     value: function displayClipPath(param) {
-      if (!this._shutterActor) {
-        this._shutterActor = [];
-        this._shutterLine = [];
-        this._topShutterLineIndex = 0;
-        this._rightShutterLineIndex = 1;
-        this._bottomShutterLineIndex = 2;
-        this._leftShutterLineIndex = 3;
+      var clipPath3D = param.clipPath3D,
+          clipNormal = param.clipNormal;
+      if (!Array.isArray(clipPath3D) || clipPath3D.length < 2) return;
 
-        for (var i = 0; i < 4; i++) {
-          this._shutterLine[i] = vtkLineSource.newInstance();
-          var mapper = vtkMapper.newInstance();
-          this._shutterActor[i] = vtkActor.newInstance();
+      if (!this._polyActors) {
+        this._polyActors = [];
+        this._polyLines = [];
+      }
 
-          this._shutterActor[i].getProperty().setEdgeVisibility(false);
+      var stepNormal = [-clipNormal[0] * 2, -clipNormal[1] * 2, -clipNormal[2] * 2];
 
-          this._shutterActor[i].getProperty().setColor(250, 0, 0);
+      for (var i = this._polyLines.length; i < clipPath3D.length - 1; i++) {
+        var line = vtkLineSource.newInstance();
+        var mapper = vtkMapper.newInstance();
+        var actor = vtkActor.newInstance();
+        actor.getProperty().setColor(0, 1, 0);
+        actor.getProperty().setLighting(false);
+        actor.getProperty().setLineWidth(2);
+        actor.getProperty().setOpacity(1.0);
+        mapper.setInputConnection(line.getOutputPort());
+        actor.setMapper(mapper);
 
-          mapper.setInputConnection(this._shutterLine[i].getOutputPort());
+        this._polyLines.push(line);
 
-          this._shutterActor[i].setMapper(mapper);
-        }
+        this._polyActors.push(actor);
+
+        this.renderer.addActor(actor);
       }
 
-      var top = this._shutterLine[this._topShutterLineIndex];
-      var right = this._shutterLine[this._rightShutterLineIndex];
-      var bottom = this._shutterLine[this._bottomShutterLineIndex];
-      var left = this._shutterLine[this._leftShutterLineIndex];
-      var normal = param.clipNormal; // 偏向于内里一点，可以避免浮点误差导致的直线超界
+      for (var _i = 0; _i < clipPath3D.length - 1; _i++) {
+        var p1 = clipPath3D[_i].map(function (v, idx) {
+          return v - stepNormal[idx];
+        });
+
+        var p2 = clipPath3D[_i + 1].map(function (v, idx) {
+          return v - stepNormal[idx];
+        });
 
-      var stepNormal = [-normal[0] * 2, -normal[1] * 2, -normal[2] * 2];
-      var topLeft = [param.clipRect3D.topLeft[0] - stepNormal[0], param.clipRect3D.topLeft[1] - stepNormal[1], param.clipRect3D.topLeft[2] - stepNormal[2]];
-      var topRight = [param.clipRect3D.topRight[0] - stepNormal[0], param.clipRect3D.topRight[1] - stepNormal[1], param.clipRect3D.topRight[2] - stepNormal[2]];
-      var bottomRight = [param.clipRect3D.bottomRight[0] - stepNormal[0], param.clipRect3D.bottomRight[1] - stepNormal[1], param.clipRect3D.bottomRight[2] - stepNormal[2]];
-      var bottomLeft = [param.clipRect3D.bottomLeft[0] - stepNormal[0], param.clipRect3D.bottomLeft[1] - stepNormal[1], param.clipRect3D.bottomLeft[2] - stepNormal[2]];
-      top.setPoint1(topLeft);
-      top.setPoint2(topRight);
-      right.setPoint2(bottomRight);
-      right.setPoint1(topRight);
-      bottom.setPoint1(bottomRight);
-      bottom.setPoint2(bottomLeft);
-      left.setPoint2(topLeft);
-      left.setPoint1(bottomLeft);
+        var eps = 1e-3;
+        if (Math.abs(p1[0] - p2[0]) < eps && Math.abs(p1[1] - p2[1]) < eps && Math.abs(p1[2] - p2[2]) < eps) continue;
 
-      for (var i = 0; i < 4; i++) {
-        this.renderer.addActor(this._shutterActor[i]);
+        this._polyLines[_i].setPoint1(p1);
+
+        this._polyLines[_i].setPoint2(p2);
       }
 
       this.renderWindow.render();
@@ -19986,20 +20024,31 @@ var MipImageProcessorWorkerImpl = /*#__PURE__*/function (_ImageProcessorWorker)
   }, {
     key: "hideClipPath",
     value: function hideClipPath() {
-      if (this._shutterActor) {
-        for (var i = 0; i < 4; i++) {
-          this.renderer.removeActor(this._shutterActor[i]); // 如果不删除则会在下次render时出现残影
+      var _this6 = this;
 
-          this._shutterActor[i].delete();
+      if (this._polyLines) {
+        this._polyLines.forEach(function (line) {
+          if (line) line.delete();
+        });
 
-          this._shutterLine[i].delete();
-        }
+        this._polyLines = [];
+      }
+
+      if (this._polyActors) {
+        this._polyActors.forEach(function (actor) {
+          if (actor) {
+            _this6.renderer.removeActor(actor);
+
+            actor.delete();
+          }
+        });
 
-        this._shutterLine = null;
-        this._shutterActor = null;
+        this._polyActors = [];
       }
 
-      this.renderWindow.render();
+      if (this.renderWindow) {
+        this.renderWindow.render();
+      }
     }
     /**
      * 添加裁剪路径点
@@ -20037,70 +20086,52 @@ var MipImageProcessorWorkerImpl = /*#__PURE__*/function (_ImageProcessorWorker)
 
       this._clipPathParams.push(param);
     }
-    /**
-     * 根据clipPath生成映射的Volume坐标点集合，为了简化循环计算，position直接是volume的下标
-     * @param param
-     */
-
   }, {
     key: "createValidClipPositions",
     value: function createValidClipPositions(param, spacing, pixelData, extent) {
-      var firstSlicePositions = param.clipPositions;
+      var firstSlicePositions = param.clipPolygonPositions || [];
       var normal = param.clipNormal;
-      var steps = normal; // [normal[0] * spacing[0], normal[1] * spacing[1], normal[2] * spacing[2]];
+
+      if (!Array.isArray(firstSlicePositions) || firstSlicePositions.length === 0) {
+        return;
+      } // 计算法向步长
+
 
       var firstIndex = [0, 0, 0];
-      this.imageData.worldToIndexVec3(param.clipRect3D.topLeft, firstIndex);
+      this.imageData.worldToIndexVec3(param.clipPath3D[0], firstIndex);
       var lastIndex = [0, 0, 0];
-      this.imageData.worldToIndexVec3(param.clipRect3D.topLeft2, lastIndex); // 视角方向从【0,1】的起始方向模
-      // 2 ? 因为lastIndex取自0.5的world View 位置，全长是 1，所以需要lastInde跟firstIndex的两倍才是原始长度
-
-      var modVolume =
-      /*2 * */
-      Math.sqrt((lastIndex[0] - firstIndex[0]) * (lastIndex[0] - firstIndex[0]) + (lastIndex[1] - firstIndex[1]) * (lastIndex[1] - firstIndex[1]) + (lastIndex[2] - firstIndex[2]) * (lastIndex[2] - firstIndex[2]));
-      var modSpacing = Math.sqrt(steps[0] * steps[0] + steps[1] * steps[1] + steps[2] * steps[2]);
-      var loop = Math.round(modVolume / modSpacing + 0.5);
+      this.imageData.worldToIndexVec3(param.clipPath3D2, lastIndex);
+      var steps = normalizeVector([lastIndex[0] - firstIndex[0], lastIndex[1] - firstIndex[1], lastIndex[2] - firstIndex[2]]);
+      var modVolume = Math.sqrt(Math.pow(lastIndex[0] - firstIndex[0], 2) + Math.pow(lastIndex[1] - firstIndex[1], 2) + Math.pow(lastIndex[2] - firstIndex[2], 2));
+      var modSpacing = Math.sqrt(Math.pow(normal[0], 2) + Math.pow(normal[1], 2) + Math.pow(normal[2], 2));
+      var samplingDensity = 0.5;
+      var loop = Math.round(modVolume / (modSpacing * samplingDensity) + 0.5);
       var w = extent[1] - extent[0] + 1;
       var h = extent[3] - extent[2] + 1;
-      var s = extent[5] - extent[4] + 1;
       var aS = w * h;
-      steps = normalizeVector([lastIndex[0] - firstIndex[0], lastIndex[1] - firstIndex[1], lastIndex[2] - firstIndex[2]]); // if( this.backupPoints) {
-      //     var backupPointsCount = this.backupPoints.length;
-      //
-      //     // 可能存在重复的点，所以需要从末端开始倒序遍历
-      //     for(var backupIndex = backupPointsCount-1; backupIndex >= 0; --backupIndex) {
-      //         pixelData[this.backupPoints[backupIndex][0]] = this.backupPoints[backupIndex][1];
-      //     }
-      //
-      //     return;
-      // }
-
       param.backupClipPixels = new Int16Array(pixelData.length);
-      param.backupClipPixels.set(pixelData, 0); //param.backupClipPoints = {steps : [...steps], positions : new Array(firstSlicePositions.length)};
+      param.backupClipPixels.set(pixelData, 0);
 
       for (var n = 0; n < firstSlicePositions.length; ++n) {
         var begin = [0, 0, 0];
-        this.imageData.worldToIndexVec3(firstSlicePositions[n], begin); //param.backupClipPoints.positions[n] = [...begin];
+        this.imageData.worldToIndexVec3(firstSlicePositions[n], begin);
 
-        for (var i = 0; i < loop; i++, begin[0] += steps[0], begin[1] += steps[1], begin[2] += steps[2]) {
+        for (var i = 0; i < loop; i++) {
+          // 沿法向移动
+          begin[0] += steps[0];
+          begin[1] += steps[1];
+          begin[2] += steps[2];
           var a = Math.round(begin[0]);
-          if (a < extent[0]) continue;
-          if (a > extent[1]) continue;
           var b = Math.round(begin[1]);
-          if (b < extent[2]) continue;
-          if (b > extent[3]) continue;
           var c = Math.round(begin[2]);
-          if (c < extent[4]) continue;
-          if (c > extent[5]) continue;
+          if (a < extent[0] || a > extent[1]) continue;
+          if (b < extent[2] || b > extent[3]) continue;
+          if (c < extent[4] || c > extent[5]) continue;
           var pixelIndex = c * aS + b * w + a;
           var aa = Math.floor(begin[0]);
           var bb = Math.floor(begin[1]);
           var cc = Math.floor(begin[2]);
-          var pixelIndex2 = cc * aS + bb * w + aa; // param.backupPoints[param.backupPointIndex++] = pixelIndex;
-          // param.backupPoints[param.backupPointIndex++] = pixelData[pixelIndex];
-          // param.backupPoints[param.backupPointIndex++] = pixelIndex2;
-          // param.backupPoints[param.backupPointIndex++] = pixelData[pixelIndex2];
-
+          var pixelIndex2 = cc * aS + bb * w + aa;
           pixelData[pixelIndex] = 0;
           pixelData[pixelIndex2] = 0;
         }
@@ -29349,8 +29380,22 @@ var ShutterShapeTool = /*#__PURE__*/function (_BaseTool) {
                   color: '#000',
                   fillStyle: '#000'
                 }, function (context) {
-                  context.rect(0, 0, context.canvas.clientWidth * devicePixelRatio, context.canvas.clientHeight * devicePixelRatio);
-                  context.rect(left + width, top, -width, height);
+                  var _width = canvas.width || context.canvas.clientWidth;
+
+                  var _height = canvas.height || context.canvas.clientHeight;
+
+                  context.beginPath();
+                  context.moveTo(0, 0);
+                  context.lineTo(_width * devicePixelRatio, 0);
+                  context.lineTo(_width * devicePixelRatio, _height * devicePixelRatio);
+                  context.lineTo(0, _height * devicePixelRatio);
+                  context.closePath();
+                  context.moveTo(left + width, top);
+                  context.lineTo(left, top);
+                  context.lineTo(left, top + height);
+                  context.lineTo(left + width, top + height);
+                  context.closePath();
+                  context.fill();
                 });
                 return _context.abrupt("return");
 
@@ -31457,7 +31502,6 @@ var createReducer = function createReducer() {
 };
 
 var index$1 = createReducer();
-var SOCKET_INIT_REDUX = 'SOCKET_INIT_REDUX';
 function socketInitRedux(payload) {
   return {
     type: SOCKET_INIT_REDUX,
@@ -45746,7 +45790,7 @@ var DicomToolFlattenMode = /*#__PURE__*/function (_Component) {
 
 
       var mprTools = ['LayoutMPR', 'CrosshairsMPR', 'MprSwitchPerspective', 'MprRefresh'];
-      var vrTools = ['VRMode', 'VRPresentColor', 'VRDirection', 'VRCenterPointShow', 'VRClip', 'VRInfo', 'VRRefresh']; // 测量工具
+      var vrTools = ['VRMode', 'VRPresentColor', 'VRDirection', 'VRCenterPointShow', 'VRClip', 'VRResetClip', 'VRInfo', 'VRRefresh']; // 测量工具
 
       var lengthTools = ['LengthTool', 'Angle', 'ArrowAnnotate', 'TextMarker', 'RectangleRoi', 'Polygon', 'EllipticalRoi', 'Probe', 'CobbAngle', 'CTR'];
 
@@ -46117,7 +46161,7 @@ var DicomToolFlattenMode$1 = /*#__PURE__*/function (_Component) {
 
 
       var mprTools = ['LayoutMPR', 'CrosshairsMPR', 'MprSwitchPerspective', 'MprRefresh'];
-      var vrTools = ['VRMode', 'VRPresentColor', 'VRDirection', 'VRCenterPointShow', 'VRClip', 'VRInfo', 'VRRefresh'];
+      var vrTools = ['VRMode', 'VRPresentColor', 'VRDirection', 'VRCenterPointShow', 'VRClip', 'VRResetClip', 'VRInfo', 'VRRefresh'];
       var lengthTools = ['LengthTool', 'Angle', 'ArrowAnnotate', 'TextMarker', 'RectangleRoi', 'Polygon', 'EllipticalRoi', 'Probe', 'CobbAngle', 'CTR'];
 
       if (IODisconnect && !Fusion) {
@@ -46425,7 +46469,7 @@ const SvgMenuUp = props => /*#__PURE__*/React__default.createElement("svg", _ext
   fill: "currentColor"
 }, props), _ref$1i);
 
-var css_248z$n = ".paladin-mobile-button,\n.paladin-mobile-button-nohover {\n  text-align: center;\n  width: 100%;\n  height: 100%;\n  color: #C9C9C9;\n  cursor: pointer;\n  background: #1D1D1D;\n  box-sizing: border-box;\n}\n.paladin-mobile-button svg,\n.paladin-mobile-button-nohover svg {\n  height: 20px !important;\n}\n.paladin-mobile-more-button,\n.paladin-mobile-more-button-nohover {\n  display: flex;\n  flex-direction: row;\n  width: 100%;\n  height: 20px;\n  line-height: 20px;\n  justify-content: center;\n  align-items: center;\n  color: #C9C9C9;\n  cursor: pointer;\n  background: #1D1D1D;\n}\n.paladin-tool-mobile-active {\n  border-bottom: 2px solid #F5F5F5;\n  color: #F5F5F5;\n}\n.paladin-mobile-more-active {\n  color: #F5F5F5;\n}\n.paladin-dicomToolItem-text {\n  height: 100%;\n  display: inline-block;\n}\n";
+var css_248z$n = ".paladin-mobile-button,\n.paladin-mobile-button-nohover {\n  text-align: center;\n  width: 100%;\n  height: 100%;\n  color: #C9C9C9;\n  cursor: pointer;\n  background: #1D1D1D;\n  box-sizing: border-box;\n}\n.paladin-mobile-button svg,\n.paladin-mobile-button-nohover svg {\n  height: 20px !important;\n}\n.paladin-mobile-more-button,\n.paladin-mobile-more-button-nohover {\n  display: flex;\n  flex-direction: row;\n  width: 100%;\n  height: 20px;\n  line-height: 20px;\n  justify-content: center;\n  align-items: center;\n  color: #C9C9C9;\n  cursor: pointer;\n  background: #1D1D1D;\n}\n.paladin-mobile-more-button-nohover-direction-bottom {\n  display: flex;\n  flex-direction: row;\n  width: 100%;\n  height: 10px;\n  line-height: 10px;\n  justify-content: center;\n  align-items: center;\n  color: #C9C9C9;\n  cursor: pointer;\n  background: #1D1D1D;\n  transform: rotate(180deg);\n}\n.paladin-tool-mobile-active {\n  border-bottom: 2px solid #F5F5F5;\n  color: #F5F5F5;\n}\n.paladin-mobile-more-active {\n  color: #F5F5F5;\n}\n.paladin-dicomToolItem-text {\n  height: 100%;\n  display: inline-block;\n}\n";
 styleInject$1(css_248z$n);
 
 function _createSuper$1j(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1j(); return function _createSuperInternal() { var Super = getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return possibleConstructorReturn(this, result); }; }
@@ -46565,12 +46609,13 @@ var DicomToolItemMobile = /*#__PURE__*/function (_Component) {
           size = _this$props3.size,
           width = _this$props3.width,
           height = _this$props3.height,
-          noPaddingTop = _this$props3.noPaddingTop;
+          noPaddingTop = _this$props3.noPaddingTop,
+          moreIconDirection = _this$props3.moreIconDirection;
       var buttonActive = this.state.buttonActive;
-      var isMobile = ua.isDeviceTypeMobile();
 
       var _height = height || 60;
 
+      var moreArrowBottom = tool.moreComponent && moreIconDirection === 'bottom';
       return /*#__PURE__*/React__default.createElement("div", {
         style: {
           height: "".concat(_height, "px"),
@@ -46581,21 +46626,21 @@ var DicomToolItemMobile = /*#__PURE__*/function (_Component) {
         }
       }, tool.moreComponent && /*#__PURE__*/React__default.createElement("div", {
         style: {
-          height: '20px'
+          height: moreArrowBottom ? '10px' : '20px'
         }
       }, /*#__PURE__*/React__default.createElement(PopperBox, {
         popover: tool.moreComponent,
         onPopoverClose: this.onPopoverClose,
         popoverArrow: tool.popoverArrow,
-        popoverPlacement: isMobile ? 'top' : 'right',
+        popoverPlacement: "top",
         customProps: tool.customProps
       }, /*#__PURE__*/React__default.createElement("div", {
-        className: "".concat(isMobile ? 'paladin-mobile-more-button-nohover' : 'paladin-mobile-more-button', " ").concat(buttonActive ? 'paladin-mobile-more-active' : ''),
+        className: "".concat(moreArrowBottom ? 'paladin-mobile-more-button-nohover-direction-bottom' : 'paladin-mobile-more-button-nohover', " ").concat(buttonActive ? 'paladin-mobile-more-active' : ''),
         onClick: this.clickMoreButton
       }, /*#__PURE__*/React__default.createElement("span", {
         className: "paladin-dicomToolItem-text",
         style: {
-          width: isMobile ? 12 : size / 3 + 'px'
+          width: '12px'
         }
       }, /*#__PURE__*/React__default.createElement(SvgMenuUp, null))))), /*#__PURE__*/React__default.createElement("div", {
         style: {
@@ -46606,13 +46651,13 @@ var DicomToolItemMobile = /*#__PURE__*/function (_Component) {
         popover: !tool.moreComponent && tool.popover,
         onPopoverClose: this.onPopoverClose,
         popoverArrow: tool.popoverArrow,
-        popoverPlacement: isMobile ? 'top' : 'right',
-        tooltipPlacement: isMobile ? 'right' : 'bottom',
+        popoverPlacement: "top",
+        tooltipPlacement: "right",
         customProps: tool.customProps
       }, /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-mobile-button ".concat(this.checkMainButtonActive(tool)),
         style: {
-          paddingTop: noPaddingTop ? '15px' : tool.moreComponent ? '4px' : '24px'
+          paddingTop: noPaddingTop ? moreArrowBottom ? '5px' : '15px' : tool.moreComponent ? '4px' : '24px'
         },
         onClick: function onClick(e) {
           _this2.clickMainButton(e, tool);
@@ -46634,7 +46679,8 @@ var DicomToolItemMobile = /*#__PURE__*/function (_Component) {
 defineProperty(DicomToolItemMobile, "propTypes", {
   tool: PropTypes$1.any,
   activeTool: PropTypes$1.any,
-  setActiveTool: PropTypes$1.func
+  setActiveTool: PropTypes$1.func,
+  moreIconDirection: PropTypes$1.string
 });
 
 var css_248z$o = ".paladin-mobile-tool-mode {\n  background: #000;\n}\n.paladin-mobile-tool-mode .mobile-tool-cine-content {\n  display: flex;\n  height: 55px;\n  color: #ECECEC;\n}\n.paladin-mobile-tool-mode .mobile-tool-icon-content {\n  display: flex;\n  flex-direction: row;\n}\n.paladin-mobile-tool-mode .mobile-tool-icon-content .fix-icon-content {\n  display: flex;\n  flex-direction: column;\n  padding-right: 2px;\n  z-index: 999;\n  background: #000;\n}\n.paladin-mobile-tool-mode .mobile-tool-icon-content .fix-icon-content-right {\n  display: flex;\n  flex-direction: column;\n  padding-left: 2px;\n  z-index: 999;\n  background: #000;\n}\n.paladin-mobile-tool-mode .mobile-tool-icon-content .scroll-icon-content {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  background: #1D1D1D;\n}\n";
@@ -47381,8 +47427,8 @@ var DicomToolMobileThreeModeBottom = /*#__PURE__*/function (_Component) {
         }
       });
 
-      var phoneToolsFixed = ["StackScroll", "Wwwc", "Zoom"];
-      var phoneTools = ["Layout", "Pan", "Rotate", "Length", "Reset", "Tool", "ReferenceLine", "MPR", "VR", "MIP", "Settings"]; // 关键图工具
+      var phoneToolsFixed = ["StackScroll", "Wwwc"];
+      var phoneTools = ["Zoom", "Layout", "Pan", "Rotate", "Length", "Reset", "Tool", "ReferenceLine", "MPR", "VR", "MIP", "Settings"]; // 关键图工具
 
       if (operateKeyImages) {
         var referenceLineIndex = phoneTools.indexOf("ReferenceLine");
@@ -47611,7 +47657,8 @@ var DicomToolMobileThreeModeHead = /*#__PURE__*/function (_Component) {
             size: 20,
             width: 50,
             height: 50,
-            noPaddingTop: true
+            noPaddingTop: true,
+            moreIconDirection: "bottom"
           }));
         }
       })))), /*#__PURE__*/React__default.createElement("div", {
@@ -47649,9 +47696,33 @@ var VRClip = /*#__PURE__*/function (_Component) {
   var _super = _createSuper$1o(VRClip);
 
   function VRClip(props) {
+    var _this;
+
     classCallCheck(this, VRClip);
 
-    return _super.call(this, props);
+    _this = _super.call(this, props);
+
+    defineProperty(assertThisInitialized(_this), "handleResetPolygon", function () {
+      var ModalContent = function ModalContent(props) {
+        return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("p", null, "\u786E\u5B9A\u8981\u64A4\u9500\u5168\u90E8\u88C1\u526A\u5417"));
+      };
+
+      Modal.create( /*#__PURE__*/React__default.createElement(ModalContent, null), {
+        title: '撤销全部裁剪',
+        onOk: function onOk() {
+          if (_this.props.onRowClick) {
+            _this.props.onRowClick('reset');
+          }
+        },
+        okText: '确定',
+        cancelText: '取消',
+        style: {
+          width: '500px'
+        }
+      });
+    });
+
+    return _this;
   }
 
   createClass(VRClip, [{
@@ -47666,7 +47737,8 @@ var VRClip = /*#__PURE__*/function (_Component) {
         }, {
           key: 'reset',
           text: '撤销全部',
-          icon: null
+          icon: null,
+          onClick: this.handleResetPolygon
         }]
       }];
       return /*#__PURE__*/React__default.createElement(ToolPopoverTemplate, _extends_1({}, this.props, {
@@ -48541,7 +48613,8 @@ var DicomTool = /*#__PURE__*/function (_Component) {
         tooltip: getI18nMessage('mpr', 'tool_crosshair_tooltip'),
         component: /*#__PURE__*/React__default.createElement(SvgMove, null),
         activeInRedux: true,
-        moreComponent: ConnectedCrosshairsMPR
+        moreComponent: ConnectedCrosshairsMPR,
+        moreIconDirection: 'right'
       },
       Wwwc: {
         label: getI18nMessage('dicom_tool_wwwc'),
@@ -48737,7 +48810,15 @@ var DicomTool = /*#__PURE__*/function (_Component) {
         singleActive: true,
         onClick: function onClick() {
           _this.props.toggleVRClip();
-        },
+        }
+      },
+      VRResetClip: {
+        label: getI18nMessage('vr', 'reset_clip'),
+        name: "VRResetClip",
+        tooltip: getI18nMessage('vr', 'reset_clip_tooltip'),
+        component: /*#__PURE__*/React__default.createElement(SvgReply, null),
+        inActive: true,
+        borderBottom: true,
         moreComponent: ConnectedVRClip
       },
       VRPresentColor: {
@@ -50168,6 +50249,7 @@ var mapStateToProps$p = function mapStateToProps(state) {
       CentesisStart = _state$paladin$tools$3.CentesisStart,
       CentesisEnd = _state$paladin$tools$3.CentesisEnd,
       VRClip = _state$paladin$tools$3.VRClip,
+      VRResetClip = _state$paladin$tools$3.VRResetClip,
       IO = _state$paladin$tools$3.IO,
       ReferencePosition = _state$paladin$tools$3.ReferencePosition,
       MIP = _state$paladin$tools$3.MIP,
@@ -50289,6 +50371,7 @@ var mapStateToProps$p = function mapStateToProps(state) {
     CentesisStart: CentesisStart,
     CentesisEnd: CentesisEnd,
     VRClip: VRClip,
+    VRResetClip: VRResetClip,
     IO: IO,
     ReferencePosition: ReferencePosition,
     MIP: MIP,
@@ -74874,7 +74957,10 @@ var DicomView = /*#__PURE__*/function (_Component) {
         }
       }); // 自定义窗值设置
 
-      this.props.windowSetting && saveWwwcCustomDic(this.props.windowSetting); // 自定义的功能设置初始值 1.外部传入、保存 2.内部本地存储
+      if (this.props.windowSetting && this.props.windowSetting.length > 0) {
+        saveWwwcCustomDic(this.props.windowSetting);
+      } // 自定义的功能设置初始值 1.外部传入、保存 2.内部本地存储
+
 
       if (this.props.dicomSetting) {
         saveCustomDicomSetting(this.props.dicomSetting);