kfb-view 3.2.4 → 3.2.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kfb-view",
   "description": "一个在线kfb的阅片软件",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "author": "qifeng.fan <qifeng.fan@hzztai.com>",
   "license": "MIT",
   "main": "lib/kfb-view.js",

package/src/components/board/index.js

@@ -3,7 +3,7 @@ import * as Tools from '../../tool';
 import {
   POLYGON, DOT, FLAG, MARKS,
   NO_NORMAL_REGION_TYPES,
-  POINT_TYPES, STAR, ELLIPSE, REGION_TYPES,
+  POINT_TYPES, STAR, REGION_TYPES,
 } from '../../const/mark';
 import {
   EVENT_START_PAINTING,

package/src/components/common/common.js

@@ -1,14 +1,12 @@
 import {Thumb} from '../../tool/Thumb';
 import {
-  acreage,
-  getAngle,
-  perimeter,
   pointsToRegion,
   getRectPoint,
   isPointInEllipse,
   isPointInMatrix,
   isPointInPolygon,
-  calculatePolygonArea, getRectPointV2,
+  calculatePolygonArea,
+  getUnitNumber,
 } from '../../util/calculate';
 import {Point, Rect} from '../../plugin/openseadragon/openseadragon';
 import {
@@ -19,7 +17,6 @@ import {
   LINE,
   RECTANGLE,
 } from '../../const/mark';
-import {getUnitNumber} from '../../util';
 
 /**
  * 通用方法类
@@ -248,17 +245,15 @@ export class ViewerCommon {
           top: p.y,
           angle: 0,
           texts: [
-            `长：${this.getUnitNumber((Math.sqrt(w * w + h * h) * this.options.imageCapRes).toFixed(2))}`],
+            `长：${this.getUnitNumber(Math.sqrt(w * w + h * h) * this.options.imageCapRes)}`],
         };
       }
         break;
       case ELLIPSE: {
         const w = Math.abs(endPoint.x - startPoint.x) / 2;
         const h = Math.abs(endPoint.y - startPoint.y) / 2;
-        const pt = perimeter(ELLIPSE, startPoint, endPoint,
-          this.options.imageCapRes).toFixed(2);
-        const ac = acreage(ELLIPSE, startPoint, endPoint,
-          this.options.imageCapRes).toFixed(2);
+        const a = (w > h ? w : h) * this.options.imageCapRes;
+        const b = (w > h ? h : w) * this.options.imageCapRes;
         const rightTop = getRectPoint(startPoint, endPoint)[2];
         const p = this.imageToViewerElementCoordinates(rightTop.x,
           rightTop.y);
@@ -267,20 +262,18 @@ export class ViewerCommon {
           top: p.y,
           angle: 0,
           texts: [
-            `长轴：${this.getUnitNumber((w * this.options.imageCapRes).toFixed(2))}`,
-            `短轴：${this.getUnitNumber((h * this.options.imageCapRes).toFixed(2))}`,
-            `周长：${this.getUnitNumber(pt)}`,
-            `面积：${this.getUnitNumber(ac)}²`],
+            `长轴：${this.getUnitNumber(a)}`,
+            `短轴：${this.getUnitNumber(b)}`,
+            `周长：${this.getUnitNumber(4 * (a - b) + 2 * Math.PI * b)}`,
+            `面积：${this.getUnitNumber(Math.PI * a * b / this.options.binary)}²`],
         };
       }
         break;
       case RECTANGLE: {
-        const w = Math.abs(endPoint.x - startPoint.x);
-        const h = Math.abs(endPoint.y - startPoint.y);
-        const pt = perimeter(RECTANGLE, startPoint, endPoint,
-          this.options.imageCapRes).toFixed(2);
-        const ac = acreage(RECTANGLE, startPoint, endPoint,
-          this.options.imageCapRes).toFixed(2);
+        const w = Math.abs(endPoint.x - startPoint.x) * this.options.imageCapRes;
+        const h = Math.abs(endPoint.y - startPoint.y) * this.options.imageCapRes;
+        const pt = (w + h) * 2;
+        const ac = w * h / this.options.binary;
         const rightTop = getRectPoint(startPoint, endPoint)[2];
         const p = this.imageToViewerElementCoordinates(rightTop.x,
           rightTop.y);
@@ -289,8 +282,8 @@ export class ViewerCommon {
           top: p.y,
           angle: 0,
           texts: [
-            `长：${this.getUnitNumber((w * this.options.imageCapRes).toFixed(2))}`,
-            `宽：${this.getUnitNumber((h * this.options.imageCapRes).toFixed(2))}`,
+            `长：${this.getUnitNumber(w)}`,
+            `宽：${this.getUnitNumber(h)}`,
             `周长：${this.getUnitNumber(pt)}`,
             `面积：${this.getUnitNumber(ac)}²`],
         };
@@ -312,8 +305,8 @@ export class ViewerCommon {
           angle: 0,
           texts: [
             `周长：${this.getUnitNumber((pt * this.options.imageCapRes).toFixed(2))}`,
-            `面积：${this.getUnitNumber(calculatePolygonArea(points,
-              this.options.imageCapRes).toFixed(2))}²`],
+            `面积：${this.getUnitNumber(
+              calculatePolygonArea(points, this.options.imageCapRes) / this.options.binary)}²`],
         };
       }
         break;
@@ -336,8 +329,8 @@ export class ViewerCommon {
     };
   }
 
-  getUnitNumber(number) {
-    return getUnitNumber(number, this.options.units, this.options.binary);
+  getUnitNumber(number, index) {
+    return getUnitNumber(number, this.options.units, this.options.binary, index);
   }
 
   /**

package/src/components/graduation/index.js

@@ -1,6 +1,6 @@
 import {ViewerCommon} from '../common/common';
 import {EVENT_GRADUATION_CHANGE} from '../../const/event';
-import {getUnitNumber} from '../../util';
+import {getUnitNumber} from '../../util/calculate';
 
 /**
  * 刻度线

package/src/util/calculate.js

@@ -382,6 +382,7 @@ function getPoint(cen, first, deg) {
 /**
  * 通过两个点计算矩形的四个点
  *  @param {array} points
+ * @return {{x: *, y: *}}
  * */
 function getRectPoints(points) {
   return [
@@ -432,29 +433,6 @@ function getDistance(p1, p2) {
   return Math.sqrt(distX + distY);
 }
 
-/**
- * 几何图形的面积
- * @param {string} type
- * @param {Object} startPoint
- * @param {Object} endPoint
- * @param {number} imageCapRes 像素转微米系数
- * @return {number}
- */
-function acreage(type, startPoint, endPoint, imageCapRes = 1) {
-  let ag = 0;
-  const distX = Math.abs(endPoint.x - startPoint.x) * imageCapRes;
-  const distY = Math.abs(endPoint.y - startPoint.y) * imageCapRes;
-  if (type === 'Rectangle') {
-    ag = distX * distY / 2;
-  }
-  if (type === 'Ellipse') {
-    ag = distX * distY / 4 * Math.PI;
-  }
-  /* if (type === 'polygon') {
-  }*/
-  return ag;
-}
-
 function calculatePolygonArea(points, ratio) {
   const numVertices = points.length;
 
@@ -481,38 +459,25 @@ function calculatePolygonArea(points, ratio) {
   return Math.abs(area / 2);
 }
 
-/**
- * 几何图形的周长
- * @param {string} type
- * @param {Object} startPoint
- * @param {Object} endPoint
- * @param {number} imageCapRes 像素转微米系数
- * @return {number}
- */
-function perimeter(type, startPoint, endPoint, imageCapRes = 1) {
-  let pt = 0;
-  const distX = Math.abs(endPoint.x - startPoint.x) * imageCapRes;
-  const distY = Math.abs(endPoint.y - startPoint.y) * imageCapRes;
-  if (type === 'Line' || type === 'Arrow') {
-    pt = Math.sqrt(Math.pow(distX, 2) + Math.pow(distY, 2));
+const getRandomId = () => {
+  return (((1 + Math.random()) * 0x100000000) | 0).toString(16).substring(1);
+};
+
+function getUnitNumber(number, units, binary, index = 0) {
+  if (index) {
+    return (number / Math.pow(binary, index)).toFixed(2) / 1 + units[index];
   }
-  if (type === 'Rectangle') {
-    pt = (distX + distY) * 2;
+  let i = number;
+  while (i >= binary) {
+    i = i / binary;
+    index++;
   }
-  if (type === 'Ellipse') {
-    const a = (distX >= distY ? distX : distY) / 2;
-    const b = (distX >= distY ? distY : distX) / 2;
-    pt = 4 * (a - b) + 2 * Math.PI * b;
+  if (!units[index]) {
+    index = units.length - 1;
   }
-  /* if (type === 'polygon') {
-
-  }*/
-  return pt;
+  return (number / Math.pow(binary, index)).toFixed(2) / 1 + units[index];
 }
 
-const getRandomId = () => {
-  return (((1 + Math.random()) * 0x100000000) | 0).toString(16).substring(1);
-};
 
 export {
   getRectPoint,
@@ -525,8 +490,6 @@ export {
   isPointInLine,
   isNegNumber,
   baseNumber,
-  acreage,
-  perimeter,
   getPoint,
   getAngle,
   getDistance,
@@ -534,4 +497,5 @@ export {
   getRandomId,
   getRectPoints,
   getRectPointV2,
+  getUnitNumber,
 };

package/src/util/index.js

@@ -64,26 +64,9 @@ function delayedTrigger(callback, time = 1000) {
   };
 }
 
-function getUnitNumber(number, units, binary, index = 0) {
-  if (index) {
-    return (number / Math.pow(binary, index)).toFixed(2) / 1 + units[index];
-  }
-  let i = number;
-  while (i >= binary) {
-    i = i / binary;
-    index++;
-  }
-  if (!units[index]) {
-    index = units.length - 1;
-  }
-  return (number / Math.pow(binary, index)).toFixed(2) / 1 + units[index];
-}
-
-
 export {
   $,
   dataType,
   deepClone,
   delayedTrigger,
-  getUnitNumber,
 };