kfb-view 3.2.8 → 3.3.0

package/package.json

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

package/src/components/shape/index.js

@@ -60,6 +60,7 @@ export class Shape extends ViewerCommon {
     // 区域标注列表
     const labelList = this.labelList.filter((item) => {
       if (item.show === false) return false;
+      if (item.custom) return false;
       if (!this[item.tool]) return false;
       if (!this.isInCanvas(item.region, bounds)) return false;
       if ((REGION_TYPES.includes(item.tool) || item.isClose && item.tool ===
@@ -105,12 +106,14 @@ export class Shape extends ViewerCommon {
       clearTimeout(this.delaytimer);
       this.delaytimer = undefined;
     }
-    this.deepDrawLabel(sameFixWidthLabel, sameNormalLabel, regionLabelList,
-      imageLabel, 1, bounds);
+    // 优先绘制图片标注
+    imageLabel.forEach((item) => {
+      this.drawLabel(item);
+    });
+    this.deepDrawLabel(sameFixWidthLabel, sameNormalLabel, regionLabelList, 1, bounds);
   }
 
-  deepDrawLabel(sameFixWidthLabel, sameNormalLabel, regionLabelList,
-                imageLabel, count, bounds) {
+  deepDrawLabel(sameFixWidthLabel, sameNormalLabel, regionLabelList, count, bounds) {
     let currentDrawCount = 0; // 当前已绘制数量
     const ctx = this.canvas.getContext('2d');
     const remainFixLabel = {};
@@ -118,7 +121,7 @@ export class Shape extends ViewerCommon {
       const labels = sameFixWidthLabel[key];
       ctx.beginPath();
       labels.forEach((item) => {
-        if (currentDrawCount >= 2000) { // 一次最多绘制2000个标注，多余标注延迟绘制
+        if (currentDrawCount >= 4000) { // 一次最多绘制4000个点，多余标注延迟绘制
           if (remainFixLabel[key]) {
             remainFixLabel[key].push(item);
           } else {
@@ -127,7 +130,7 @@ export class Shape extends ViewerCommon {
         } else {
           this.drawLabel(item);
         }
-        currentDrawCount++;
+        currentDrawCount = currentDrawCount + item.points.length;
       });
       const firstLabel = labels?.[0];
       if (firstLabel?.fillStyle) {
@@ -142,7 +145,7 @@ export class Shape extends ViewerCommon {
       const labels = sameNormalLabel[key];
       ctx.beginPath();
       labels.forEach((item) => {
-        if (currentDrawCount >= 2000) { // 一次最多绘制2000个标注，多余标注延迟绘制
+        if (currentDrawCount >= 4000) { // 一次最多绘制4000个点，多余标注延迟绘制
           if (remainNormalLabel[key]) {
             remainNormalLabel[key].push(item);
           } else {
@@ -151,7 +154,7 @@ export class Shape extends ViewerCommon {
         } else {
           this.drawLabel(item);
         }
-        currentDrawCount++;
+        currentDrawCount = currentDrawCount + item.points.length;
       });
       const firstLabel = labels?.[0];
       ctx.lineWidth = firstLabel.lineWidth;
@@ -162,9 +165,6 @@ export class Shape extends ViewerCommon {
       Object.keys(remainNormalLabel).length === 0) {
       console.log(`end deep draw label, draw count: ${count}`);
       this.delaytimer = undefined;
-      imageLabel.forEach((item) => {
-        this.drawLabel(item);
-      });
       regionLabelList.forEach((item) => {
         this.combination.setContent(this.canvas, item);
         this.combination.draw({
@@ -177,8 +177,7 @@ export class Shape extends ViewerCommon {
       });
     } else {
       this.delaytimer = setTimeout(() => {
-        this.deepDrawLabel(remainFixLabel, remainNormalLabel, regionLabelList,
-          imageLabel, count + 1,
+        this.deepDrawLabel(remainFixLabel, remainNormalLabel, regionLabelList, count + 1,
           bounds);
       }, 100);
     }

package/src/model/label.model.js

@@ -25,6 +25,7 @@ export class LabelModel {
     this.resize = data.resize; // 是否可拖动大小
     this.isROI = data.isROI ?? false; // 是否是ROI
     this.isClose = data.isClose ?? true; // 是否是闭合标注
+    this.custom = data.custom ?? false; // 是否是自定义的标注
     this.select = data.select ?? false; // 是否是选中状态
     this.show = data.show ?? true; // 是否显示
     this.__other__ = data.__other__ || {}; // 其他信息

package/src/tool/Image.js

@@ -1,5 +1,5 @@
 import {Brush} from './Brush';
-import {pointsToRegion} from '../util/calculate';
+import {getDistance, getRectPoints} from '../util/calculate';
 import {EventEmitter} from '../util/event-emitter';
 
 const et = new EventEmitter();
@@ -22,22 +22,41 @@ class Image extends Brush {
    * @param {number} points[].x - 绘制的点x坐标
    * @param {number} points[].y - 绘制的点y坐标
    * @param {number=} scale
+   * @param {number=} angle
    */
-  draw(points, scale = 1) {
-    const region = pointsToRegion(points);
+  draw(points, scale = 1, angle = 0) {
+    if (points.length === 2) {
+      points = getRectPoints(points);
+    }
+    const width = getDistance(points[1], points[0]);
+    const height = getDistance(points[2], points[0]);
+    const region = {
+      ...points[0],
+      width,
+      height,
+    };
     if (this.options.imgLoadSuccess) {
-      this.drawImage(this.options.img, region);
+      this.drawImage(this.options.img, region, angle);
     } else if (this.options.img) {
       const img = this.options.img;
       et.$once('load', () => {
-        this.drawImage(img, region);
+        this.drawImage(img, region, angle);
       }, true, img);
     }
   }
 
-  drawImage(img, region) {
+  drawImage(img, region, angle = 0) {
     const ctx = this.canvas.getContext('2d');
-    ctx.drawImage(img, region.x, region.y, region.width, region.height);
+    ctx.beginPath();
+    ctx.save();
+    ctx.translate(region.x, region.y);
+    if (angle < 0) {
+      angle += 360;
+    }
+    const _rotation = angle % 360;
+    ctx.rotate(_rotation * Math.PI / 180);
+    ctx.drawImage(img, 0, 0, region.width, region.height);
+    ctx.restore();
   }
 }
 

package/src/view.js

@@ -2,7 +2,7 @@ import openSeadragon from './plugin/openseadragon/openseadragon';
 import './util/canvas';
 import {EventEmitter} from './util/event-emitter';
 import {$, dataType, deepClone} from './util';
-import {pointsToRegion} from './util/calculate';
+import {pointsToRegion, regionToPoint} from './util/calculate';
 import * as COMPONENTS from './const/component';
 import * as EVENTS from './const/event';
 import * as Components from './components';
@@ -133,11 +133,17 @@ export default class KfbView extends EventEmitter {
    * @param {Array} list
    */
   initLabelList(list) {
-    this.labelList = list.map((item) => new LabelModel({
-      ...item,
-      region: item.region || pointsToRegion(item.points),
-      __data__: deepClone(item),
-    }));
+    this.labelList = list.map((item) => {
+      if (!item.points?.length) {
+        const {startPoint, endPoint} = regionToPoint(item.region);
+        item.points = [startPoint, endPoint];
+      }
+      return new LabelModel({
+        ...item,
+        region: item.region || pointsToRegion(item.points),
+        __data__: deepClone(item),
+      });
+    });
     this.board?.setLabelList?.(this.labelList);
     this.shape?.setLabelList?.(this.labelList);
     this.area?.setLabelList?.(this.labelList);
@@ -145,11 +151,17 @@ export default class KfbView extends EventEmitter {
 
   appendLabelList(list) {
     this.labelList = [
-      ...this.labelList, ...list.map((item) => new LabelModel({
-        ...item,
-        region: item.region || pointsToRegion(item.points),
-        __data__: deepClone(item),
-      }))];
+      ...this.labelList, ...list.map((item) => {
+        if (!item.points?.length) {
+          const {startPoint, endPoint} = regionToPoint(item.region);
+          item.points = [startPoint, endPoint];
+        }
+        return new LabelModel({
+          ...item,
+          region: item.region || pointsToRegion(item.points),
+          __data__: deepClone(item),
+        });
+      })];
     this.board?.setLabelList?.(this.labelList);
     this.shape?.setLabelList?.(this.labelList);
     this.area?.setLabelList?.(this.labelList);