kfb-view 2.2.2 → 2.2.3

package/package.json

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

package/src/components/area/index.js

@@ -563,7 +563,7 @@ export class Area extends ViewerCommon {
     }
     this[label.tool].setContent(this.canvas, {...label});
     if (label.measure && label.select) {
-      this[label.tool].drawMeasureInfo(label,
+      this[label.tool].drawMeasureInfo.call(this, label,
         this.getMeasureContent(label), scale);
     }
   }

package/src/components/board/index.js

@@ -370,7 +370,7 @@ export class Board extends ViewerCommon {
       tool: this.tool,
     });
     if (form.measure) {
-      this[this.tool].drawMeasureInfo(form,
+      this[this.tool].drawMeasureInfo.call(this, form,
         this.getMeasureContent(form));
     }
     return form;

package/src/components/common/common.js

@@ -185,7 +185,7 @@ export class ViewerCommon extends EventEmitter {
       left: 0,
       top: 0,
       angle: 0,
-      content: [],
+      texts: [],
     };
     if (label.points.length <= 1) return content;
     const scale = this.getImageZoom(true) / label.scale;
@@ -230,7 +230,7 @@ export class ViewerCommon extends EventEmitter {
           left: p.x + distX * scale,
           top: p.y + distY * scale,
           angle: deg,
-          content: [
+          texts: [
             `长：${(Math.sqrt(w * w + h * h) * this.options.imageCapRes).toFixed(
               2)}${this.options.unit}`],
         };
@@ -250,7 +250,7 @@ export class ViewerCommon extends EventEmitter {
           left: p.x + 10 * scale,
           top: p.y,
           angle: 0,
-          content: [
+          texts: [
             `长轴：${(w * this.options.imageCapRes).toFixed(
               2)}${this.options.unit}`,
             `短轴：${(h * this.options.imageCapRes).toFixed(
@@ -274,7 +274,7 @@ export class ViewerCommon extends EventEmitter {
           left: p.x + 10 * scale,
           top: p.y,
           angle: 0,
-          content: [
+          texts: [
             `长：${(w * this.options.imageCapRes).toFixed(
               2)}${this.options.unit}`,
             `宽：${(h * this.options.imageCapRes).toFixed(
@@ -298,7 +298,7 @@ export class ViewerCommon extends EventEmitter {
           left: p.x,
           top: p.y,
           angle: 0,
-          content: [
+          texts: [
             `周长：${(pt * this.options.imageCapRes).toFixed(
               2)}${this.options.unit}`],
         };
@@ -309,12 +309,17 @@ export class ViewerCommon extends EventEmitter {
           left: 0,
           right: 0,
           angle: 0,
-          content: [],
+          texts: [],
         };
       }
         break;
     }
-    return content;
+    return {
+      ...content,
+      texts: this.options.measure.handler ?
+        this.options.measure.handler(content.texts, label) :
+        content.texts,
+    };
   }
 
   /**
@@ -417,6 +422,18 @@ export class ViewerCommon extends EventEmitter {
 
   }
 
+  /**
+   * updated
+   * @param {Object=} options
+   */
+  updated(options = {}) {
+    this.options = {
+      ...this.options,
+      ...options,
+    };
+    this.change();
+  }
+
   /**
    * 清除canvas
    */

package/src/components/graduation/index.js

@@ -15,28 +15,15 @@ export class Graduation extends ViewerCommon {
   constructor({viewer, canvas, cache, options}) {
     super(viewer, canvas, cache, options);
     this.scales = options.scales ||
-      [0.1, 0.4, 0.6, 1, 2, 4, 8, 10, 20, 40, 80, 100];
+      [0.1, 0.4, 0.6, 1, 2, 4, 8, 10, 20, 40, 60, 100, 140, 200];
     this.microns = options.microns ||
-      [5000, 2000, 1250, 1000, 500, 250, 200, 100, 50, 25, 10, 5];
-    this.init();
-  }
-
-  /**
-   * 初始化函数
-   */
-  init() {
-    this.viewer.addHandler('animation', (res) => {
-      this.changeZoom();
-    });
-    setTimeout(() => {
-      this.changeZoom();
-    }, 100);
+      [5000, 2000, 1250, 1000, 500, 250, 200, 100, 50, 25, 20, 10, 5, 2];
   }
 
   /**
    * 倍率大小改变
    */
-  changeZoom() {
+  change() {
     const scales = [...this.scales];
     const zoom = this.viewport.viewportToImageZoom(
       this.viewport.getZoom(true)) * 40;
@@ -72,6 +59,9 @@ export class Graduation extends ViewerCommon {
     const height = this.canvas.height;
     ctx.beginPath();
     ctx.clearRect(0, 0, width, height);
+    if (!this.options.show) {
+      return;
+    }
     const {left, top, right, bottom} = this.options;
     let x = 10;
     let y = height - 10;
@@ -88,16 +78,16 @@ export class Graduation extends ViewerCommon {
     ctx.beginPath();
     ctx.strokeStyle = '#000000';
     ctx.lineWidth = 3;
-    ctx.moveTo(x, y - 5);
+    ctx.moveTo(x, y - 8);
     ctx.lineTo(x, y);
     ctx.lineTo(x + lineWidth, y);
-    ctx.lineTo(x + lineWidth, y - 5);
+    ctx.lineTo(x + lineWidth, y - 8);
     ctx.stroke();
     ctx.beginPath();
     ctx.fillStyle = '#000000';
     ctx.font = 'bold 16px Arial';
     const t = txt.toFixed(0) + this.options.unit;
     const fontWidth = ctx.measureText(t).width;
-    ctx.fillText(t, x + lineWidth / 2 - fontWidth / 2, top ? y + 10 : y - 10);
+    ctx.fillText(t, x + lineWidth / 2 - fontWidth / 2, top ? y + 12 : y - 12);
   }
 }

package/src/components/grid/index.js

@@ -0,0 +1,117 @@
+import {ViewerCommon} from '../common/common';
+
+/**
+ * 网格
+ * @class
+ */
+export class Grid extends ViewerCommon {
+  /**
+   * 初始化视图测量工具
+   * @param {Object} viewer
+   * @param {Object} canvas
+   * @param {Object} cache
+   * @param {Object} options
+   */
+  constructor({viewer, canvas, cache, options}) {
+    super(viewer, canvas, cache, options);
+    if (!this.options.scale) {
+      this.options.scale = 20;
+    }
+  }
+
+  change() {
+    const imageViewStartPoint = this.viewerElementToImageCoordinates(0, 0);
+    const imageViewXEndPoint = this.viewerElementToImageCoordinates(
+      this.canvas.width, 0);
+    const imageViewYEndPoint = this.viewerElementToImageCoordinates(0,
+      this.canvas.height);
+    let currentZoom = this.getImageZoom(true) * this.options.scale;
+    let baseScale = this.options.scale === 40 ? 3200 : 1600;
+    let twoCount = 0;
+    if (currentZoom >= 1) {
+      while (currentZoom / 2 >= 1) {
+        twoCount++;
+        currentZoom = currentZoom / 2;
+      }
+      if (twoCount) {
+        baseScale /= Math.pow(2, twoCount);
+      }
+    } else if (currentZoom < 1) {
+      while (currentZoom * 2 <= 1) {
+        twoCount++;
+        currentZoom = currentZoom * 2;
+      }
+      if (twoCount) {
+        baseScale *= Math.pow(2, twoCount);
+      }
+    }
+    const distX = imageViewXEndPoint.distanceTo(imageViewStartPoint);
+    const distY = imageViewYEndPoint.distanceTo(imageViewStartPoint);
+    const minX = Math.floor(imageViewStartPoint.x / baseScale);
+    const maxX = Math.floor((imageViewXEndPoint.x + distX) / baseScale);
+    const minY = Math.floor(imageViewStartPoint.y / baseScale);
+    const maxY = Math.floor((imageViewYEndPoint.y + distY) / baseScale);
+    const ctx = this.canvas.getContext('2d');
+    ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+    if (this.options.show) {
+      ctx.beginPath();
+      ctx.lineWidth = 1;
+      for (let i = minX; i <= maxX + 1; i++) {
+        const point = this.imageToViewerElementCoordinates(i * baseScale, 0);
+        ctx.moveTo(point.x, 0);
+        ctx.lineTo(point.x, this.canvas.height);
+      }
+      for (let i = minY; i <= maxY + 1; i++) {
+        const point = this.imageToViewerElementCoordinates(0, i * baseScale);
+        ctx.moveTo(0, point.y);
+        ctx.lineTo(this.canvas.width, point.y);
+      }
+      ctx.stroke();
+    }
+    if (this.options.ruler) {
+      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.moveTo(20, 20);
+      ctx.lineTo(20, this.canvas.height);
+      ctx.moveTo(20, 20);
+      ctx.lineTo(this.canvas.width, 20);
+      for (let i = minX; i <= maxX + 1; i++) {
+        const point = this.imageToViewerElementCoordinates(i * baseScale, 0);
+        ctx.moveTo(point.x, 0);
+        ctx.lineTo(point.x, 20);
+        for (let j = 1; j < 5; j++) {
+          ctx.moveTo(point.x + (basePx / 5) * j, 16);
+          ctx.lineTo(point.x + (basePx / 5) * j, 20);
+          if (i !== minX) {
+            ctx.fillText(i * baseScale, point.x + 5, 13);
+          }
+        }
+      }
+      for (let i = minY; i <= maxY + 1; i++) {
+        const point = this.imageToViewerElementCoordinates(0, i * baseScale);
+        ctx.moveTo(0, point.y);
+        ctx.lineTo(20, point.y);
+        for (let j = 1; j < 5; j++) {
+          ctx.moveTo(16, point.y + (basePx / 5) * j);
+          ctx.lineTo(20, point.y + (basePx / 5) * j);
+          if (i !== minY) {
+            ctx.save();
+            ctx.translate(3, point.y + 5);
+            ctx.rotate(Math.PI / 2);
+            ctx.fillText(i * baseScale, 0, 0);
+            ctx.restore();
+          }
+        }
+      }
+      ctx.stroke();
+      ctx.beginPath();
+      ctx.clearRect(0, 0, 20, 20);
+    }
+  }
+}

package/src/components/index.js

@@ -6,3 +6,4 @@ export {Shape} from './shape';
 export {Area} from './area';
 export {Board} from './board';
 export {Graduation} from './graduation';
+export {Grid} from './grid';

package/src/components/navigator/index.js

@@ -81,6 +81,7 @@ export class Navigator extends EventEmitter {
         top: top,
         width: rect.clientWidth,
         height: rect.clientHeight,
+        scale: [...this.vestige.zooms].reverse()[index],
         color: [...this.vestige.colors].reverse()[index],
       };
       this.pointList.push(rectObj);
@@ -104,9 +105,10 @@ export class Navigator extends EventEmitter {
     const colorCanvas = this.element.getElementsByClassName(
       'navigator-color-rect')[0];
     const ctx = colorCanvas.getContext('2d');
-    this.pointList.forEach((item) => {
-      this.drawRect(ctx, item);
-    });
+    this.pointList.sort((a, b) => a.scale > b.scale ? 1 : -1).
+      forEach((item) => {
+        this.drawRect(ctx, item);
+      });
   }
 
   /**
@@ -301,7 +303,7 @@ export class Navigator extends EventEmitter {
       if (this.clearTimeId) window.clearTimeout(this.clearTimeId);
       const currentImageZoom = this.viewport.viewportToImageZoom(currentZoom);
       const index = [...this.vestige.zooms].reverse().findIndex(
-        (z) => currentImageZoom > (z / (this.options.scale || 40)));
+        (z) => currentImageZoom >= (z / (this.options.scale || 40)));
       if (index !== -1) {
         this.clearTimeId = window.setTimeout(() => {
           this.$emit('rect-draw', index);
@@ -379,4 +381,14 @@ 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/const/component.js

@@ -6,3 +6,4 @@ export const COMPONENT_ROTATION = 'rotation';
 export const COMPONENT_TAILORING = 'tailoring';
 export const COMPONENT_NAVIGATOR = 'navigator';
 export const COMPONENT_CACHE = 'cache';
+export const COMPONENT_FRID = 'grid';

package/src/tool/Brush.js

@@ -62,27 +62,26 @@ class Brush {
    * @param {number} [scale=1]
    */
   drawMeasureInfo(label, info, scale = 1) {
-    const {left, top, content, angle} = info;
+    const {left, top, texts, angle} = info;
     const ctx = this.canvas.getContext('2d');
     ctx.save();
     ctx.beginPath();
     ctx.translate(left, top);
     ctx.rotate(angle);
     ctx.scale(scale, scale);
-    ctx.font = `14px Arial`;
     const widthList = [];
-    content.forEach((info) => {
+    ctx.font = `${this.options.measure.fontSize}px Arial`;
+    texts.forEach((info) => {
       widthList.push(ctx.measureText(info).width);
     });
     const width = Math.max(...widthList);
-    ctx.fillStyle = 'rgba(0,0,0,.5)';
-    const height = content.length * 20 + 16 + (content.length - 1) * 4;
+    ctx.fillStyle = this.options.measure.backgroundColor;
+    const height = texts.length * 20 + 16 + (texts.length - 1) * 4;
     ctx.rect(0, 0, width + 22, height);
     ctx.fill();
     ctx.beginPath();
-    ctx.font = `14px Arial`;
-    ctx.fillStyle = '#FDFDFD';
-    content.forEach((info, index) => {
+    ctx.fillStyle = this.options.measure.color;
+    texts.forEach((info, index) => {
       ctx.fillText(info, 11, 8 + 14 + index * 24);
     });
     ctx.fill();

package/src/view.js

@@ -19,6 +19,7 @@ export default class KfbView extends EventEmitter {
    * @constructs
    * @param {Object} config 配置参数
    * @param {HTMLElement|string} config.el 图像容器
+   * @param {number=} config.scale 图像的最大倍率
    * @param {Object} config.openSeadragonOptions openSeadragon参数
    * @param {function=} config.tileDrawing openSeadragon绘制tile-drawing事件回调
    * @param {Object} [config.navigator = {}] navigator参数
@@ -57,9 +58,17 @@ export default class KfbView extends EventEmitter {
    * @param {boolean=} config.board.ROI 是否开启ROI，开启后只能在标注类型是ROI的区域内绘制图形
    * @param {Object} config.graduation 刻度参数
    * @param {boolean=} config.graduation.disabled 是否禁用刻度
+   * @param {boolean=} config.graduation.show 是否显刻度
    * @param {boolean=} config.graduation.custom 是否自定义刻度,抛出graduation-change事件
    * @param {array=} config.graduation.scales 倍率数组
    * @param {array=} config.graduation.microns 刻度长度数组，在对应倍率范围内显示的刻度长度
+   * @param {boolean=} config.grid.disabled 是否禁用网格线
+   * @param {boolean=} config.grid.show 是否显示网格线
+   * @param {boolean=} config.grid.ruler 是否启用标尺
+   * @param {function=} config.measure.handler 标注信息的回调处理
+   * @param {boolean=} config.measure.color 标注注释颜色
+   * @param {boolean=} config.measure.backgroundColor 标注注释背景色
+   * @param {boolean=} config.measure.fontSize 标注注释文字大小
    * @param {array} config.labelList 标注列表
    */
   constructor(config) {
@@ -261,7 +270,16 @@ function initComponentsOptions(kv, type) {
     cache: kv.cache,
     canvas: createCanvas(kv),
     options: {
-      ...config[type], ...pxConversion, thumb: config.thumb ? {
+      scale: config.scale,
+      measure: {
+        backgroundColor: 'rgba(0,0,0,.5)',
+        color: '#FFF',
+        fontSize: 14,
+        ...(config.measure || {}),
+      },
+      ...config[type],
+      ...pxConversion,
+      thumb: config.thumb ? {
         radius: 5,
         activeRadius: 7,
         activeBgColor: '#01d0b0',