hellfire 0.17.2 → 0.17.6

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 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.17.6](http://10.16.100.57/diffusion/115/paladin/compare/v0.17.5...v0.17.6) (2021-12-28)
+
+
+
+## [0.17.5](http://10.16.100.57/diffusion/115/paladin/compare/v0.17.4...v0.17.5) (2021-12-27)
+
+
+
+## [0.17.4](http://10.16.100.57/diffusion/115/paladin/compare/v0.17.3...v0.17.4) (2021-12-22)
+
+
+
+## [0.17.3](http://10.16.100.57/diffusion/115/paladin/compare/v0.17.2...v0.17.3) (2021-12-15)
+
+
+
 ## [0.17.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.17.1...v0.17.2) (2021-12-14)
 
 

package/dist/index.js

@@ -7562,9 +7562,7 @@ var LengthTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
       var length = Math.sqrt(dx * dx + dy * dy); // Store the length inside the tool for outside access
 
       data.length = length;
-      data.invalidated = false; // socket同步
-
-      onToolsUpdate(image, element);
+      data.invalidated = false;
     }
   }, {
     key: "renderToolData",
@@ -7655,7 +7653,10 @@ var LengthTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
         var _ret = _loop(i);
 
         if (_ret === "continue") continue;
-      }
+      } // socket同步
+
+
+      onToolsUpdate(image, element);
 
       function textBoxText(data, rowPixelSpacing, colPixelSpacing) {
         // Set the length text suffix depending on whether or not pixelSpacing is available
@@ -7741,7 +7742,6 @@ var _cornerstoneTools$imp = cornerstoneTools.importInternal('tools/cursors'),
     arrowAnnotateCursor = _cornerstoneTools$imp.arrowAnnotateCursor;
 
 var triggerEvent = cornerstoneTools.importInternal('util/triggerEvent');
-var throttle$1 = cornerstoneTools.importInternal('util/throttle');
 var EVENTS = cornerstoneTools.EVENTS,
     external$4 = cornerstoneTools.external,
     toolStyle$1 = cornerstoneTools.toolStyle,
@@ -7790,7 +7790,6 @@ var ArrowAnnotateTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
     };
     _this = _super.call(this, props, defaultProps);
     _this.preventNewMeasurement = false;
-    _this.throttledUpdateCachedStats = throttle$1(_this.updateCachedStats, 110);
     return _this;
   }
 
@@ -7837,13 +7836,6 @@ var ArrowAnnotateTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
       var distance = interactionType && interactionType === 'mouse' ? 5 : 25;
       return lineSegDistance$1(element, data.handles.start, data.handles.end, coords) < distance;
     }
-  }, {
-    key: "updateCachedStats",
-    value: function updateCachedStats(image, element) {
-      // Implementing to satisfy BaseAnnotationTool
-      // socket同步
-      onToolsUpdate(image, element);
-    }
   }, {
     key: "renderToolData",
     value: function renderToolData(evt) {
@@ -7912,14 +7904,6 @@ var ArrowAnnotateTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
               distance = -distance;
             }
 
-            if (data.invalidated === true) {
-              if (data.cachedStats) {
-                _this2.throttledUpdateCachedStats(image, element, data);
-              } else {
-                _this2.updateCachedStats(image, element, data);
-              }
-            }
-
             if (!data.handles.textBox.hasMoved) {
               var textCoords;
 
@@ -7953,7 +7937,10 @@ var ArrowAnnotateTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
         var _ret = _loop(i);
 
         if (_ret === "continue") continue;
-      }
+      } // socket同步
+
+
+      onToolsUpdate(image, element);
 
       function textBoxText(data) {
         return data.text;
@@ -8111,7 +8098,6 @@ defineProperty(ArrowAnnotateTool, "setConfiguration", function (_getTextCallback
   reactHotLoader.register(textBoxWidth, "textBoxWidth", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ArrowAnnotateTool.js");
   reactHotLoader.register(arrowAnnotateCursor, "arrowAnnotateCursor", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ArrowAnnotateTool.js");
   reactHotLoader.register(triggerEvent, "triggerEvent", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ArrowAnnotateTool.js");
-  reactHotLoader.register(throttle$1, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ArrowAnnotateTool.js");
   reactHotLoader.register(EVENTS, "EVENTS", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ArrowAnnotateTool.js");
   reactHotLoader.register(external$4, "external", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ArrowAnnotateTool.js");
   reactHotLoader.register(toolStyle$1, "toolStyle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ArrowAnnotateTool.js");
@@ -8154,7 +8140,7 @@ var _cornerstoneTools$imp$1 = cornerstoneTools.importInternal('tools/cursors'),
 var calculateSUV = cornerstoneTools.importInternal('util/calculateSUV');
 var getROITextBoxCoords = cornerstoneTools.importInternal('util/getROITextBoxCoords');
 var numbersWithCommas = cornerstoneTools.importInternal('util/numbersWithCommas');
-var throttle$2 = cornerstoneTools.importInternal('util/throttle');
+var throttle$1 = cornerstoneTools.importInternal('util/throttle');
 var getLogger = cornerstoneTools.importInternal('util/getLogger');
 var getPixelSpacing$1 = cornerstoneTools.importInternal('util/getPixelSpacing');
 var logger$2 = getLogger('tools:annotation:RectangleRoiTool');
@@ -8194,7 +8180,7 @@ var RectangleRoiTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
 
     };
     _this = _super.call(this, props, defaultProps);
-    _this.throttledUpdateCachedStats = throttle$2(_this.updateCachedStats, 110);
+    _this.throttledUpdateCachedStats = throttle$1(_this.updateCachedStats, 110);
     return _this;
   }
 
@@ -8275,9 +8261,7 @@ var RectangleRoiTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
       var stats = _calculateStats(image, element, data.handles, modality, pixelSpacing);
 
       data.cachedStats = stats;
-      data.invalidated = false; // socket同步
-
-      onToolsUpdate(image, element);
+      data.invalidated = false;
     }
   }, {
     key: "renderToolData",
@@ -8360,7 +8344,9 @@ var RectangleRoiTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
           data.unit = _getUnit(modality, _this2.configuration.showHounsfieldUnits);
           drawLinkedTextBox$2(context, element, data.handles.textBox, textBoxContent, data.handles, textBoxAnchorPoints, color, lineWidth, 10, true);
         }
-      });
+      }); // socket同步
+
+      onToolsUpdate(image, element);
     }
   }, {
     key: "__reactstandin__regenerateByEval",
@@ -8612,7 +8598,7 @@ function _createTextBoxContent(context, isColorImage, _ref, modality, hasPixelSp
   reactHotLoader.register(calculateSUV, "calculateSUV", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/RectangleRoiTool.js");
   reactHotLoader.register(getROITextBoxCoords, "getROITextBoxCoords", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/RectangleRoiTool.js");
   reactHotLoader.register(numbersWithCommas, "numbersWithCommas", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/RectangleRoiTool.js");
-  reactHotLoader.register(throttle$2, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/RectangleRoiTool.js");
+  reactHotLoader.register(throttle$1, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/RectangleRoiTool.js");
   reactHotLoader.register(getLogger, "getLogger", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/RectangleRoiTool.js");
   reactHotLoader.register(getPixelSpacing$1, "getPixelSpacing", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/RectangleRoiTool.js");
   reactHotLoader.register(logger$2, "logger", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/RectangleRoiTool.js");
@@ -8655,7 +8641,7 @@ var drawEllipse = cornerstoneTools.importInternal('drawing/drawEllipse');
 var calculateSUV$1 = cornerstoneTools.importInternal('util/calculateSUV');
 var getROITextBoxCoords$1 = cornerstoneTools.importInternal('util/getROITextBoxCoords');
 var numbersWithCommas$1 = cornerstoneTools.importInternal('util/numbersWithCommas');
-var throttle$3 = cornerstoneTools.importInternal('util/throttle');
+var throttle$2 = cornerstoneTools.importInternal('util/throttle');
 var getLogger$1 = cornerstoneTools.importInternal('util/getLogger');
 var getPixelSpacing$2 = cornerstoneTools.importInternal('util/getPixelSpacing');
 
@@ -8702,7 +8688,7 @@ var EllipticalRoiTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
 
     };
     _this = _super.call(this, props, defaultProps);
-    _this.throttledUpdateCachedStats = throttle$3(_this.updateCachedStats, 110);
+    _this.throttledUpdateCachedStats = throttle$2(_this.updateCachedStats, 110);
     return _this;
   }
 
@@ -8795,9 +8781,7 @@ var EllipticalRoiTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
       var stats = _calculateStats$1(image, element, data.handles, modality, pixelSpacing);
 
       data.cachedStats = stats;
-      data.invalidated = false; // socket同步
-
-      onToolsUpdate(image, element);
+      data.invalidated = false;
     }
   }, {
     key: "renderToolData",
@@ -8876,7 +8860,9 @@ var EllipticalRoiTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
           data.unit = _getUnit$1(modality, _this2.configuration.showHounsfieldUnits);
           drawLinkedTextBox$3(context, element, data.handles.textBox, textBoxContent, data.handles, textBoxAnchorPoints, color, lineWidth, 10, true);
         }
-      });
+      }); // socket同步
+
+      onToolsUpdate(image, element);
     }
   }, {
     key: "__reactstandin__regenerateByEval",
@@ -9075,7 +9061,7 @@ function _getEllipseImageCoordinates(startHandle, endHandle) {
   reactHotLoader.register(calculateSUV$1, "calculateSUV", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/EllipticalRoiTool.js");
   reactHotLoader.register(getROITextBoxCoords$1, "getROITextBoxCoords", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/EllipticalRoiTool.js");
   reactHotLoader.register(numbersWithCommas$1, "numbersWithCommas", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/EllipticalRoiTool.js");
-  reactHotLoader.register(throttle$3, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/EllipticalRoiTool.js");
+  reactHotLoader.register(throttle$2, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/EllipticalRoiTool.js");
   reactHotLoader.register(getLogger$1, "getLogger", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/EllipticalRoiTool.js");
   reactHotLoader.register(getPixelSpacing$2, "getPixelSpacing", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/EllipticalRoiTool.js");
   reactHotLoader.register(pointInEllipse, "pointInEllipse", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/EllipticalRoiTool.js");
@@ -9119,7 +9105,7 @@ var setShadow$4 = cornerstoneTools.importInternal('drawing/setShadow');
 var drawJoinedLines = cornerstoneTools.importInternal('drawing/drawJoinedLines');
 var textBoxWidth$1 = cornerstoneTools.importInternal('drawing/textBoxWidth');
 var moveNewHandle$1 = cornerstoneTools.importInternal('manipulators/moveNewHandle');
-var throttle$4 = cornerstoneTools.importInternal('util/throttle');
+var throttle$3 = cornerstoneTools.importInternal('util/throttle');
 var getPixelSpacing$3 = cornerstoneTools.importInternal('util/getPixelSpacing');
 var lineSegDistance$2 = cornerstoneTools.importInternal('util/lineSegDistance');
 var roundToDecimal = cornerstoneTools.importInternal('util/roundToDecimal');
@@ -9165,7 +9151,7 @@ var AngleTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
     };
     _this = _super.call(this, props, defaultProps);
     _this.preventNewMeasurement = false;
-    _this.throttledUpdateCachedStats = throttle$4(_this.updateCachedStats, 110);
+    _this.throttledUpdateCachedStats = throttle$3(_this.updateCachedStats, 110);
     return _this;
   }
 
@@ -9250,9 +9236,7 @@ var AngleTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
       var angle = Math.acos((Math.pow(sideALength, 2) + Math.pow(sideBLength, 2) - Math.pow(sideCLength, 2)) / (2 * sideALength * sideBLength));
       angle *= 180 / Math.PI;
       data.rAngle = roundToDecimal(angle, 2);
-      data.invalidated = false; // socket同步
-
-      onToolsUpdate(image, element);
+      data.invalidated = false;
     }
   }, {
     key: "renderToolData",
@@ -9355,7 +9339,10 @@ var AngleTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
         var _ret = _loop(i);
 
         if (_ret === "continue") continue;
-      }
+      } // socket同步
+
+
+      onToolsUpdate(image, element);
 
       function textBoxText(data, rowPixelSpacing, colPixelSpacing) {
         var suffix = !rowPixelSpacing || !colPixelSpacing ? ' (isotropic)' : '';
@@ -9430,7 +9417,7 @@ function length(vector) {
   reactHotLoader.register(drawJoinedLines, "drawJoinedLines", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AngleTool.js");
   reactHotLoader.register(textBoxWidth$1, "textBoxWidth", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AngleTool.js");
   reactHotLoader.register(moveNewHandle$1, "moveNewHandle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AngleTool.js");
-  reactHotLoader.register(throttle$4, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AngleTool.js");
+  reactHotLoader.register(throttle$3, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AngleTool.js");
   reactHotLoader.register(getPixelSpacing$3, "getPixelSpacing", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AngleTool.js");
   reactHotLoader.register(lineSegDistance$2, "lineSegDistance", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AngleTool.js");
   reactHotLoader.register(roundToDecimal, "roundToDecimal", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/AngleTool.js");
@@ -9466,7 +9453,7 @@ var drawLinkedTextBox$5 = cornerstoneTools.importInternal('drawing/drawLinkedTex
 var lineSegDistance$3 = cornerstoneTools.importInternal('util/lineSegDistance');
 var roundToDecimal$1 = cornerstoneTools.importInternal('util/roundToDecimal');
 var triggerEvent$1 = cornerstoneTools.importInternal('util/triggerEvent');
-var throttle$5 = cornerstoneTools.importInternal('util/throttle');
+var throttle$4 = cornerstoneTools.importInternal('util/throttle');
 var getPixelSpacing$4 = cornerstoneTools.importInternal('util/getPixelSpacing');
 var getNewContext$5 = cornerstoneTools.importInternal('drawing/getNewContext');
 var draw$5 = cornerstoneTools.importInternal('drawing/draw');
@@ -9513,7 +9500,7 @@ var CobbAngleTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
     };
     _this = _super.call(this, props, defaultProps);
     _this.hasIncomplete = false;
-    _this.throttledUpdateCachedStats = throttle$5(_this.updateCachedStats, 110);
+    _this.throttledUpdateCachedStats = throttle$4(_this.updateCachedStats, 110);
     return _this;
   }
 
@@ -9612,9 +9599,7 @@ var CobbAngleTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
       var angle = Math.acos(Math.abs((dx1 * dx2 + dy1 * dy2) / (Math.sqrt(dx1 * dx1 + dy1 * dy1) * Math.sqrt(dx2 * dx2 + dy2 * dy2))));
       angle *= 180 / Math.PI;
       data.rAngle = roundToDecimal$1(angle, 2);
-      data.invalidated = false; // socket同步
-
-      onToolsUpdate(image, element);
+      data.invalidated = false;
     }
   }, {
     key: "renderToolData",
@@ -9622,6 +9607,8 @@ var CobbAngleTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
       var _this2 = this;
 
       var eventData = evt.detail;
+      var image = eventData.image,
+          element = eventData.element;
       var drawHandlesOnHover = this.configuration.drawHandlesOnHover; // If we have no toolData for this element, return immediately as there is nothing to do
 
       var toolData = getToolState$4(evt.currentTarget, this.name);
@@ -9691,7 +9678,10 @@ var CobbAngleTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
         var _ret = _loop(i);
 
         if (_ret === "continue") continue;
-      }
+      } // socket同步
+
+
+      onToolsUpdate(image, element);
 
       function textBoxAnchorPoints(handles) {
         return [handles.start, handles.start2, handles.end, handles.end2];
@@ -9849,7 +9839,7 @@ var CobbAngleTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
   reactHotLoader.register(lineSegDistance$3, "lineSegDistance", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/CobbAngleTool.js");
   reactHotLoader.register(roundToDecimal$1, "roundToDecimal", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/CobbAngleTool.js");
   reactHotLoader.register(triggerEvent$1, "triggerEvent", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/CobbAngleTool.js");
-  reactHotLoader.register(throttle$5, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/CobbAngleTool.js");
+  reactHotLoader.register(throttle$4, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/CobbAngleTool.js");
   reactHotLoader.register(getPixelSpacing$4, "getPixelSpacing", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/CobbAngleTool.js");
   reactHotLoader.register(getNewContext$5, "getNewContext", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/CobbAngleTool.js");
   reactHotLoader.register(draw$5, "draw", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/CobbAngleTool.js");
@@ -23975,7 +23965,7 @@ var _cornerstoneTools$imp$5 = cornerstoneTools.importInternal('tools/cursors'),
     probeCursor = _cornerstoneTools$imp$5.probeCursor;
 
 var logger$4 = cornerstoneTools.importInternal('util/getLogger')('tools:annotation:ProbeTool');
-var throttle$6 = cornerstoneTools.importInternal('util/throttle');
+var throttle$5 = cornerstoneTools.importInternal('util/throttle');
 var external$d = cornerstoneTools.external,
     toolColors$9 = cornerstoneTools.toolColors,
     textStyle$4 = cornerstoneTools.textStyle,
@@ -24010,7 +24000,7 @@ var ProbeTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
       }
     };
     _this = _super.call(this, props, defaultProps);
-    _this.throttledUpdateCachedStats = throttle$6(_this.updateCachedStats, 110);
+    _this.throttledUpdateCachedStats = throttle$5(_this.updateCachedStats, 110);
     return _this;
   }
 
@@ -24088,9 +24078,7 @@ var ProbeTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
       }
 
       data.cachedStats = stats;
-      data.invalidated = false; // socket同步
-
-      onToolsUpdate(image, element);
+      data.invalidated = false;
     }
   }, {
     key: "renderToolData",
@@ -24178,7 +24166,10 @@ var ProbeTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
         var _ret = _loop(i);
 
         if (_ret === "continue") continue;
-      }
+      } // socket同步
+
+
+      onToolsUpdate(image, element);
     }
   }, {
     key: "__reactstandin__regenerateByEval",
@@ -24205,7 +24196,7 @@ var ProbeTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
   reactHotLoader.register(calculateSUV$2, "calculateSUV", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ProbeTool.js");
   reactHotLoader.register(probeCursor, "probeCursor", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ProbeTool.js");
   reactHotLoader.register(logger$4, "logger", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ProbeTool.js");
-  reactHotLoader.register(throttle$6, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ProbeTool.js");
+  reactHotLoader.register(throttle$5, "throttle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ProbeTool.js");
   reactHotLoader.register(external$d, "external", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ProbeTool.js");
   reactHotLoader.register(toolColors$9, "toolColors", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ProbeTool.js");
   reactHotLoader.register(textStyle$4, "textStyle", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/ProbeTool.js");
@@ -24889,9 +24880,7 @@ var CTRTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
 
       data.length = length;
       data.imageLength = imageLength;
-      data.invalidated = false; // socket同步
-
-      onToolsUpdate(image, element);
+      data.invalidated = false;
     }
   }, {
     key: "renderToolData",
@@ -24995,7 +24984,10 @@ var CTRTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
         var _ret = _loop(i);
 
         if (_ret === "continue") continue;
-      }
+      } // socket同步
+
+
+      onToolsUpdate(image, element);
     }
   }, {
     key: "addNewMeasurement",
@@ -44473,7 +44465,8 @@ var DicomTool = /*#__PURE__*/function (_Component) {
           VR = _this$props.VR,
           VRCenterPointShow = _this$props.VRCenterPointShow,
           VRModeText = _this$props.VRModeText,
-          isMobile = _this$props.isMobile;
+          isMobile = _this$props.isMobile,
+          windowLayoutType = _this$props.windowLayoutType;
 
       if (VR) {
         if (this.toolsMap) {
@@ -44502,9 +44495,12 @@ var DicomTool = /*#__PURE__*/function (_Component) {
 
       var FlattenMode = DicomToolFlattenMode;
 
-      if (width < height) {
+      if (windowLayoutType) {
         // 竖屏
-        FlattenMode = DicomToolFlattenMode$1;
+        if (windowLayoutType === 'vertical') FlattenMode = DicomToolFlattenMode$1;
+      } else {
+        // 竖屏
+        if (width < height) FlattenMode = DicomToolFlattenMode$1;
       }
 
       return /*#__PURE__*/React__default.createElement("div", {
@@ -47693,6 +47689,7 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
         return;
       }
 
+      _this.props.onResizeEmit && _this.props.onResizeEmit();
       cornerstone.resize(_this.element, true);
     });
 
@@ -49304,7 +49301,8 @@ var DicomLayout = /*#__PURE__*/function (_Component) {
             onViewportMouseDown: _this2.onViewportMouseDown,
             onCustomScroll: _this2.onCustomScroll,
             onDrop: _this2.props.onDrop,
-            showAIResult: _this2.props.showAIResult
+            showAIResult: _this2.props.showAIResult,
+            onResizeEmit: _this2.props.onResizeEmit
           });
         }));
       })), showVerticalScroll && /*#__PURE__*/React__default.createElement("div", {
@@ -49474,10 +49472,13 @@ var mergeProps$e = function mergeProps(propsFromState, propsFromDispatch, ownPro
           currentScrollLine = propsFromState.currentScrollLine,
           lastActiveIndex = propsFromState.lastActiveIndex; // 此处open/close onepickmode里包含scrollLine的设置是为了避免重复的render
 
+      var resizeIndex = 0;
+
       if (onePickMode) {
         // 当前是op 即将进入custom 回到lastScrollLine
         propsFromDispatch.closeOnePickLayout(lastScrollLine);
         propsFromDispatch.setActiveIndex(lastActiveIndex);
+        resizeIndex = lastActiveIndex;
       } else {
         // 当前是custom 即将进入op
         // 自定义布局为1*1时不触发
@@ -49494,6 +49495,15 @@ var mergeProps$e = function mergeProps(propsFromState, propsFromDispatch, ownPro
         linkSynchronizer.destroy();
         linkScrollSynchronizer.destroy();
       }
+
+      setTimeout(function () {
+        try {
+          var element = getElement(resizeIndex);
+          cornerstone.resize(element, true);
+        } catch (e) {
+          console.log('ignore element not enabled event');
+        }
+      });
     },
     // 首次加载把激活状态的element添加到sync中
     onImageFirstRender: function onImageFirstRender(index) {
@@ -51576,6 +51586,43 @@ var _default$18 = ConnectedVR;
   enterModule && enterModule(module);
 })();
 
+var __signature__$3c = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+
+function colorMapFix(viewportData) {
+  viewportData.imageViewports = lodash$1.map(viewportData.imageViewports, function (seriesViewportArr) {
+    return lodash$1.map(seriesViewportArr, function (item) {
+      if (item.colorMapId) {
+        item.colormap = cornerstone.colors.getColormap(item.colorMapId);
+      }
+
+      return item;
+    });
+  });
+  return viewportData;
+}
+
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+
+  if (!reactHotLoader) {
+    return;
+  }
+
+  reactHotLoader.register(colorMapFix, "colorMapFix", "/Users/huyeqing/workspace/chainz/paladin/src/utils/colorMapMethod.js");
+})();
+
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();
+
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+
 function _createForOfIteratorHelper$d(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$f(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray$f(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$f(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$f(o, minLen); }
@@ -51586,7 +51633,7 @@ function _createSuper$1i(Derived) { var hasNativeReflectConstruct = _isNativeRef
 
 function _isNativeReflectConstruct$1i() { 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 __signature__$3c = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$3d = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 
@@ -51838,7 +51885,7 @@ var DicomView = /*#__PURE__*/function (_Component) {
         if (value.cornerstoneState) {
           // 从server获取当前viewport数据 更新element 然后重新渲染
           // 序列模式 图像模式
-          var cornerstoneState = value.cornerstoneState;
+          var cornerstoneState = colorMapFix(value.cornerstoneState);
           set$1('all', cornerstoneState);
           var imageViewports = cornerstoneState.imageViewports;
 
@@ -51969,7 +52016,9 @@ var DicomView = /*#__PURE__*/function (_Component) {
           break;
 
         case "cornerstone_state_change":
-          set$1('all', data);
+          var _data = colorMapFix(data);
+
+          set$1('all', _data);
           break;
 
         case "cornerstone_measurement_reset":
@@ -52061,12 +52110,16 @@ var DicomView = /*#__PURE__*/function (_Component) {
         operateCentesisPath: this.props.operateCentesisPath,
         helpLink: this.props.helpLink,
         changeWindowSet: this.props.changeWindowSet,
-        study: this.state.study
+        study: this.state.study,
+        windowLayoutType: this.props.windowLayoutType
       }));
       var DicomLayout = /*#__PURE__*/React__default.createElement(DicomLayoutContainerWrap, null, viewMode === '2D' && (this.props.mode === 'seriesMode' ? /*#__PURE__*/React__default.createElement(_default$14, {
         series: this.props.series,
-        showAIResult: this.props.showAIResult
-      }) : /*#__PURE__*/React__default.createElement(_default$15, null)), viewMode === 'MPR' && /*#__PURE__*/React__default.createElement(_default$17, null), viewMode === 'VR' && /*#__PURE__*/React__default.createElement(_default$18, null), viewMode === 'Surgery' && /*#__PURE__*/React__default.createElement(_default$16, null));
+        showAIResult: this.props.showAIResult,
+        onResizeEmit: this.props.onResizeEmit
+      }) : /*#__PURE__*/React__default.createElement(_default$15, {
+        onResizeEmit: this.props.onResizeEmit
+      })), viewMode === 'MPR' && /*#__PURE__*/React__default.createElement(_default$17, null), viewMode === 'VR' && /*#__PURE__*/React__default.createElement(_default$18, null), viewMode === 'Surgery' && /*#__PURE__*/React__default.createElement(_default$16, null));
       var DicomThumbnail = /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-dicomView-dicomThumbnailWrapper"
       }, /*#__PURE__*/React__default.createElement(_default$10, {
@@ -52084,21 +52137,26 @@ var DicomView = /*#__PURE__*/function (_Component) {
       }, DicomTool, /*#__PURE__*/React__default.createElement("div", {
         className: "paladin-dicomView-pcmobileWrapper"
       }, DicomLayout, this.props.showDicomThumbnail && DicomThumbnail));
+      var verticalLayout = /*#__PURE__*/React__default.createElement("div", {
+        style: dcStyle
+      }, /*#__PURE__*/React__default.createElement("div", {
+        style: {
+          display: 'flex',
+          flexDirection: 'column',
+          flex: 1,
+          width: 0
+        }
+      }, DicomLayout, this.props.showDicomThumbnail && DicomThumbnail, DicomTool));
       var width = window.innerWidth;
       var height = window.innerHeight;
 
-      if (width < height && toolMode === 'flatten') {
-        // 竖屏 + 展开
-        pc = /*#__PURE__*/React__default.createElement("div", {
-          style: dcStyle
-        }, /*#__PURE__*/React__default.createElement("div", {
-          style: {
-            display: 'flex',
-            flexDirection: 'column',
-            flex: 1,
-            width: 0
-          }
-        }, DicomLayout, this.props.showDicomThumbnail && DicomThumbnail, DicomTool));
+      if (this.props.windowLayoutType) {
+        if (this.props.windowLayoutType === 'vertical') pc = verticalLayout;
+      } else {
+        if (width < height && toolMode === 'flatten') {
+          // 竖屏 + 展开
+          pc = verticalLayout;
+        }
       }
 
       return (
@@ -52157,7 +52215,7 @@ function ownKeys$E(object, enumerableOnly) { var keys = Object.keys(object); if
 
 function _objectSpread$F(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$E(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$E(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-var __signature__$3d = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$3e = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var scroll = _default$E.importInternal('util/scroll');
@@ -52717,7 +52775,7 @@ var _default$19 = ConnectedDicomView;
   enterModule && enterModule(module);
 })();
 
-var __signature__$3e = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$3f = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var _default$1a = _default$19;