hellfire 0.18.0 → 0.19.0

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.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)
+
+
+
+## [0.18.1](http://10.16.100.57/diffusion/115/paladin/compare/v0.18.0...v0.18.1) (2022-01-26)
+
+
+
 # [0.18.0](http://10.16.100.57/diffusion/115/paladin/compare/v0.17.12...v0.18.0) (2022-01-26)
 
 

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");
 })();
 
@@ -26666,104 +26685,149 @@ var ReferencePositionTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
     /**
      *  target element的render方法
      *  计算source的点和target最近的层 翻页+绘制垂直映射的点
+     *
+     *  方法：
+     *  遍历算出所有距离 做排序
      */
 
   }, {
     key: "renderTargetPosition",
-    value: function renderTargetPosition(evt) {
-      var _this3 = this;
+    value: function () {
+      var _renderTargetPosition = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(evt) {
+        var _this3 = this;
 
-      var _evt$detail2 = evt.detail,
-          image = _evt$detail2.image,
-          element = _evt$detail2.element;
-      var sourceElements = this.synchronizationContext.getSourceElements();
+        var _evt$detail2, image, element, sourceElements, sourceElement, sourceToolData, cornerstone, sourceImage, currentTargetImage, sourceImagePlane, currentTargetPlane, sourcePoint, sourcePointV3, imageTotalCount, targetImageIndex, min, targetImagePlane, sourcePointToTargetPlanePoint, context, handles;
 
-      if (!sourceElements || sourceElements.length === 0 || !this.imageIds || this.imageIds.length === 0) {
-        return;
-      }
+        return regenerator.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _evt$detail2 = evt.detail, image = _evt$detail2.image, element = _evt$detail2.element;
+                sourceElements = this.synchronizationContext.getSourceElements();
 
-      var sourceElement = sourceElements[0];
-      var sourceToolData = getToolState$b(sourceElement, this.name);
+                if (!(!sourceElements || sourceElements.length === 0 || !this.imageIds || this.imageIds.length === 0)) {
+                  _context2.next = 4;
+                  break;
+                }
 
-      if (!sourceToolData || !sourceToolData.data || sourceToolData.data.length === 0) {
-        return;
-      } // 操作的element有二维定位的点
+                return _context2.abrupt("return");
 
+              case 4:
+                sourceElement = sourceElements[0];
+                sourceToolData = getToolState$b(sourceElement, this.name);
 
-      var cornerstone = external$j.cornerstone;
-      var sourceImage = cornerstone.getEnabledElement(sourceElement).image;
+                if (!(!sourceToolData || !sourceToolData.data || sourceToolData.data.length === 0)) {
+                  _context2.next = 8;
+                  break;
+                }
 
-      if (!sourceImage) {
-        return;
-      }
+                return _context2.abrupt("return");
 
-      var sourceImagePlane = cornerstone.metaData.get('imagePlaneModule', sourceImage.imageId);
+              case 8:
+                // 操作的element有二维定位的点
+                cornerstone = external$j.cornerstone;
+                sourceImage = cornerstone.getEnabledElement(sourceElement).image;
+                currentTargetImage = cornerstone.getEnabledElement(element).image;
 
-      if (!sourceImagePlane || !sourceImagePlane.rowCosines || !sourceImagePlane.columnCosines || !sourceImagePlane.imagePositionPatient || !sourceImagePlane.frameOfReferenceUID) {
-        return;
-      }
+                if (!(!sourceImage || !currentTargetImage)) {
+                  _context2.next = 13;
+                  break;
+                }
 
-      var sourcePoint = sourceToolData.data[0].handles.end;
-      var sourcePointV3 = imagePointToPatientPoint(sourcePoint, sourceImagePlane);
-      /**
-       * 1.在起始的外侧，就直接取第一个image
-       * 2.在结束的外侧，直接取最后一个image
-       * 3.在中间，把source的点击的p点投到第一张上获得p1，投到最后一张上获得p2，因为层是平行的，
-       * 这样三个点就在一条空间的直线上了，然后计算p1到p2的距离distance，distance/层数，
-       * 就是层厚+层间距（默认当它是等分的）,然后p点到p1的距离也能知道，除以（层厚+层间距）找到index
-       */
+                return _context2.abrupt("return");
 
-      var imageTotalCount = this.imageIds.length;
-      var targetImageIndex = 0;
-
-      if (imageTotalCount > 1) {
-        var firstImageId = this.imageIds[0];
-        var lastImageId = this.imageIds[imageTotalCount - 1];
-        var firstTargetImagePlane = cornerstone.metaData.get('imagePlaneModule', firstImageId);
-        var lastTargetImagePlane = cornerstone.metaData.get('imagePlaneModule', lastImageId);
-        var sourcePointInFirstPlane = projectPatientPointToImagePlane$1(sourcePointV3, firstTargetImagePlane);
-        var sourcePointInLastPlane = projectPatientPointToImagePlane$1(sourcePointV3, lastTargetImagePlane);
-        var sourcePointInFirstPlaneV3 = imagePointToPatientPoint(sourcePointInFirstPlane, firstTargetImagePlane);
-        var sourcePointInLastPlaneV3 = imagePointToPatientPoint(sourcePointInLastPlane, lastTargetImagePlane);
-        var totalDistance = this.calcDistance(sourcePointInFirstPlaneV3, sourcePointInLastPlaneV3);
-        var pointToFirstImageDistance = this.calcDistance(sourcePointInFirstPlaneV3, sourcePointV3);
-
-        var _targetImageIndex = lodash$1.round(pointToFirstImageDistance / (totalDistance / (imageTotalCount - 1)));
-
-        if (_targetImageIndex < 0 || _targetImageIndex > imageTotalCount - 1) {
-          // 不在这个序列范围内 不翻页 不绘制
-          return;
-        }
+              case 13:
+                sourceImagePlane = cornerstone.metaData.get('imagePlaneModule', sourceImage.imageId);
+                currentTargetPlane = cornerstone.metaData.get('imagePlaneModule', currentTargetImage.imageId);
 
-        scrollToIndex(element, _targetImageIndex);
-      }
+                if (!(!sourceImagePlane || !currentTargetPlane || !sourceImagePlane.rowCosines || !sourceImagePlane.columnCosines || !sourceImagePlane.imagePositionPatient || !sourceImagePlane.frameOfReferenceUID || !currentTargetPlane.frameOfReferenceUID)) {
+                  _context2.next = 17;
+                  break;
+                }
 
-      var targetImagePlane = cornerstone.metaData.get('imagePlaneModule', this.imageIds[targetImageIndex]);
+                return _context2.abrupt("return");
 
-      if (!targetImagePlane || !targetImagePlane.rowCosines || !targetImagePlane.columnCosines || !targetImagePlane.imagePositionPatient || !targetImagePlane.frameOfReferenceUID) {
-        return;
-      }
+              case 17:
+                if (!(currentTargetPlane.frameOfReferenceUID !== sourceImagePlane.frameOfReferenceUID)) {
+                  _context2.next = 19;
+                  break;
+                }
 
-      var sourcePointToTargetPlanePoint = projectPatientPointToImagePlane$1(sourcePointV3, targetImagePlane);
-      var context = getNewContext$c(evt.detail.canvasContext.canvas);
-      var handles = {
-        end: sourcePointToTargetPlanePoint
-      };
-      draw$b(context, function (context) {
-        _default$t(context, evt.detail, handles, {
-          handleRadius: _this3.configuration.handleRadius,
-          lineLength: 20,
-          lineSpacing: 8,
-          hideCenterPoint: true,
-          color: '#eb6565',
-          lineWidth: 2
-        });
+                return _context2.abrupt("return");
 
-        _this3.updateCachedStats(image, element, {
-          handles: handles
-        });
-      });
-    }
+              case 19:
+                sourcePoint = sourceToolData.data[0].handles.end;
+                sourcePointV3 = imagePointToPatientPoint(sourcePoint, sourceImagePlane);
+                imageTotalCount = this.imageIds.length;
+                targetImageIndex = 0;
+
+                if (imageTotalCount > 1) {
+                  // 遍历计算所有distance
+                  min = null;
+                  lodash$1.forEach(this.imageIds, function (imageId, index) {
+                    var imagePlane = cornerstone.metaData.get('imagePlaneModule', imageId);
+
+                    if (!imagePlane || !imagePlane.rowCosines || !imagePlane.columnCosines || !imagePlane.imagePositionPatient) {
+                      return;
+                    }
+
+                    var sourcePointInTargetPlane = projectPatientPointToImagePlane$1(sourcePointV3, imagePlane);
+                    var sourcePointInTargetPlaneV3 = imagePointToPatientPoint(sourcePointInTargetPlane, imagePlane);
+
+                    var distance = _this3.calcDistance(sourcePointV3, sourcePointInTargetPlaneV3);
+
+                    if (!min || distance < min) {
+                      min = distance;
+                      targetImageIndex = index;
+                    }
+                  });
+                  scrollToIndex(element, targetImageIndex);
+                }
+
+                targetImagePlane = cornerstone.metaData.get('imagePlaneModule', this.imageIds[targetImageIndex]);
+
+                if (!(!targetImagePlane || !targetImagePlane.rowCosines || !targetImagePlane.columnCosines || !targetImagePlane.imagePositionPatient)) {
+                  _context2.next = 27;
+                  break;
+                }
+
+                return _context2.abrupt("return");
+
+              case 27:
+                sourcePointToTargetPlanePoint = projectPatientPointToImagePlane$1(sourcePointV3, targetImagePlane);
+                context = getNewContext$c(evt.detail.canvasContext.canvas);
+                handles = {
+                  end: sourcePointToTargetPlanePoint
+                };
+                draw$b(context, function (context) {
+                  _default$t(context, evt.detail, handles, {
+                    handleRadius: _this3.configuration.handleRadius,
+                    lineLength: 20,
+                    lineSpacing: 8,
+                    hideCenterPoint: true,
+                    color: '#eb6565',
+                    lineWidth: 2
+                  });
+
+                  _this3.updateCachedStats(image, element, {
+                    handles: handles
+                  });
+                });
+
+              case 31:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function renderTargetPosition(_x2) {
+        return _renderTargetPosition.apply(this, arguments);
+      }
+
+      return renderTargetPosition;
+    }()
   }, {
     key: "calcDistance",
     value: function calcDistance(p1, p2) {
@@ -48267,7 +48331,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) {
@@ -48643,7 +48707,6 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
       });
     });
 
-    _this.loaded = false;
     _this.mouseDownViewport = null; // 记录鼠标操作前的viewport，为了相对同步
     // 拷贝一份 使得作用域内stack的修改不污染外部的series
 
@@ -50042,6 +50105,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,
@@ -50075,8 +50159,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');
         }