hellfire 0.18.2 → 0.19.2

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.19.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.1...v0.19.2) (2022-02-08)
+
+
+
+## [0.19.1](http://10.16.100.57/diffusion/115/paladin/compare/v0.19.0...v0.19.1) (2022-02-07)
+
+
+
+# [0.19.0](http://10.16.100.57/diffusion/115/paladin/compare/v0.18.3...v0.19.0) (2022-02-07)
+
+
+
+## [0.18.3](http://10.16.100.57/diffusion/115/paladin/compare/v0.18.2...v0.18.3) (2022-01-29)
+
+
+
 ## [0.18.2](http://10.16.100.57/diffusion/115/paladin/compare/v0.18.1...v0.18.2) (2022-01-27)
 
 

package/dist/index.js

@@ -575,7 +575,9 @@ var WwwcDefinedList = {
   WWWC_NECK: [350, 90],
   WWWC_TOP_ABDOMEN: [150, 50]
 };
-var LengthTools = ['Length', 'Angle', 'ArrowAnnotate', 'EllipticalRoi', 'Probe', 'RectangleRoi', 'CobbAngle', 'CTR'];
+var LengthTools = ['Length', 'Angle', 'ArrowAnnotate', 'EllipticalRoi', 'Probe', 'RectangleRoi', 'CobbAngle', 'CTR', 'ReferencePosition']; // 真正的测量工具 连续测量那边需要用到
+
+var LengthToolsWithMeasure = ['Length', 'Angle', 'ArrowAnnotate', 'EllipticalRoi', 'Probe', 'RectangleRoi', 'CobbAngle', 'CTR'];
 var LengthToolMap = {
   Length: '直线',
   ArrowAnnotate: '箭头',
@@ -601,6 +603,7 @@ var ToolsCursorMap = {
 
   reactHotLoader.register(WwwcDefinedList, "WwwcDefinedList", "/Users/huyeqing/workspace/chainz/paladin/src/utils/constant.js");
   reactHotLoader.register(LengthTools, "LengthTools", "/Users/huyeqing/workspace/chainz/paladin/src/utils/constant.js");
+  reactHotLoader.register(LengthToolsWithMeasure, "LengthToolsWithMeasure", "/Users/huyeqing/workspace/chainz/paladin/src/utils/constant.js");
   reactHotLoader.register(LengthToolMap, "LengthToolMap", "/Users/huyeqing/workspace/chainz/paladin/src/utils/constant.js");
   reactHotLoader.register(ToolsCursorMap, "ToolsCursorMap", "/Users/huyeqing/workspace/chainz/paladin/src/utils/constant.js");
 })();
@@ -10868,7 +10871,6 @@ var triggerEvent$2 = cornerstoneTools.importInternal('util/triggerEvent');
 var external$9 = cornerstoneTools.external,
     getToolState$5 = cornerstoneTools.getToolState,
     loadHandlerManager = cornerstoneTools.loadHandlerManager,
-    requestPoolManager = cornerstoneTools.requestPoolManager,
     EVENTS$2 = cornerstoneTools.EVENTS;
 /**
  * Scrolls through the stack to the image index requested.
@@ -11002,9 +11004,7 @@ var _default$h = function _default(element, newImageIdIndex, options, callback)
     imagePromise = loadAndCacheImagePlus(newImageId);
   }
 
-  imagePromise.then(doneCallback, failCallback); // Make sure we kick off any changed download request pools
-
-  requestPoolManager.startGrabbing();
+  imagePromise.then(doneCallback, failCallback);
 
   if (_options.eventTrigger) {
     triggerEvent$2(element, EVENTS$2.STACK_SCROLL, eventData);
@@ -11022,7 +11022,6 @@ var _default$h = function _default(element, newImageIdIndex, options, callback)
   reactHotLoader.register(external$9, "external", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/scrollToIndex.js");
   reactHotLoader.register(getToolState$5, "getToolState", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/scrollToIndex.js");
   reactHotLoader.register(loadHandlerManager, "loadHandlerManager", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/scrollToIndex.js");
-  reactHotLoader.register(requestPoolManager, "requestPoolManager", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/scrollToIndex.js");
   reactHotLoader.register(EVENTS$2, "EVENTS", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/scrollToIndex.js");
   reactHotLoader.register(_default$h, "default", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/scrollToIndex.js");
 })();
@@ -23500,24 +23499,24 @@ var __signature__$1q = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoa
 
 var elementToolOptions = {};
 /**
- * Retrieve the options object associated with a particular toolType and element
+ * Retrieve the options object associated with a particular toolName and element
  * @export
  * @public
  * @method
  * @name getToolOptions
  *
- * @param {string} toolType Tool type identifier of the target options object
+ * @param {string} toolName Tool name identifier of the target options object
  * @param {HTMLElement} element Element of the target options object
  *
  * @returns {Object} Target options object (empty if not yet set)
  */
 
-function getToolOptions(toolType, element) {
-  if (!elementToolOptions[toolType]) {
+function getToolOptions(toolName, element) {
+  if (!elementToolOptions[toolName]) {
     return {};
   }
 
-  var toolOptions = elementToolOptions[toolType];
+  var toolOptions = elementToolOptions[toolName];
   var optionsObject = toolOptions.find(function (toolOptionObject) {
     return toolOptionObject.element === element;
   });
@@ -23529,67 +23528,71 @@ function getToolOptions(toolType, element) {
   return optionsObject.options;
 }
 /**
- * Set the options object associated with a particular toolType and element.
+ * Set the options object associated with a particular toolName and element.
  * @export
  * @public
  * @method
  * @name setToolOptions
  *
- * @param {string} toolType Tool type identifier of the target options object.
+ * @param {string} toolName Tool name identifier of the target options object.
  * @param {HTMLElement} element Element of the target options object.
  * @param {Object} options Options object to store at target.
  * @returns {void}
  */
 
 
-function setToolOptions(toolType, element, options) {
-  if (!elementToolOptions[toolType]) {
-    elementToolOptions[toolType] = [{
+function setToolOptions(toolName, element, options) {
+  if (!elementToolOptions[toolName]) {
+    elementToolOptions[toolName] = [{
       element: element,
       options: options
     }];
     return;
   }
 
-  var toolOptions = elementToolOptions[toolType];
+  var toolOptions = elementToolOptions[toolName];
   var index = toolOptions.findIndex(function (toolOptionObject) {
     return toolOptionObject.element === element;
   });
 
   if (index === -1) {
-    elementToolOptions[toolType].push({
+    elementToolOptions[toolName].push({
       element: element,
       options: options
     });
   } else {
-    var elementOptions = elementToolOptions[toolType][index].options || {};
-    elementToolOptions[toolType][index].options = Object.assign(elementOptions, options);
+    var elementOptions = elementToolOptions[toolName][index].options || {};
+    elementToolOptions[toolName][index].options = Object.assign(elementOptions, options);
   }
 }
 /**
- * Clear the options object associated with a particular toolType and element.
+ * Clear the options object associated with a particular toolName and element.
  * @export
  * @public
  * @method
  * @name clearToolOptions
  *
- * @param {string} toolType Tool type identifier of the target options object.
+ * @param {string} toolName Tool name identifier of the target options object.
  * @param {HTMLElement} element Element of the target options object.
  * @returns {void}
  */
 
 
-function clearToolOptions(toolType, element) {
-  var toolOptions = elementToolOptions[toolType];
+function clearToolOptions(toolName, element) {
+  var toolOptions = elementToolOptions[toolName];
 
   if (toolOptions) {
-    elementToolOptions[toolType] = toolOptions.filter(function (toolOptionObject) {
+    elementToolOptions[toolName] = toolOptions.filter(function (toolOptionObject) {
       return toolOptionObject.element !== element;
     });
   }
 }
 /**
  * Clear the options objects associated with a particular toolType.
+ *
+ * Deprecation notice: use clearToolOptionsByToolName instead
+ * @deprecated
+ *
  * @export
  * @public
  * @method
@@ -23601,7 +23604,22 @@ function clearToolOptions(toolType, element) {
 
 
 function clearToolOptionsByToolType(toolType) {
-  delete elementToolOptions[toolType];
+  return clearToolOptionsByToolName(toolType);
+}
+/**
+ * Clear the options objects associated with a particular toolName.
+ * @export
+ * @public
+ * @method
+ * @name clearToolOptionsByToolName
+ *
+ * @param {string} toolName Tool name identifier of the target options objects.
+ * @returns {void}
+ */
+
+
+function clearToolOptionsByToolName(toolName) {
+  delete elementToolOptions[toolName];
 }
 /**
  * Clear the options objects associated with a particular element.
@@ -23616,8 +23634,8 @@ function clearToolOptionsByToolType(toolType) {
 
 
 function clearToolOptionsByElement(element) {
-  for (var toolType in elementToolOptions) {
-    elementToolOptions[toolType] = elementToolOptions[toolType].filter(function (toolOptionObject) {
+  for (var toolName in elementToolOptions) {
+    elementToolOptions[toolName] = elementToolOptions[toolName].filter(function (toolOptionObject) {
       return toolOptionObject.element !== element;
     });
   }
@@ -23635,6 +23653,7 @@ function clearToolOptionsByElement(element) {
   reactHotLoader.register(setToolOptions, "setToolOptions", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/toolOptions.js");
   reactHotLoader.register(clearToolOptions, "clearToolOptions", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/toolOptions.js");
   reactHotLoader.register(clearToolOptionsByToolType, "clearToolOptionsByToolType", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/toolOptions.js");
+  reactHotLoader.register(clearToolOptionsByToolName, "clearToolOptionsByToolName", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/toolOptions.js");
   reactHotLoader.register(clearToolOptionsByElement, "clearToolOptionsByElement", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/cornerstone-tools-plus/util/toolOptions.js");
 })();
 
@@ -26757,7 +26776,7 @@ var ReferencePositionTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
 
                     var distance = _this3.calcDistance(sourcePointV3, sourcePointInTargetPlaneV3);
 
-                    if (!min || distance < min) {
+                    if (!min && min !== 0 || distance < min) {
                       min = distance;
                       targetImageIndex = index;
                     }
@@ -47544,7 +47563,11 @@ var CustomScroll = /*#__PURE__*/function (_Component) {
           currentStep = step - 1;
         }
 
-        _this2.debouncedPan(currentStep);
+        if (_this2.props.needDebounce) {
+          _this2.debouncedPan(currentStep);
+        } else {
+          _this2.props.onPan(currentStep);
+        }
       };
 
       switch (type) {
@@ -48312,7 +48335,7 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
 
         var activeTool = _this.props.activeTool;
 
-        if (!_this.props.continuousMeasure && lodash$1.includes(LengthTools, activeTool)) {
+        if (!_this.props.continuousMeasure && lodash$1.includes(LengthToolsWithMeasure, activeTool)) {
           var toolData = _default$E.getToolState(_this.element, activeDataTool);
 
           if (toolData && toolData.data && toolData.data.length > 0) {
@@ -48688,7 +48711,6 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
       });
     });
 
-    _this.loaded = false;
     _this.mouseDownViewport = null; // 记录鼠标操作前的viewport，为了相对同步
     // 拷贝一份 使得作用域内stack的修改不污染外部的series
 
@@ -49935,7 +49957,8 @@ var DicomLayout = /*#__PURE__*/function (_Component) {
         step: Math.ceil(seriesTotalCount / col) - row + 1,
         onPan: this.props.customScrollPan,
         name: 'layout',
-        scrollType: "relative"
+        scrollType: "relative",
+        needDebounce: true
       })));
     }
   }, {
@@ -50087,6 +50110,27 @@ var mergeProps$e = function mergeProps(propsFromState, propsFromDispatch, ownPro
       // 测量工具下不响应双击操作
       if (lodash$1.includes(LengthTools, propsFromState.activeTool)) {
         return;
+      } // 有绘制的toolData被激活时 也不响应（双点击的会偶发T10283）
+
+
+      var element = getElement(index);
+      var checkToolDataActive = false;
+      lodash$1.forEach(LengthTools, function (tool) {
+        if (!checkToolDataActive) {
+          var toolData = _default$E.getToolState(element, tool);
+
+          if (toolData && toolData.data && toolData.data.length > 0) {
+            lodash$1.forEach(toolData.data, function (handler) {
+              if (handler && handler.active) {
+                checkToolDataActive = true;
+              }
+            });
+          }
+        }
+      });
+
+      if (checkToolDataActive) {
+        return;
       }
 
       var onePickMode = propsFromState.onePickMode,
@@ -50120,8 +50164,9 @@ var mergeProps$e = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
       setTimeout(function () {
         try {
-          var element = getElement(resizeIndex);
-          cornerstone.resize(element, true);
+          var _element = getElement(resizeIndex);
+
+          cornerstone.resize(_element, true);
         } catch (e) {
           console.log('ignore element not enabled event');
         }