@inweb/client 25.2.2 → 25.2.5

package/src/Viewer/Markup/Api/Impl/Konva/KonvaImage.ts

@@ -1,121 +1,123 @@
-import Konva from "konva";
-import { IMarkupImage } from "../../IMarkupImage";
-
-export class KonvaImage implements IMarkupImage {
-  private _ref: Konva.Image;
-  private _canvasImage: HTMLImageElement;
-  private _ratio = 1;
-
-  constructor(params: { position: { x: number; y: number }; src: string; width: number; height: number }, ref = null) {
-    if (ref) {
-      if (ref.height() === 0 || ref.width() === 0) return;
-
-      this._ref = ref;
-      this._canvasImage = ref.image();
-      this._ref.id(this._ref._id.toString());
-      this._ratio = this._ref.height() / this._ref.width();
-      return;
-    }
-
-    if (!params.position || !params.src) return;
-    this._canvasImage = new Image();
-
-    this._ref = new Konva.Image({
-      x: params.position.x,
-      y: params.position.y,
-      image: this._canvasImage,
-      width: params.width,
-      height: params.height,
-      draggable: true,
-    });
-
-    this._canvasImage.onload = () => {
-      this._ref.image(this._canvasImage);
-      this._ratio = this._ref.height() === 0 || this._ref.width() === 0 ? 1 : this._ref.height() / this._ref.width();
-    };
-
-    this._canvasImage.src = params.src;
-
-    this._ref.id(this._ref._id.toString());
-  }
-
-  getSrc(): string {
-    return this._canvasImage.src;
-  }
-
-  setSrc(src: any) {
-    this._canvasImage.src = src;
-  }
-
-  getWidth(): number {
-    return this._ref.width();
-  }
-
-  setWidth(w: number) {
-    this._ref.width(w);
-    this._ref.height(w * this._ratio);
-  }
-
-  getHeight(): number {
-    return this._ref.height();
-  }
-
-  setHeight(h: number) {
-    this._ref.height(h);
-    this._ref.width(h / this._ratio);
-  }
-
-  ref() {
-    return this._ref;
-  }
-
-  id(): string {
-    return this._ref.id();
-  }
-
-  enableMouseEditing(value: boolean) {
-    this._ref.draggable(value);
-  }
-
-  type(): string {
-    return "image";
-  }
-
-  // we can break Liskov Substitution Principle, need to use separate IColorable
-  // getColor(): string {
-  //   return this._ref.fill();
-  // }
-
-  // setColor(hex: string) {
-  //   this._ref.fill(hex);
-  // }
-
-  getRotation(): number {
-    return this._ref.rotation();
-  }
-
-  setRotation(degrees: number): void {
-    this._ref.rotation(degrees);
-  }
-
-  getZIndex(): number {
-    return this._ref.zIndex();
-  }
-
-  setZIndex(zIndex: number): void {
-    this._ref.zIndex(zIndex);
-  }
-
-  delete() {
-    this._ref.destroy();
-    this._ref = null;
-  }
-
-  getPosition(): { x: number; y: number } {
-    return this._ref.getPosition();
-  }
-
-  setPosition(x: number, y: number) {
-    this._ref.setPosition({ x, y });
-  }
-}
+import Konva from "konva";
+import { IMarkupImage } from "../../IMarkupImage";
+
+export class KonvaImage implements IMarkupImage {
+  private _ref: Konva.Image;
+  private _canvasImage: HTMLImageElement;
+  private _ratio = 1;
+
+  constructor(
+    params: { position: { x: number; y: number }; src: string; width: number; height: number; id?: string },
+    ref = null
+  ) {
+    if (ref) {
+      if (ref.height() === 0 || ref.width() === 0) return;
+
+      this._ref = ref;
+      this._canvasImage = ref.image();
+      this._ratio = this._ref.height() / this._ref.width();
+      return;
+    }
+
+    if (!params.position || !params.src) return;
+    this._canvasImage = new Image();
+
+    this._ref = new Konva.Image({
+      x: params.position.x,
+      y: params.position.y,
+      image: this._canvasImage,
+      width: params.width,
+      height: params.height,
+      draggable: true,
+    });
+
+    this._canvasImage.onload = () => {
+      this._ref.image(this._canvasImage);
+      this._ratio = this._ref.height() === 0 || this._ref.width() === 0 ? 1 : this._ref.height() / this._ref.width();
+    };
+
+    this._canvasImage.src = params.src;
+
+    this._ref.id(this._ref._id.toString());
+  }
+
+  getSrc(): string {
+    return this._canvasImage.src;
+  }
+
+  setSrc(src: any) {
+    this._canvasImage.src = src;
+  }
+
+  getWidth(): number {
+    return this._ref.width();
+  }
+
+  setWidth(w: number) {
+    this._ref.width(w);
+    this._ref.height(w * this._ratio);
+  }
+
+  getHeight(): number {
+    return this._ref.height();
+  }
+
+  setHeight(h: number) {
+    this._ref.height(h);
+    this._ref.width(h / this._ratio);
+  }
+
+  ref() {
+    return this._ref;
+  }
+
+  id(): string {
+    return this._ref.id();
+  }
+
+  enableMouseEditing(value: boolean) {
+    this._ref.draggable(value);
+  }
+
+  type(): string {
+    return "image";
+  }
+
+  // we can break Liskov Substitution Principle, need to use separate IColorable
+  // getColor(): string {
+  //   return this._ref.fill();
+  // }
+
+  // setColor(hex: string) {
+  //   this._ref.fill(hex);
+  // }
+
+  getRotation(): number {
+    return this._ref.rotation();
+  }
+
+  setRotation(degrees: number): void {
+    this._ref.rotation(degrees);
+  }
+
+  getZIndex(): number {
+    return this._ref.zIndex();
+  }
+
+  setZIndex(zIndex: number): void {
+    this._ref.zIndex(zIndex);
+  }
+
+  delete() {
+    this._ref.destroy();
+    this._ref = null;
+  }
+
+  getPosition(): { x: number; y: number } {
+    return this._ref.getPosition();
+  }
+
+  setPosition(x: number, y: number) {
+    this._ref.setPosition({ x, y });
+  }
+}

package/src/Viewer/Markup/Api/Impl/Konva/KonvaLine.ts

@@ -1,99 +1,130 @@
-import Konva from "konva";
-import { IMarkupLine } from "../../IMarkupLine";
-import { IMarkupColorable } from "../../IMarkupColorable";
-
-export class KonvaLine implements IMarkupLine, IMarkupColorable {
-  private _ref: Konva.Line;
-
-  constructor(params: { points: { x: number; y: number }[]; color: string; width: number }, ref = null) {
-    if (ref) {
-      this._ref = ref;
-      this._ref.id(this._ref._id.toString());
-      return;
-    }
-
-    if (!params.points) return;
-
-    const konvaPoints = [];
-    params.points.forEach((point) => konvaPoints.push(point.x, point.y));
-
-    this._ref = new Konva.Line({
-      stroke: params.color ?? "#ff0000",
-      strokeWidth: params.width ?? 4,
-      globalCompositeOperation: "source-over",
-      lineCap: "round",
-      lineJoin: "round",
-      points: konvaPoints,
-      draggable: true,
-      strokeScaleEnabled: false,
-    });
-
-    this._ref.id(this._ref._id.toString());
-  }
-
-  ref() {
-    return this._ref;
-  }
-
-  id(): string {
-    return this._ref.id();
-  }
-
-  enableMouseEditing(value: boolean) {
-    this._ref.draggable(value);
-  }
-
-  type(): string {
-    return "line";
-  }
-
-  getColor(): string {
-    return this._ref.stroke();
-  }
-
-  setColor(hex: string) {
-    this._ref.stroke(hex);
-  }
-
-  getRotation(): number {
-    return this._ref.rotation();
-  }
-
-  setRotation(degrees: number): void {
-    this._ref.rotation(degrees);
-  }
-
-  getZIndex(): number {
-    return this._ref.zIndex();
-  }
-
-  setZIndex(zIndex: number): void {
-    this._ref.zIndex(zIndex);
-  }
-
-  delete() {
-    this._ref.destroy();
-    this._ref = null;
-  }
-
-  getPoints(): [] {
-    return this._ref.attrs.points;
-  }
-
-  setLineWidth(size: number) {
-    this._ref.strokeWidth(size);
-  }
-
-  getLineWidth(): number {
-    return this._ref.strokeWidth();
-  }
-
-  addPoints(points: [{ x: number; y: number }]) {
-    let newPoints = this._ref.points();
-    points.forEach((point) => {
-      newPoints = newPoints.concat([point.x, point.y]);
-    });
-
-    this._ref.points(newPoints);
-  }
-}
+import Konva from "konva";
+import { IMarkupLine, LineType } from "../../IMarkupLine";
+import { IMarkupColorable } from "../../IMarkupColorable";
+
+const LineTypeSpecs = new Map<LineType, number[]>([
+  [LineType.Solid, []],
+  [LineType.Dot, [30, 30, 0.001, 30]],
+  [LineType.Dash, [30, 30]],
+]);
+
+export class KonvaLine implements IMarkupLine, IMarkupColorable {
+  private _ref: Konva.Line;
+
+  constructor(
+    params: { points: { x: number; y: number }[]; color: string; type: LineType; width: number; id?: string },
+    ref = null
+  ) {
+    if (ref) {
+      this._ref = ref;
+      return;
+    }
+
+    if (!params.points) return;
+
+    const konvaPoints = [];
+    params.points.forEach((point) => konvaPoints.push(point.x, point.y));
+
+    this._ref = new Konva.Line({
+      stroke: params.color ?? "#ff0000",
+      strokeWidth: params.width ?? 4,
+      globalCompositeOperation: "source-over",
+      lineCap: "round",
+      lineJoin: "round",
+      points: konvaPoints,
+      draggable: true,
+      strokeScaleEnabled: false,
+      dash: LineTypeSpecs.get(params.type) || [],
+    });
+
+    this._ref.id(this._ref._id.toString());
+  }
+
+  ref() {
+    return this._ref;
+  }
+
+  id(): string {
+    return this._ref.id();
+  }
+
+  enableMouseEditing(value: boolean) {
+    this._ref.draggable(value);
+  }
+
+  type(): string {
+    return "line";
+  }
+
+  getColor(): string {
+    return this._ref.stroke();
+  }
+
+  setColor(hex: string) {
+    this._ref.stroke(hex);
+  }
+
+  getRotation(): number {
+    return this._ref.rotation();
+  }
+
+  setRotation(degrees: number): void {
+    this._ref.rotation(degrees);
+  }
+
+  getZIndex(): number {
+    return this._ref.zIndex();
+  }
+
+  setZIndex(zIndex: number): void {
+    this._ref.zIndex(zIndex);
+  }
+
+  delete() {
+    this._ref.destroy();
+    this._ref = null;
+  }
+
+  getPoints(): number[] {
+    return this._ref.points();
+  }
+
+  setLineWidth(size: number) {
+    this._ref.strokeWidth(size);
+  }
+
+  getLineWidth(): number {
+    return this._ref.strokeWidth();
+  }
+
+  getLineType(): string {
+    const typeSpecs = this._ref.dash() || [];
+    let type = "solid";
+    switch (typeSpecs) {
+      case LineTypeSpecs.get(LineType.Dot):
+        type = "dot";
+        break;
+      case LineTypeSpecs.get(LineType.Dash):
+        type = "dash";
+        break;
+    }
+    return type;
+  }
+
+  setLineType(type: string) {
+    const lineType = LineType[type];
+    if (lineType) {
+      const specs = LineTypeSpecs.get(lineType);
+      if (specs) this._ref.dash(specs);
+    }
+  }
+
+  addPoints(points: [{ x: number; y: number }]) {
+    let newPoints = this._ref.points();
+    points.forEach((point) => {
+      newPoints = newPoints.concat([point.x, point.y]);
+    });
+
+    this._ref.points(newPoints);
+  }
+}