kfb-view 2.2.5 → 2.2.8

package/package.json

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

package/src/components/board/index.js

@@ -11,6 +11,7 @@ import {
   EVENT_IN_PAINTING,
 } from '../../const/event';
 import {
+  getAngle,
   getDistance,
   pointInOtherPoint,
   pointsToRegion,
@@ -344,7 +345,18 @@ export class Board extends ViewerCommon {
       if (index === 0) return true;
       if (index === this.points.length - 1) return true;
       if (pointInOtherPoint(firstPoint, _p, 30)) {
-        return false;
+        const nextPoint = points[index + 1];
+        if (nextPoint) {
+          const deg = Math.abs(getAngle(_p, firstPoint, nextPoint));
+          const angle = deg * 180 / Math.PI;
+          if (angle < 90) {
+            firstPoint = _p;
+            return true;
+          }
+          return false;
+        } else {
+          return false;
+        }
       } else {
         firstPoint = _p;
         return true;

package/src/plugin/openseadragon/openseadragon.js

@@ -17344,6 +17344,7 @@ function OpenSeadragon(options) {
         sourceHeight: sourceHeight,
         position: position,
         size: size,
+        pixelDensityRatio: $.pixelDensityRatio,
       });
       /* context.drawImage(
          rendered.canvas,

package/src/tool/Brush.js

@@ -74,7 +74,7 @@ class Brush {
     ctx.beginPath();
     ctx.translate(left, top);
     ctx.rotate(angle);
-    ctx.scale(scale, scale);
+    // ctx.scale(scale, scale);
     const widthList = [];
     ctx.font = `${this.options.measure.fontSize}px Arial`;
     texts.forEach((info) => {

package/src/tool/Image.js

@@ -1,5 +1,8 @@
 import {Brush} from './Brush';
 import {pointsToRegion} from '../util/calculate';
+import {EventEmitter} from '../util/event-emitter';
+
+const et = new EventEmitter();
 
 /**
  * 线段类
@@ -22,18 +25,20 @@ class Image extends Brush {
    */
   draw(points, scale = 1) {
     const region = pointsToRegion(points);
-    const ctx = this.canvas.getContext('2d');
-    const drawImage = () => {
-      ctx.drawImage(this.options.img, region.x, region.y, region.width,
-        region.height);
-      this.options.img.removeEventListener('load', drawImage);
-    };
     if (this.options.imgLoadSuccess) {
-      drawImage();
+      this.drawImage(this.options.img, region);
     } else if (this.options.img) {
-      this.options.img.addEventListener('load', drawImage);
+      const img = this.options.img;
+      et.$once('load', () => {
+        this.drawImage(img, region);
+      }, true, img);
     }
   }
+
+  drawImage(img, region) {
+    const ctx = this.canvas.getContext('2d');
+    ctx.drawImage(img, region.x, region.y, region.width, region.height);
+  }
 }
 
 export {