kfb-view 2.2.3 → 2.2.6

package/package.json

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

package/src/components/area/index.js

@@ -6,7 +6,7 @@ import {
   LINE_TYPES, MARKS,
   NO_NORMAL_REGION_TYPES,
   REGION_TYPES,
-  STAR,
+  STAR, IMAGE,
 } from '../../const/mark';
 import {
   baseNumber, getAngle, getDistance, getPoint,
@@ -39,6 +39,7 @@ export class Area extends ViewerCommon {
     super(viewer, canvas, cache, options);
     this.labelList = [];
     this.movePoint = undefined;
+    this.currentPressPoint = undefined;
     this.lastPoint = undefined;
     this.draging = false;
     MARKS.forEach((mark) => {
@@ -82,12 +83,16 @@ export class Area extends ViewerCommon {
    */
   onCanvasPress({x, y}) {
     this.movePoint = undefined;
+    this.currentPressPoint = undefined;
     this.lastPoint = undefined;
     this.draging = false;
     let selectList = [];
     let selectLabel;
     let prevSelectLabel = undefined;
     this.labelList.forEach((item) => {
+      if (item.tool === IMAGE) {
+        return;
+      }
       if (item.select) {
         prevSelectLabel = item;
       }
@@ -181,6 +186,7 @@ export class Area extends ViewerCommon {
       // moveIndex>-1,表示选中的是图形中可移动的点
       if (~moveIndex) {
         this.movePoint = {position: moveIndex, label: item};
+        this.currentPressPoint = {x, y};
       } else if ((item.tool !== POLYGON &&
           isPointInMatrix(pointList[0], pointList[2], pointList[6], pointList[8],
             {x, y})) ||
@@ -258,10 +264,14 @@ export class Area extends ViewerCommon {
    */
   onCanvasRelease({x, y}) {
     if (this.movePoint && this.options.drag !== false) {
-      const label = this.movePoint.label;
-      this.$emit(EVENT_AREA_MOVE_END, label);
+      const dist = getDistance(this.currentPressPoint, {x, y});
+      if (Math.abs(dist) > 1) {
+        const label = this.movePoint.label;
+        this.$emit(EVENT_AREA_MOVE_END, label);
+      }
     }
     this.movePoint = undefined;
+    this.currentPressPoint = undefined;
     this.lastPoint = undefined;
     this.draging = false;
     this.change();

package/src/components/board/index.js

@@ -11,6 +11,7 @@ import {
   EVENT_IN_PAINTING,
 } from '../../const/event';
 import {
+  getDistance,
   pointInOtherPoint,
   pointsToRegion,
 } from '../../util/calculate';
@@ -148,13 +149,11 @@ export class Board extends ViewerCommon {
     const points = this.imageToViewerElementPoints(this.points);
     this[tool].draw(points);
     this[tool].endDraw();
-    if (tool === POLYGON) {
-      this[tool].drawPoints(points, {
-        radius: this.options.thumb.radius,
-        strokeStyle: this.options.thumb.color,
-        fillStyle: this.options.thumb.bgColor,
-      });
-    }
+    this[tool].drawPoints(points, {
+      radius: this.options.thumb.radius,
+      strokeStyle: this.options.thumb.color,
+      fillStyle: this.options.thumb.bgColor,
+    });
     this.$emit(EVENT_START_PAINTING, this.getPaintOptions());
   }
 
@@ -185,13 +184,11 @@ export class Board extends ViewerCommon {
     const points = this.imageToViewerElementPoints(this.points);
     this[tool].draw(points);
     this[tool].endDraw();
-    if (tool === POLYGON) {
-      this[tool].drawPoints(points, {
-        radius: this.options.thumb.radius,
-        strokeStyle: this.options.thumb.color,
-        fillStyle: this.options.thumb.bgColor,
-      });
-    }
+    this[tool].drawPoints(points, {
+      radius: this.options.thumb.radius,
+      strokeStyle: this.options.thumb.color,
+      fillStyle: this.options.thumb.bgColor,
+    });
     this.$emit(EVENT_IN_PAINTING, this.getPaintOptions());
   }
 
@@ -209,10 +206,15 @@ export class Board extends ViewerCommon {
       return;
     }
     const tool = this.tool;
-    if (point.x === this.points[0].x && point.y === this.points[0].y &&
-      !NO_NORMAL_REGION_TYPES.includes(tool)) {
-      this.points = [];
-      return;
+    if (!NO_NORMAL_REGION_TYPES.includes(tool)) {
+      const firstPoint = this.imageToViewerElementCoordinates(this.points[0].x,
+        this.points[0].y);
+      const dist = getDistance(firstPoint, {x, y});
+      if (Math.abs(dist) < 10) {
+        this.points = [];
+        this.clearCanvas();
+        return;
+      }
     } else if (POINT_TYPES.includes(tool)) {
       this.points = [point, point];
     } else if (tool === POLYGON) {
@@ -305,13 +307,11 @@ export class Board extends ViewerCommon {
       const points = this.imageToViewerElementPoints(this.points);
       this[tool].draw(points);
       this[tool].endDraw();
-      if (tool === POLYGON) {
-        this[tool].drawPoints(points, {
-          radius: this.options.thumb.radius,
-          strokeStyle: this.options.thumb.color,
-          fillStyle: this.options.thumb.bgColor,
-        });
-      }
+      this[tool].drawPoints(points, {
+        radius: this.options.thumb.radius,
+        strokeStyle: this.options.thumb.color,
+        fillStyle: this.options.thumb.bgColor,
+      });
       this.$emit(EVENT_IN_PAINTING, this.getPaintOptions());
     }
   }
@@ -422,13 +422,11 @@ export class Board extends ViewerCommon {
     this[this.tool].startDraw();
     this[this.tool].draw(points);
     this[this.tool].endDraw();
-    if (this.tool === POLYGON) {
-      this[this.tool].drawPoints(points, {
-        radius: this.options.thumb.radius,
-        strokeStyle: this.options.thumb.color,
-        fillStyle: this.options.thumb.bgColor,
-      });
-    }
+    this[this.tool].drawPoints(points, {
+      radius: this.options.thumb.radius,
+      strokeStyle: this.options.thumb.color,
+      fillStyle: this.options.thumb.bgColor,
+    });
     this.$emit(EVENT_IN_PAINTING, this.getPaintOptions());
   }
 }

package/src/components/grid/index.js

@@ -72,11 +72,13 @@ export class Grid extends ViewerCommon {
       const basePx = this.imageToViewerElementCoordinates(baseScale, 0).
         minus(this.imageToViewerElementCoordinates(0, 0)).x;
       ctx.beginPath();
-      ctx.strokeStyle = 'rgba(0, 0, 0, .8)';
-      ctx.fillStyle = 'rgba(0, 0, 0, .3)';
       ctx.font = '14px Arial';
-      ctx.clearRect(0, 0, 20, this.canvas.height);
-      ctx.clearRect(0, 0, this.canvas.width, 20);
+      ctx.fillStyle = '#fff';
+      ctx.fillRect(0, 0, 20, this.canvas.height);
+      ctx.fillRect(0, 0, this.canvas.width, 20);
+      ctx.beginPath();
+      ctx.fillStyle = 'rgba(0, 0, 0, .3)';
+      ctx.strokeStyle = 'rgba(0, 0, 0, .8)';
       ctx.moveTo(20, 20);
       ctx.lineTo(20, this.canvas.height);
       ctx.moveTo(20, 20);
@@ -111,7 +113,8 @@ export class Grid extends ViewerCommon {
       }
       ctx.stroke();
       ctx.beginPath();
-      ctx.clearRect(0, 0, 20, 20);
+      ctx.fillStyle = '#fff';
+      ctx.fillRect(0, 0, 20, 20);
     }
   }
 }

package/src/components/navigator/index.js

@@ -381,14 +381,4 @@ export class Navigator extends EventEmitter {
     };
     img.src = this.options.thumbnail; // 设置图片源地
   }
-
-  toggleNavigator() {
-    const navigatorMain = this.element.getElementsByClassName(
-      'navigator-main')[0];
-    if (navigatorMain.style.display === 'none') {
-      navigatorMain.style.display = 'block';
-    } else {
-      navigatorMain.style.display = 'none';
-    }
-  }
 }

package/src/components/shape/index.js

@@ -1,12 +1,10 @@
 import {
-  HAS_REGION_TYPES,
+  HAS_REGION_TYPES, IMAGE,
   MARKS, NO_NORMAL_REGION_TYPES, POINT_TYPES, POLYGON, REGION_TYPES,
 } from '../../const/mark';
 import {ViewerCommon} from '../common/common';
 import * as Tools from '../../tool';
 import {Combination} from '../../tool/Combination';
-import {EVENT_CANCEL_SELECT_LABEL} from '../../const/event';
-import * as EVENTS from '../../const/event';
 
 /**
  * 用来显示标注线的canvas
@@ -70,7 +68,12 @@ export class Shape extends ViewerCommon {
     // strokeStyle, lineWidth, fillStyle 相同认为是一个路径下的图形，一起绘制，优化性能
     const sameFixWidthLabel = {}; // star, flag, star, font lineWidth固定为2
     const sameNormalLabel = {};
+    const imageLabel = [];
     labelList.forEach((item) => {
+      if (item.tool === IMAGE) {
+        imageLabel.push(item);
+        return;
+      }
       const key = `${item.strokeStyle ?? ''}_${item.lineWidth ??
       ''}_${item.fillStyle ?? ''}`;
       const regionKey = `${item.strokeStyle ?? ''}_${item.lineWidth ?? ''}`;
@@ -111,6 +114,9 @@ export class Shape extends ViewerCommon {
         tool,
       })), this.viewport.getRotation());
     });
+    imageLabel.forEach((item) => {
+      this.drawLabel(item);
+    });
   }
 
   deepDrawLabel(sameFixWidthLabel, sameNormalLabel, count, bounds) {

package/src/const/mark.js

@@ -8,6 +8,7 @@ export const FONT = 'Font';
 export const STAR = 'Star';
 export const FLAG = 'Flag';
 export const DOT = 'Dot';
+export const IMAGE = 'Image';
 
 export const POINT_TYPES = [FONT, STAR, FLAG, DOT];
 export const REGION_TYPES = [RECTANGLE, ELLIPSE];
@@ -24,4 +25,5 @@ export const MARKS = [
   FONT,
   STAR,
   FLAG,
-  DOT];
+  DOT,
+  IMAGE];

package/src/model/label.model.js

@@ -17,6 +17,7 @@ export class LabelModel {
     this.measure = data.measure; // 是否显示测量信息
     this.points = data.points; // 绘制点
     this.tool = data.tool; // 绘制工具
+    this.src = data.src; // 图片地址
     this.scale = data.scale; // 绘制倍率
     this.region = data.region; // 绘制区域
     this.move = data.move; // 是否可移动
@@ -27,5 +28,13 @@ export class LabelModel {
     this.show = data.show ?? true; // 是否显示
     this.__other__ = data.__other__ || {}; // 其他信息
     this.__data__ = data.__data__ ?? data; // 记录原始数据
+    if (this.src) {
+      this.img = new Image();
+      this.img.src = this.src;
+      this.imgLoadSuccess = false;
+      this.img.onload = () => {
+        this.imgLoadSuccess = true;
+      };
+    }
   }
 }

package/src/tool/Brush.js

@@ -46,6 +46,12 @@ class Brush {
     this.thumb.draw(point, config);
   }
 
+  drawPoints(points, config) {
+    points.forEach((point) => {
+      this.drawThumb(point, config);
+    });
+  }
+
   /**
    * 画笔具体操作
    * @param {Object[]} points - 绘制的点

package/src/tool/Image.js

@@ -0,0 +1,45 @@
+import {Brush} from './Brush';
+import {pointsToRegion} from '../util/calculate';
+import {EventEmitter} from '../util/event-emitter';
+
+const et = new EventEmitter();
+
+/**
+ * 线段类
+ * @class
+ */
+class Image extends Brush {
+  /**
+   * 初始化数据
+   */
+  constructor() {
+    super();
+  }
+
+  /**
+   * 画线
+   * @param {Object[]} points - 绘制的点
+   * @param {number} points[].x - 绘制的点x坐标
+   * @param {number} points[].y - 绘制的点y坐标
+   * @param {number=} scale
+   */
+  draw(points, scale = 1) {
+    const region = pointsToRegion(points);
+    if (this.options.imgLoadSuccess) {
+      this.drawImage(this.options.img, region);
+    } else if (this.options.img) {
+      et.$once('load', () => {
+        this.drawImage(this.options.img, region);
+      }, true, this.options.img);
+    }
+  }
+
+  drawImage(img, region) {
+    const ctx = this.canvas.getContext('2d');
+    ctx.drawImage(img, region.x, region.y, region.width, region.height);
+  }
+}
+
+export {
+  Image,
+};

package/src/tool/Polygon.js

@@ -27,12 +27,6 @@ class Polygon extends Brush {
       }
     }
   }
-
-  drawPoints(points, config) {
-    points.forEach((point) => {
-      this.drawThumb(point, config);
-    });
-  }
 }
 
 export {

package/src/tool/index.js

@@ -9,3 +9,4 @@ export {Font} from './Font';
 export {Star} from './Star';
 export {Flag} from './Flag';
 export {Dot} from './Dot';
+export {Image} from './Image';

package/src/view.js

@@ -245,6 +245,7 @@ function initNavigator(kv) {
       containerHeight: config.height,
       containerWidth: config.width,
       element: navigator,
+      scale: config.scale,
       ...config.navigator,
     });
   }