@inweb/client 25.2.2 → 25.2.5

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

@@ -1,113 +1,119 @@
-import Konva from "konva";
-import { IMarkupRectangle } from "../../IMarkupRectangle";
-import { IMarkupColorable } from "../../IMarkupColorable";
-
-export class KonvaRectangle implements IMarkupRectangle, IMarkupColorable {
-  private _ref: Konva.Rect;
-
-  constructor(
-    params: { pos: { x: number; y: number }; color: string; lineWidth: number; width: number; height: number },
-    ref = null
-  ) {
-    if (ref) {
-      this._ref = ref;
-      this._ref.id(this._ref._id.toString());
-      return;
-    }
-
-    if (!params.pos) return;
-
-    this._ref = new Konva.Rect({
-      stroke: params.color ?? "#ff0000",
-      strokeWidth: params.lineWidth ?? 4,
-      globalCompositeOperation: "source-over",
-      lineCap: "round",
-      lineJoin: "round",
-      x: params.pos.x,
-      y: params.pos.y,
-      width: params.width,
-      height: params.height,
-      draggable: true,
-      strokeScaleEnabled: false,
-    });
-
-    this._ref.id(this._ref._id.toString());
-  }
-
-  getPosition(): { x: number; y: number } {
-    return this._ref.position();
-  }
-
-  getWidth(): number {
-    return this._ref.width();
-  }
-
-  getHeigth(): number {
-    return this._ref.height();
-  }
-
-  setWidth(w: number) {
-    this._ref.width(w);
-  }
-
-  setHeight(h: number) {
-    this._ref.height(h);
-  }
-
-  setPosition(x: number, y: number) {
-    this._ref.setPosition({ x, y });
-  }
-
-  ref() {
-    return this._ref;
-  }
-
-  id(): string {
-    return this._ref.id();
-  }
-
-  enableMouseEditing(value: boolean): void {
-    this._ref.draggable(value);
-  }
-
-  type(): string {
-    return "rectangle";
-  }
-
-  getColor(): string {
-    return this._ref.stroke();
-  }
-
-  setColor(hex: string): void {
-    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(): void {
-    this._ref.destroy();
-    this._ref = null;
-  }
-
-  setLineWidth(size: number): void {
-    this._ref.strokeWidth(size);
-  }
-
-  getLineWidth(): number {
-    return this._ref.strokeWidth();
-  }
-}
+import Konva from "konva";
+import { IMarkupRectangle } from "../../IMarkupRectangle";
+import { IMarkupColorable } from "../../IMarkupColorable";
+
+export class KonvaRectangle implements IMarkupRectangle, IMarkupColorable {
+  private _ref: Konva.Rect;
+
+  constructor(
+    params: {
+      position: { x: number; y: number };
+      color: string;
+      lineWidth: number;
+      width: number;
+      height: number;
+      id?: string;
+    },
+    ref = null
+  ) {
+    if (ref) {
+      this._ref = ref;
+      return;
+    }
+
+    if (!params.position) return;
+
+    this._ref = new Konva.Rect({
+      stroke: params.color ?? "#ff0000",
+      strokeWidth: params.lineWidth ?? 4,
+      globalCompositeOperation: "source-over",
+      lineCap: "round",
+      lineJoin: "round",
+      x: params.position.x,
+      y: params.position.y,
+      width: params.width,
+      height: params.height,
+      draggable: true,
+      strokeScaleEnabled: false,
+    });
+
+    this._ref.id(this._ref._id.toString());
+  }
+
+  getPosition(): { x: number; y: number } {
+    return this._ref.position();
+  }
+
+  getWidth(): number {
+    return this._ref.width();
+  }
+
+  getHeigth(): number {
+    return this._ref.height();
+  }
+
+  setWidth(w: number) {
+    this._ref.width(w);
+  }
+
+  setHeight(h: number) {
+    this._ref.height(h);
+  }
+
+  setPosition(x: number, y: number) {
+    this._ref.setPosition({ x, y });
+  }
+
+  ref() {
+    return this._ref;
+  }
+
+  id(): string {
+    return this._ref.id();
+  }
+
+  enableMouseEditing(value: boolean): void {
+    this._ref.draggable(value);
+  }
+
+  type(): string {
+    return "rectangle";
+  }
+
+  getColor(): string {
+    return this._ref.stroke();
+  }
+
+  setColor(hex: string): void {
+    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(): void {
+    this._ref.destroy();
+    this._ref = null;
+  }
+
+  setLineWidth(size: number): void {
+    this._ref.strokeWidth(size);
+  }
+
+  getLineWidth(): number {
+    return this._ref.strokeWidth();
+  }
+}

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

@@ -1,104 +1,110 @@
-import Konva from "konva";
-import { IMarkupText } from "../../IMarkupText";
-import { IMarkupColorable } from "../../IMarkupColorable";
-
-export class KonvaText implements IMarkupText, IMarkupColorable {
-  private _ref: Konva.Text;
-  private readonly TEXT_FONT_FAMILY = "Calibri";
-
-  constructor(
-    params: { position: { x: number; y: number }; text: string; fontSize: number; color: string; rotation: number },
-    ref = null
-  ) {
-    if (ref) {
-      this._ref = ref;
-      this._ref.id(this._ref._id.toString());
-      return;
-    }
-
-    if (!params || !params.text) return;
-
-    this._ref = new Konva.Text({
-      x: params.position.x,
-      y: params.position.y,
-      text: params.text,
-      fontSize: params.fontSize ?? 34,
-      fontFamily: this.TEXT_FONT_FAMILY,
-      fill: params.color ?? "#ff0000",
-      align: "left",
-      draggable: true,
-      rotation: params.rotation ?? 0,
-    });
-
-    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 "text";
-  }
-
-  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;
-  }
-
-  getText(): string {
-    return this._ref.text();
-  }
-
-  setText(text: string): void {
-    this._ref.text(text);
-  }
-
-  getPosition(): { x: number; y: number } {
-    return this._ref.getPosition();
-  }
-
-  setPosition(x: number, y: number) {
-    this._ref.setPosition({ x, y });
-  }
-
-  getFontSize() {
-    return this._ref.fontSize();
-  }
-
-  setFontSize(size: number) {
-    this._ref.fontSize(size);
-  }
-}
+import Konva from "konva";
+import { IMarkupText } from "../../IMarkupText";
+import { IMarkupColorable } from "../../IMarkupColorable";
+
+export class KonvaText implements IMarkupText, IMarkupColorable {
+  private _ref: Konva.Text;
+  private readonly TEXT_FONT_FAMILY = "Calibri";
+
+  constructor(
+    params: {
+      position: { x: number; y: number };
+      text: string;
+      fontSize: number;
+      color: string;
+      rotation: number;
+      id?: string;
+    },
+    ref = null
+  ) {
+    if (ref) {
+      this._ref = ref;
+      return;
+    }
+
+    if (!params || !params.text) return;
+
+    this._ref = new Konva.Text({
+      x: params.position.x,
+      y: params.position.y,
+      text: params.text,
+      fontSize: params.fontSize ?? 34,
+      fontFamily: this.TEXT_FONT_FAMILY,
+      fill: params.color ?? "#ff0000",
+      align: "left",
+      draggable: true,
+      rotation: params.rotation ?? 0,
+    });
+
+    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 "text";
+  }
+
+  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;
+  }
+
+  getText(): string {
+    return this._ref.text();
+  }
+
+  setText(text: string): void {
+    this._ref.text(text);
+  }
+
+  getPosition(): { x: number; y: number } {
+    return this._ref.getPosition();
+  }
+
+  setPosition(x: number, y: number) {
+    this._ref.setPosition({ x, y });
+  }
+
+  getFontSize() {
+    return this._ref.fontSize();
+  }
+
+  setFontSize(size: number) {
+    this._ref.fontSize(size);
+  }
+}

package/src/Viewer/Markup/IMarkup.ts

@@ -1,39 +1,40 @@
-import { OdBaseDragger } from "../Draggers/Common/OdBaseDragger";
-import { Viewer } from "../Viewer";
-import { IMarkupObject } from "./Api/IMarkupObject";
-
-export enum MarkupType {
-  Unknown,
-  Konva = "Konva",
-  Visualize = "Visualize",
-}
-
-export enum MarkupMode {
-  Line = "Line",
-  Text = "Text",
-  Rectangle = "Rectangle",
-  Ellipse = "Ellipse",
-  Arrow = "Arrow",
-  Image = "Image",
-}
-
-export interface IMarkup {
-  lineWidth: number;
-
-  initialize(viewer: Viewer, canvas: HTMLCanvasElement, canvasEvents: string[]): void;
-  dispose(): void;
-
-  getDraggers(): Map<string, typeof OdBaseDragger>;
-  clearOverlay(): void;
-  getMarkupColor(): { r: number; g: number; b: number };
-  setMarkupColor(r: number, g: number, b: number): void;
-  colorizeAllMarkup(r: number, g: number, b: number): void;
-  drawViewpoint(viewpoint: any): void;
-  createViewpoint(): object;
-
-  createObject(type: string, params: any): IMarkupObject;
-  getObjects(): IMarkupObject[];
-  getSelectedObjects(): IMarkupObject[];
-  selectObjects(objects: IMarkupObject[]): void;
-  clearSelected(): void;
-}
+import { OdBaseDragger } from "../Draggers/Common/OdBaseDragger";
+import { Viewer } from "../Viewer";
+import { IMarkupObject } from "./Api/IMarkupObject";
+
+export enum MarkupType {
+  Unknown,
+  Konva = "Konva",
+  Visualize = "Visualize",
+}
+
+export enum MarkupMode {
+  Line = "Line",
+  Text = "Text",
+  Rectangle = "Rectangle",
+  Ellipse = "Ellipse",
+  Arrow = "Arrow",
+  Image = "Image",
+  Cloud = "Cloud",
+}
+
+export interface IMarkup {
+  lineWidth: number;
+
+  initialize(viewer: Viewer, canvas: HTMLCanvasElement, canvasEvents: string[]): void;
+  dispose(): void;
+
+  getDraggers(): Map<string, typeof OdBaseDragger>;
+  clearOverlay(): void;
+  getMarkupColor(): { r: number; g: number; b: number };
+  setMarkupColor(r: number, g: number, b: number): void;
+  colorizeAllMarkup(r: number, g: number, b: number): void;
+  drawViewpoint(viewpoint: any): void;
+  createViewpoint(): object;
+
+  createObject(type: string, params: any): IMarkupObject;
+  getObjects(): IMarkupObject[];
+  getSelectedObjects(): IMarkupObject[];
+  selectObjects(objects: IMarkupObject[]): void;
+  clearSelected(): void;
+}