hellfire 0.18.1 → 0.18.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.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)
 
 

package/dist/index.js

@@ -26412,60 +26412,11 @@ function imagePointToPatientPoint(imagePoint, imagePlane) {
   enterModule && enterModule(module);
 })();
 
-var __signature__$1E = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
-  return a;
-};
-var dicomCache = {};
-
-var loadAndCacheDicom = function loadAndCacheDicom(imageId) {
-  return new Promise(function (resolve, reject) {
-    if (dicomCache[imageId]) {
-      resolve(dicomCache[imageId]);
-      return;
-    }
-
-    var imagePromise = loadAndCacheImagePlus(imageId);
-    imagePromise.then(function (image) {
-      var dicom = new DicomInfo(image.data, image.getPixelData());
-      dicomCache[imageId] = dicom;
-      resolve(dicom);
-    }, function (e) {
-      reject(e);
-    });
-  });
-};
-
-var purgeDicomCache = function purgeDicomCache() {
-  dicomCache = {};
-};
-
-(function () {
-  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
-
-  if (!reactHotLoader) {
-    return;
-  }
-
-  reactHotLoader.register(dicomCache, "dicomCache", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/dicom-parser-plus/dicom/utils/loadAndCacheDicom.js");
-  reactHotLoader.register(loadAndCacheDicom, "loadAndCacheDicom", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/dicom-parser-plus/dicom/utils/loadAndCacheDicom.js");
-  reactHotLoader.register(purgeDicomCache, "purgeDicomCache", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/dicom-parser-plus/dicom/utils/loadAndCacheDicom.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 _createSuper$A(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$A(); 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); }; }
 
 function _isNativeReflectConstruct$A() { 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__$1F = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1E = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var getNewContext$c = cornerstoneTools.importInternal('drawing/getNewContext');
@@ -26715,6 +26666,9 @@ var ReferencePositionTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
     /**
      *  target element的render方法
      *  计算source的点和target最近的层 翻页+绘制垂直映射的点
+     *
+     *  方法：
+     *  遍历算出所有距离 做排序
      */
 
   }, {
@@ -26723,7 +26677,7 @@ var ReferencePositionTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
       var _renderTargetPosition = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(evt) {
         var _this3 = this;
 
-        var _evt$detail2, image, element, sourceElements, sourceElement, sourceToolData, cornerstone, sourceImage, currentTargetImage, sourceImagePlane, currentTargetPlane, currentTargetImageDicom, sourceImageDicom, sourcePoint, sourcePointV3, imageTotalCount, targetImageIndex, firstImageId, lastImageId, firstTargetImagePlane, lastTargetImagePlane, sourcePointInFirstPlane, sourcePointInLastPlane, sourcePointInFirstPlaneV3, sourcePointInLastPlaneV3, totalDistance, pointToFirstImageDistance, _targetImageIndex, targetImagePlane, sourcePointToTargetPlanePoint, context, handles;
+        var _evt$detail2, image, element, sourceElements, sourceElement, sourceToolData, cornerstone, sourceImage, currentTargetImage, sourceImagePlane, currentTargetPlane, sourcePoint, sourcePointV3, imageTotalCount, targetImageIndex, min, targetImagePlane, sourcePointToTargetPlanePoint, context, handles;
 
         return regenerator.wrap(function _callee2$(_context2) {
           while (1) {
@@ -26783,93 +26737,44 @@ var ReferencePositionTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
                 return _context2.abrupt("return");
 
               case 19:
-                _context2.next = 21;
-                return loadAndCacheDicom(currentTargetImage.imageId);
-
-              case 21:
-                currentTargetImageDicom = _context2.sent;
-                _context2.next = 24;
-                return loadAndCacheDicom(sourceImage.imageId);
-
-              case 24:
-                sourceImageDicom = _context2.sent;
-
-                if (!(!currentTargetImageDicom.ImageType || !currentTargetImageDicom.ImageType.value || !lodash$1.includes(lodash$1.toUpper(currentTargetImageDicom.ImageType.value), 'PRIMARY'))) {
-                  _context2.next = 27;
-                  break;
-                }
-
-                return _context2.abrupt("return");
-
-              case 27:
-                if (!(!sourceImageDicom.ImageType || !sourceImageDicom.ImageType.value || !lodash$1.includes(lodash$1.toUpper(sourceImageDicom.ImageType.value), 'PRIMARY'))) {
-                  _context2.next = 29;
-                  break;
-                }
-
-                return _context2.abrupt("return");
-
-              case 29:
                 sourcePoint = sourceToolData.data[0].handles.end;
                 sourcePointV3 = imagePointToPatientPoint(sourcePoint, sourceImagePlane);
-                /**
-                 * 1.在起始的外侧，就直接取第一个image
-                 * 2.在结束的外侧，直接取最后一个image
-                 * 3.在中间，把source的点击的p点投到第一张上获得p1，投到最后一张上获得p2，因为层是平行的，
-                 * 这样三个点就在一条空间的直线上了，然后计算p1到p2的距离distance，distance/层数，
-                 * 就是层厚+层间距（默认当它是等分的）,然后p点到p1的距离也能知道，除以（层厚+层间距）找到index
-                 */
-
                 imageTotalCount = this.imageIds.length;
                 targetImageIndex = 0;
 
-                if (!(imageTotalCount > 1)) {
-                  _context2.next = 50;
-                  break;
-                }
+                if (imageTotalCount > 1) {
+                  // 遍历计算所有distance
+                  min = null;
+                  lodash$1.forEach(this.imageIds, function (imageId, index) {
+                    var imagePlane = cornerstone.metaData.get('imagePlaneModule', imageId);
 
-                firstImageId = this.imageIds[0];
-                lastImageId = this.imageIds[imageTotalCount - 1];
-                firstTargetImagePlane = cornerstone.metaData.get('imagePlaneModule', firstImageId);
-                lastTargetImagePlane = cornerstone.metaData.get('imagePlaneModule', lastImageId);
+                    if (!imagePlane || !imagePlane.rowCosines || !imagePlane.columnCosines || !imagePlane.imagePositionPatient) {
+                      return;
+                    }
 
-                if (!(!firstTargetImagePlane || !lastTargetImagePlane || !firstTargetImagePlane.rowCosines || !lastTargetImagePlane.rowCosines || !firstTargetImagePlane.columnCosines || !lastTargetImagePlane.columnCosines || !firstTargetImagePlane.imagePositionPatient || !lastTargetImagePlane.imagePositionPatient)) {
-                  _context2.next = 40;
-                  break;
-                }
+                    var sourcePointInTargetPlane = projectPatientPointToImagePlane$1(sourcePointV3, imagePlane);
+                    var sourcePointInTargetPlaneV3 = imagePointToPatientPoint(sourcePointInTargetPlane, imagePlane);
 
-                return _context2.abrupt("return");
+                    var distance = _this3.calcDistance(sourcePointV3, sourcePointInTargetPlaneV3);
 
-              case 40:
-                sourcePointInFirstPlane = projectPatientPointToImagePlane$1(sourcePointV3, firstTargetImagePlane);
-                sourcePointInLastPlane = projectPatientPointToImagePlane$1(sourcePointV3, lastTargetImagePlane);
-                sourcePointInFirstPlaneV3 = imagePointToPatientPoint(sourcePointInFirstPlane, firstTargetImagePlane);
-                sourcePointInLastPlaneV3 = imagePointToPatientPoint(sourcePointInLastPlane, lastTargetImagePlane);
-                totalDistance = this.calcDistance(sourcePointInFirstPlaneV3, sourcePointInLastPlaneV3);
-                pointToFirstImageDistance = this.calcDistance(sourcePointInFirstPlaneV3, sourcePointV3);
-                _targetImageIndex = lodash$1.round(pointToFirstImageDistance / (totalDistance / (imageTotalCount - 1)));
-
-                if (!(_targetImageIndex < 0 || _targetImageIndex > imageTotalCount - 1)) {
-                  _context2.next = 49;
-                  break;
+                    if (!min || distance < min) {
+                      min = distance;
+                      targetImageIndex = index;
+                    }
+                  });
+                  scrollToIndex(element, targetImageIndex);
                 }
 
-                return _context2.abrupt("return");
-
-              case 49:
-                scrollToIndex(element, _targetImageIndex);
-
-              case 50:
                 targetImagePlane = cornerstone.metaData.get('imagePlaneModule', this.imageIds[targetImageIndex]);
 
-                if (!(!targetImagePlane || !targetImagePlane.rowCosines || !targetImagePlane.columnCosines || !targetImagePlane.imagePositionPatient || !targetImagePlane.frameOfReferenceUID)) {
-                  _context2.next = 53;
+                if (!(!targetImagePlane || !targetImagePlane.rowCosines || !targetImagePlane.columnCosines || !targetImagePlane.imagePositionPatient)) {
+                  _context2.next = 27;
                   break;
                 }
 
                 return _context2.abrupt("return");
 
-              case 53:
+              case 27:
                 sourcePointToTargetPlanePoint = projectPatientPointToImagePlane$1(sourcePointV3, targetImagePlane);
                 context = getNewContext$c(evt.detail.canvasContext.canvas);
                 handles = {
@@ -26890,7 +26795,7 @@ var ReferencePositionTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
                   });
                 });
 
-              case 57:
+              case 31:
               case "end":
                 return _context2.stop();
             }
@@ -26957,7 +26862,7 @@ var ReferencePositionTool = /*#__PURE__*/function (_BaseAnnotationPlusTo) {
   enterModule && enterModule(module);
 })();
 
-var __signature__$1G = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1F = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var getToolState$c = cornerstoneTools.getToolState;
@@ -26994,7 +26899,7 @@ var _default$w = function _default(element) {
   enterModule && enterModule(module);
 })();
 
-var __signature__$1H = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1G = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var scrollToIndex$1 = cornerstoneTools.importInternal('util/scrollToIndex');
@@ -27072,7 +26977,7 @@ var _default$x = {
   enterModule && enterModule(module);
 })();
 
-var __signature__$1I = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1H = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var external$k = cornerstoneTools.external;
@@ -27359,7 +27264,7 @@ var _default$y = function _default(synchronizer, sourceElement, targetElement, e
   enterModule && enterModule(module);
 })();
 
-var __signature__$1J = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1I = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var external$l = cornerstoneTools.external;
@@ -27513,7 +27418,7 @@ var _default$z = function _default(synchronizer, sourceElement, targetElement, e
   enterModule && enterModule(module);
 })();
 
-var __signature__$1K = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1J = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var getToolState$e = cornerstoneTools.getToolState;
@@ -27588,7 +27493,7 @@ var _default$A = function _default(synchronizer, sourceElement, targetElement, e
   enterModule && enterModule(module);
 })();
 
-var __signature__$1L = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1K = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var external$m = cornerstoneTools.external;
@@ -27672,7 +27577,7 @@ var _default$B = function _default(synchronizer, sourceElement, targetElement, e
   enterModule && enterModule(module);
 })();
 
-var __signature__$1M = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1L = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 
@@ -27713,7 +27618,7 @@ var _MPR_DIRECTION_COLOR;
   enterModule && enterModule(module);
 })();
 
-var __signature__$1N = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1M = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var MPR_DIRECTION_COLOR = (_MPR_DIRECTION_COLOR = {}, defineProperty(_MPR_DIRECTION_COLOR, ImagePlanDirection.Sagittal, 'red'), defineProperty(_MPR_DIRECTION_COLOR, ImagePlanDirection.Transverse, 'greenyellow'), defineProperty(_MPR_DIRECTION_COLOR, ImagePlanDirection.Coronal, 'blue'), _MPR_DIRECTION_COLOR);
@@ -27738,7 +27643,7 @@ var MPR_DIRECTION_COLOR = (_MPR_DIRECTION_COLOR = {}, defineProperty(_MPR_DIRECT
   enterModule && enterModule(module);
 })();
 
-var __signature__$1O = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1N = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var external$n = cornerstoneTools.external; // 两条直线求焦点
@@ -27808,7 +27713,7 @@ var _userAgent$cpu, _userAgent$device, _userAgent$os, _userAgent$os2, _userAgent
   enterModule && enterModule(module);
 })();
 
-var __signature__$1P = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1O = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 
@@ -27958,7 +27863,7 @@ function _createSuper$B(Derived) { var hasNativeReflectConstruct = _isNativeRefl
 
 function _isNativeReflectConstruct$B() { 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__$1Q = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1P = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var external$o = cornerstoneTools.external;
@@ -28492,7 +28397,7 @@ function _createSuper$C(Derived) { var hasNativeReflectConstruct = _isNativeRefl
 
 function _isNativeReflectConstruct$C() { 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__$1R = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1Q = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var external$p = cornerstoneTools.external;
@@ -28641,7 +28546,7 @@ var OverlayTool = /*#__PURE__*/function (_BaseTool) {
   enterModule && enterModule(module);
 })();
 
-var __signature__$1S = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+var __signature__$1R = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
 var cornerstoneState = {
@@ -28755,6 +28660,55 @@ function reset$2(key) {
   enterModule && enterModule(module);
 })();
 
+var __signature__$1S = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+var dicomCache = {};
+
+var loadAndCacheDicom = function loadAndCacheDicom(imageId) {
+  return new Promise(function (resolve, reject) {
+    if (dicomCache[imageId]) {
+      resolve(dicomCache[imageId]);
+      return;
+    }
+
+    var imagePromise = loadAndCacheImagePlus(imageId);
+    imagePromise.then(function (image) {
+      var dicom = new DicomInfo(image.data, image.getPixelData());
+      dicomCache[imageId] = dicom;
+      resolve(dicom);
+    }, function (e) {
+      reject(e);
+    });
+  });
+};
+
+var purgeDicomCache = function purgeDicomCache() {
+  dicomCache = {};
+};
+
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+
+  if (!reactHotLoader) {
+    return;
+  }
+
+  reactHotLoader.register(dicomCache, "dicomCache", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/dicom-parser-plus/dicom/utils/loadAndCacheDicom.js");
+  reactHotLoader.register(loadAndCacheDicom, "loadAndCacheDicom", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/dicom-parser-plus/dicom/utils/loadAndCacheDicom.js");
+  reactHotLoader.register(purgeDicomCache, "purgeDicomCache", "/Users/huyeqing/workspace/chainz/paladin/src/cornerstone-plus/dicom-parser-plus/dicom/utils/loadAndCacheDicom.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 ownKeys$c(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$c(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$c(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$c(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }