kfb-view 2.1.19 → 2.2.1

package/package.json

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

package/src/components/area/index.js

@@ -12,9 +12,10 @@ import {
   baseNumber, getAngle, getDistance, getPoint,
   getRectPoint,
   isPointInMatrix,
-  pointInOtherPoint, isPointInPolygon, pointsToRegion,
+  pointInOtherPoint, isPointInPolygon, pointsToRegion, isPointInLine,
 } from '../../util/calculate';
 import {
+  EVENT_ADD_POLYGON_POINT,
   EVENT_AREA_MOVE_END,
   EVENT_AREA_MOVE_START, EVENT_AREA_MOVING, EVENT_CANCEL_SELECT_LABEL,
   EVENT_DB_CLICK_LABEL,
@@ -48,12 +49,19 @@ export class Area extends ViewerCommon {
   /**
    * 画点
    * @param {Object} point
-   * @param {Object=} config 参数，参见thumb
+   * @param {Boolean=} active 是否是激活状态
    */
-  drawPoint(point, config) {
+  drawPoint(point, active) {
     this.thumb.draw(point, {
-      ...config,
-      strokeStyle: this.options.thumbColor,
+      radius: !active ?
+        this.options.thumb.radius :
+        this.options.thumb.activeRadius,
+      strokeStyle: !active ?
+        this.options.thumb.color :
+        this.options.thumb.activeColor,
+      fillStyle: !active ?
+        this.options.thumb.bgColor :
+        this.options.thumb.activeBgColor,
     });
   }
 
@@ -78,7 +86,11 @@ export class Area extends ViewerCommon {
     this.draging = false;
     let selectList = [];
     let selectLabel;
+    let prevSelectLabel = undefined;
     this.labelList.forEach((item) => {
+      if (item.select) {
+        prevSelectLabel = item;
+      }
       item.select = false;
       // 如果有可移动的点了，不做操作
       if (this.movePoint) {
@@ -202,13 +214,39 @@ export class Area extends ViewerCommon {
     }
     selectLabel ?
       this.$emit(EVENT_SELECT_LABEL, selectLabel) :
-      !this.movePoint ? this.$emit(EVENT_CANCEL_SELECT_LABEL) : '';
+      !this.movePoint && prevSelectLabel ?
+        this.$emit(EVENT_CANCEL_SELECT_LABEL, prevSelectLabel) : '';
     this.change();
   }
 
   onCanvasDblClick({x, y}) {
     setTimeout(() => {
-      this.$emit(EVENT_DB_CLICK_LABEL);
+      const label = this.labelList.find((item) => item.select);
+      if (label?.tool === POLYGON) {
+        const points = this.imageToViewerElementPoints(label.points);
+        let index = -1;
+        for (let i = 0, l = points.length, j = l - 1; i < l; j = i, i++) {
+          const s = points[i];
+          const t = points[j];
+          if (isPointInLine({x, y}, [s, t])) {
+            index = i;
+            break;
+          }
+        }
+        if (index > -1) {
+          const p = this.viewerElementToImageCoordinates(x, y);
+          label.points.splice(index, 0, {
+            ...p,
+            canMove: true,
+          });
+          this.$emit(EVENT_ADD_POLYGON_POINT, label);
+          this.change();
+        } else {
+          this.$emit(EVENT_DB_CLICK_LABEL, label);
+        }
+      } else {
+        this.$emit(EVENT_DB_CLICK_LABEL, label);
+      }
     });
   }
 
@@ -231,11 +269,12 @@ export class Area extends ViewerCommon {
 
   /**
    * 监听鼠标拖动事件
+   * @param {Object} position
+   * @param {number} position.x
+   * @param {number} position.y
    * @param {Object} e
-   * @param {number} e.x
-   * @param {number} e.y
    */
-  onCanvasDrag({x, y}) {
+  onCanvasDrag({x, y}, e) {
     if (this.options.drag === false) return;
     if (!this.lastPoint) this.lastPoint = {x, y};
     const label = this.movePoint.label;
@@ -245,6 +284,7 @@ export class Area extends ViewerCommon {
     if (!isMove && !isResize) return;
     if (position === 4 && !isMove) return;
     if (position !== 4 && !isResize) return;
+    e.preventDefaultAction = true;
     const scale = this.getImageZoom(true) / label.scale;
     const tool = label.tool;
     const region = label.region;
@@ -422,53 +462,42 @@ export class Area extends ViewerCommon {
     this.lastPoint = {x, y};
   }
 
-  /**
-   * 监听鼠标按钮事件
-   * @param {Object} e
-   */
-  onCanvasKey(e) {
-    const {originalEvent} = e;
-    if (originalEvent.code === 'Escape') {
-      this.$emit(EVENT_CANCEL_SELECT_LABEL);
-      this.change();
-    }
-  }
-
   /**
    * 绘制点
    * @param {Object} points
    * @param {string}  type
    */
-  drawThumbPoint(points, type) {
-    if (this.options.thumb === false) {
+  drawThumbPoints(points, type) {
+    if (this.options.thumb.show === false) {
       return;
     }
-    const thumbRadius = this.options.thumbRadius ?? 5;
+    const position = this.movePoint?.position;
     if (LINE_TYPES.includes(type)) {
-      this.drawPoint(points[0], {thumbRadius});
+      this.drawPoint(points[0], position === 1);
       this.drawPoint({
         x: (points[0].x + points[1].x) / 2,
         y: (points[0].y + points[1].y) / 2,
-      }, {thumbRadius: thumbRadius + 2});
-      this.drawPoint(points[1], {thumbRadius});
+      }, position === 4);
+      this.drawPoint(points[1], position === 7);
     } else if (REGION_TYPES.includes(type)) {
-      getRectPoint(points[0], points[1]).forEach((point) => {
-        this.drawPoint(point, {thumbRadius});
+      getRectPoint(points[0], points[1]).forEach((point, i) => {
+        this.drawPoint(point, position === i);
       });
     } else if (type === POLYGON) {
-      points.forEach((point) => {
+      points.forEach((point, i) => {
         if (point.canMove) {
-          this.drawPoint(point, {thumbRadius});
+          this.drawPoint(point, position === i);
         }
       });
     } else if (type === FONT || type === DOT) {
-      this.drawPoint(points[0], {thumbRadius});
+      this.drawPoint(points[0], position === 4);
     } else if (type === STAR || type === FLAG) {
       getRectPoint(points[0], points[1]).
-        filter((item, index) => index === 0 || index === 2 || index === 4 ||
-          index === 6 || index === 8).
-        forEach((point) => {
-          this.drawPoint(point, {thumbRadius});
+        forEach((point, index) => {
+          if (index === 0 || index === 2 || index === 4 ||
+            index === 6 || index === 8) {
+            this.drawPoint(point, position === index);
+          }
         });
     }
   }
@@ -489,17 +518,17 @@ export class Area extends ViewerCommon {
         region.x + region.width, region.y + region.height);
     const scale = this.getImageZoom(true) / label.scale;
     if (!NO_NORMAL_REGION_TYPES.includes(label.tool)) {
-      this.drawThumbPoint([startPoint, endPoint], label.tool);
+      this.drawThumbPoints([startPoint, endPoint], label.tool);
     } else if (label.tool === FONT) {
       const fontWidth = this.getFontWidth(label.text, label.fontSize);
       const pt = getPoint(startPoint, {
         x: startPoint.x + fontWidth / 2 * scale,
         y: startPoint.y - label.fontSize / 2 * scale + 4,
       }, label.angle);
-      this.drawThumbPoint([pt], label.tool);
+      this.drawThumbPoints([pt], label.tool);
     } else if (label.tool === STAR) {
       const dist = label.lineWidth * scale;
-      this.drawThumbPoint([
+      this.drawThumbPoints([
         {
           x: startPoint.x - dist,
           y: startPoint.y - dist,
@@ -508,14 +537,14 @@ export class Area extends ViewerCommon {
           y: startPoint.y + dist,
         }], label.tool);
     } else if (label.tool === DOT) {
-      this.drawThumbPoint([
+      this.drawThumbPoints([
         {
           x: startPoint.x,
           y: startPoint.y,
         }], label.tool);
     } else if (label.tool === FLAG) {
       const dist = label.lineWidth * scale;
-      this.drawThumbPoint([
+      this.drawThumbPoints([
         {
           x: startPoint.x,
           y: startPoint.y - dist,
@@ -526,10 +555,10 @@ export class Area extends ViewerCommon {
     } else if (label.tool === POLYGON) {
       if (this.draging) {
         const points = this.imageToViewerElementPoints(label.points);
-        this.drawThumbPoint(points, label.tool);
+        this.drawThumbPoints(points, label.tool);
       } else {
         const points = this.setPointsMove(label);
-        this.drawThumbPoint(points, label.tool);
+        this.drawThumbPoints(points, label.tool);
       }
     }
     this[label.tool].setContent(this.canvas, {...label});
@@ -552,7 +581,7 @@ export class Area extends ViewerCommon {
       label.points[index].canMove = false;
       if (index === 0 || (!pointInOtherPoint(lastPoint, point, 30) &&
           !pointInOtherPoint(movePoints[0], point, 30)) ||
-        (!label.isClose && index === movePoints.length - 1)) {
+        (index === movePoints.length - 1)) {
         lastPoint = point;
         point.canMove = true;
         label.points[index].canMove = true;

package/src/components/board/index.js

@@ -48,6 +48,7 @@ export class Board extends ViewerCommon {
    * @param {boolean} [options.measure=true] 绘画时显示信息
    * @param {boolean} [options.clear=true] 是否结束绘画时清空画布
    * @param {boolean} [options.isClose=true] 是否自动闭合曲线
+   * @param {boolean} [options.enableDbClickClose=true] 是否双击结束曲线绘制
    * @param {boolean} [options.once=false] 是否绘画一次后自动结束
    * @param {boolean} [options.isROI=false] 是否是感性区域
    * @param {boolean} [options.move=true] 是否可移动
@@ -74,7 +75,7 @@ export class Board extends ViewerCommon {
       measure: true,
       clear: true,
       isClose: true,
-      showStartPoint: true,
+      enableDbClickClose: true,
       ...options,
       lineWidth: !options.lineWidth ?
         (this.tool === STAR ? 15 :
@@ -104,7 +105,8 @@ export class Board extends ViewerCommon {
       text: '',
       measure: true,
       clear: true,
-      showStartPoint: true,
+      isClose: true,
+      enableDbClickClose: true,
       ...options,
       lineWidth: !options.lineWidth ?
         (this.tool === STAR ? 15 :
@@ -143,12 +145,15 @@ export class Board extends ViewerCommon {
     }
     this.clearCanvas();
     this[tool].startDraw();
-    this[tool].draw(this.imageToViewerElementPoints(this.points));
+    const points = this.imageToViewerElementPoints(this.points);
+    this[tool].draw(points);
     this[tool].endDraw();
     if (tool === POLYGON) {
-      const point = this.imageToViewerElementCoordinates(this.points[0].x,
-        this.points[0].y);
-      this[tool].drawPoint(point);
+      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());
   }
@@ -171,17 +176,21 @@ export class Board extends ViewerCommon {
       this.points = [this.points[0] || point, point];
     } else if (tool === POLYGON) {
       this.points.push(point);
+      this.setEnablePoints(false);
     } else if (POINT_TYPES.includes(tool)) {
       this.points = [point, point];
     }
     this.clearCanvas();
     this[tool].startDraw();
-    this[tool].draw(this.imageToViewerElementPoints(this.points));
+    const points = this.imageToViewerElementPoints(this.points);
+    this[tool].draw(points);
     this[tool].endDraw();
     if (tool === POLYGON) {
-      const point = this.imageToViewerElementCoordinates(this.points[0].x,
-        this.points[0].y);
-      this[tool].drawPoint(point);
+      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());
   }
@@ -207,30 +216,60 @@ export class Board extends ViewerCommon {
     } else if (POINT_TYPES.includes(tool)) {
       this.points = [point, point];
     } else if (tool === POLYGON) {
-      const points = this.imageToViewerElementPoints(this.points);
-      let firstPoint = points[0];
-      // 是否是闭合曲线
-      const isClose = this[this.tool].options.isClose;
-      if (isClose) {
-        // 绘制曲线时，点小于5个，或者曲线不是闭合的
-        if (points.length < 5 || !pointInOtherPoint(firstPoint, {x, y})) {
+      const firstPoint = this.imageToViewerElementCoordinates(this.points[0].x,
+        this.points[0].y);
+      const enableDbClickClose = this[this.tool].options.enableDbClickClose; // 是否启用双击结束绘制
+      const isClose = this[this.tool].options.isClose; // 是否自动关闭
+      if (enableDbClickClose) {
+        if (isClose && pointInOtherPoint(firstPoint, {x, y})) {
+          this.setEnablePoints();
+          if (this.points.length < 5) {
+            return;
+          }
+        } else {
           return;
         }
-      } else if (points.length < 5) {
+      } else {
+        this.setEnablePoints();
+        // 如果点小于5个，任务标注不符合规范
+        if (this.points.length < 5) {
+          this.points = [];
+          this.clearCanvas();
+          return;
+        }
+      }
+    }
+    this.$emit(EVENT_END_PAINTING, this.getPaintOptions());
+    // 是否只绘制一次
+    if (this[this.tool].options.once) {
+      this.endDraw();
+    } else if (this[this.tool].options.clear) { // 是否结束绘画时清空画布
+      this.points = [];
+      this.clearCanvas();
+    }
+  }
+
+  /**
+   * 监听鼠标双击事件
+   * @param {Object} e
+   * @param {number} e.x
+   * @param {number} e.y
+   */
+  onCanvasDblClick({x, y}) {
+    const point = this.viewerElementToImageCoordinates(x, y);
+    if (!this.isInROI(point) || this.points.length === 0) {
+      this.points = [];
+      this.clearCanvas();
+      return;
+    }
+    if (this.tool === POLYGON) {
+      this.setEnablePoints();
+      // 如果点小于5个，任务标注不符合规范
+      if (this.points.length < 5) {
+        this.points = [];
+        this.clearCanvas();
         return;
       }
-      // 过滤曲线的点，点之间的距离小于10默认为一个点，取第一个
-      this.points = this.points.filter((p, index) => {
-        const _p = this.imageToViewerElementCoordinates(p.x, p.y);
-        if (index === 0) return true;
-        if (!isClose && index === this.points.length - 1) return true;
-        if (pointInOtherPoint(firstPoint, _p)) {
-          return false;
-        } else {
-          firstPoint = _p;
-          return true;
-        }
-      });
     }
     this.$emit(EVENT_END_PAINTING, this.getPaintOptions());
     // 是否只绘制一次
@@ -257,14 +296,22 @@ export class Board extends ViewerCommon {
     }
     const tool = this.tool;
     if (tool === POLYGON && this.points.length > 0) {
-      this.points.pop();
+      if (this.points.length > 1) {
+        this.points.pop();
+      }
       this.points.push(point);
       this.clearCanvas();
       this[tool].startDraw();
       const points = this.imageToViewerElementPoints(this.points);
       this[tool].draw(points);
       this[tool].endDraw();
-      this[tool].drawPoint(points[0]);
+      if (tool === POLYGON) {
+        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());
     }
   }
@@ -275,10 +322,43 @@ export class Board extends ViewerCommon {
    */
   onCanvasKey(e) {
     const {originalEvent} = e;
-    e.preventDefaultAction = true;
-    if (originalEvent.code === 'Escape') {
+    if (originalEvent.key === 'Escape') {
       this.endDraw();
     }
+    if (originalEvent.key === 'Delete' || originalEvent.key ===
+      'Backspace') {
+      // 曲线绘制中，按删除键，删除上一个标注点
+      if (this.tool === POLYGON && this.points.length > 1) {
+        this.points.splice(this.points.length - 2, 1);
+        this.change();
+      }
+    }
+  }
+
+  setEnablePoints(end = true) {
+    const points = this.imageToViewerElementPoints(this.points);
+    let firstPoint = points[0];
+    // 过滤曲线的点，点之间的距离小于10默认为一个点，取第一个
+    this.points = this.points.filter((p, index) => {
+      const _p = points[index];
+      if (index === 0) return true;
+      if (index === this.points.length - 1) return true;
+      if (pointInOtherPoint(firstPoint, _p, 30)) {
+        return false;
+      } else {
+        firstPoint = _p;
+        return true;
+      }
+    });
+    if (end && this.points.length > 1) {
+      const lastPoint = this.points[this.points.length - 1];
+      const lastTwoPoint = this.points[this.points.length - 2];
+      if (pointInOtherPoint(
+        this.imageToViewerElementCoordinates(lastPoint.x, lastPoint.y),
+        this.imageToViewerElementCoordinates(lastTwoPoint.x, lastTwoPoint.y))) {
+        this.points.splice(this.points.length - 2, 1);
+      }
+    }
   }
 
   getPaintOptions() {
@@ -342,6 +422,13 @@ 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.$emit(EVENT_IN_PAINTING, this.getPaintOptions());
   }
 }

package/src/components/common/common.js

@@ -387,30 +387,20 @@ export class ViewerCommon extends EventEmitter {
   /**
    * 判断region是否在canvas中
    * @param {Object} region
-   * @param {boolean} status
+   * @param {Object} bounds
    * @return {boolean}
    */
-  isInCanvas(region, status = false) {
-    const startPoint = status ?
-      {x: region.x, y: region.y} :
-      this.imageToViewerElementCoordinates(region.x, region.y);
-    const endPoint = status ?
-      {x: region.x + region.width, y: region.y + region.height} :
-      this.imageToViewerElementCoordinates(
-        region.x + region.width, region.y + region.height);
-    if (endPoint.x < startPoint.x) {
-      const x = startPoint.x;
-      startPoint.x = endPoint.x;
-      endPoint.x = x;
-    }
-    if (endPoint.y < startPoint.y) {
-      const y = startPoint.y;
-      startPoint.y = endPoint.y;
-      endPoint.y = y;
-    }
-    return !(startPoint.x > this.canvas.width ||
-      startPoint.y > this.canvas.height ||
-      endPoint.x < 0 || endPoint.y < 0);
+  isInCanvas(region, bounds) {
+    const viewReact = this.viewport.imageToViewportRectangle(region.x, region.y,
+      region.width, region.height);
+    const startPoint = {x: viewReact.x, y: viewReact.y};
+    const endPoint = {
+      x: viewReact.x + viewReact.width,
+      y: viewReact.y + viewReact.height,
+    };
+    return !(startPoint.x > (bounds.x + bounds.width) || startPoint.y >
+      (bounds.y + bounds.height) || endPoint.x < bounds.x || endPoint.y <
+      bounds.y);
   }
 
   getFontWidth(text, size) {

package/src/components/rotation/index.js

@@ -91,7 +91,7 @@ class Rotation extends ViewerCommon {
       this.drawPoint({
         x: point.x,
         y: point.y,
-      }, {thumbRadius: 5});
+      }, {radius: 5});
     });
   }
 
@@ -152,8 +152,7 @@ class Rotation extends ViewerCommon {
    */
   onCanvasKey(e) {
     const {originalEvent} = e;
-    e.preventDefaultAction = true;
-    if (originalEvent.code === 'Escape') {
+    if (originalEvent.key === 'Escape') {
       this.viewport.setRotation(0);
       this.stopRotation();
     }