kfb-view 3.3.1 → 3.3.3

package/package.json

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

package/src/components/common/common.js

@@ -271,7 +271,7 @@ export class ViewerCommon {
             `${this.translate('long_axis')}：${this.getUnitNumber(a)}`,
             `${this.translate('short_axis')}：${this.getUnitNumber(b)}`,
             `${this.translate('perimeter')}：${this.getUnitNumber(4 * (a - b) + 2 * Math.PI * b)}`,
-            `${this.translate('area')}：${this.getUnitNumber(Math.PI * a * b / this.options.binary)}²`],
+            `${this.translate('area')}：${this.getUnitNumber(Math.PI * a * b, 2)}²`],
         };
       }
         break;
@@ -279,7 +279,7 @@ export class ViewerCommon {
         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 ac = w * h;
         const rightTop = getRectPoint(startPoint, endPoint)[2];
         const p = this.imageToViewerElementCoordinates(rightTop.x,
           rightTop.y);
@@ -291,7 +291,7 @@ export class ViewerCommon {
             `${this.translate('length')}：${this.getUnitNumber(w)}`,
             `${this.translate('width')}：${this.getUnitNumber(h)}`,
             `${this.translate('perimeter')}：${this.getUnitNumber(pt)}`,
-            `${this.translate('area')}：${this.getUnitNumber(ac)}²`],
+            `${this.translate('area')}：${this.getUnitNumber(ac, 2)}²`],
         };
       }
         break;
@@ -312,7 +312,7 @@ export class ViewerCommon {
           texts: [
             `${this.translate('perimeter')}：${this.getUnitNumber((pt * this.options.imageCapRes).toFixed(2))}`,
             `${this.translate('area')}：${this.getUnitNumber(
-              calculatePolygonArea(points, this.options.imageCapRes) / this.options.binary)}²`],
+              calculatePolygonArea(points, this.options.imageCapRes), 2)}²`],
         };
       }
         break;
@@ -335,8 +335,9 @@ export class ViewerCommon {
     };
   }
 
-  getUnitNumber(number, index) {
-    return getUnitNumber(number, this.options.units, this.options.binary, index);
+  getUnitNumber(number, index = 1) {
+    const binary = Math.pow(this.options.binary, index);
+    return getUnitNumber(number, this.options.units, binary);
   }
 
   /**

package/src/components/tailoring/index.js

@@ -383,8 +383,8 @@ export class Tailoring extends ViewerCommon {
       copyCtx.putImageData(imageData, 0, 0, 0, 0, disWidth, disHeight);
       const shapeCanvas = this.kv.shape?.canvas;
       if (shapeCanvas && this.options.shape) {
-        copyCtx.drawImage(shapeCanvas, startPoint.x * radioX,
-          startPoint.y * radioY, disWidth, disHeight, 0, 0, disWidth,
+        copyCtx.drawImage(shapeCanvas, startPoint.x,
+          startPoint.y, disWidth, disHeight, 0, 0, disWidth,
           disHeight);
       }
       if (copyCanvas.width > this.options.resolution) {