@inweb/viewer-visualize 25.7.2 → 25.7.4

package/lib/Viewer/Markup/MarkupFactory.d.ts

@@ -1,4 +1,4 @@
-import { IMarkup } from "./IMarkup";
+import { IMarkup } from "@inweb/markup";
 /**
  * The markup type: `Visualize` (deprecated) or `Konva`.
  */

package/lib/Viewer/Markup/{Impl/Visualize → Visualize}/VisualizeMarkup.d.ts

@@ -1,8 +1,6 @@
 import { IEventEmitter } from "@inweb/eventemitter2";
 import { IViewpoint } from "@inweb/viewer-core";
-import { IMarkup } from "../../IMarkup";
-import { IWorldTransform } from "../../IWorldTransform";
-import { IMarkupObject } from "../../Api/IMarkupObject";
+import { IMarkup, IMarkupObject, IWorldTransform } from "@inweb/markup";
 export declare class VisualizeMarkup implements IMarkup {
     private _viewer;
     protected _markupColor: {

package/lib/Viewer/Viewer.d.ts

@@ -1,8 +1,7 @@
 import { EventEmitter2 } from "@inweb/eventemitter2";
 import { Assembly, Client, File, Model } from "@inweb/client";
 import { CanvasEventMap, Dragger, IDragger, IOptions, IViewer, IViewpoint, Options, OptionsEventMap, ViewerEventMap } from "@inweb/viewer-core";
-import { IMarkup } from "./Markup/IMarkup";
-import { IWorldTransform } from "./Markup/IWorldTransform";
+import { IMarkup, IWorldTransform } from "@inweb/markup";
 import { MarkupType } from "./Markup/MarkupFactory";
 /**
  * The `Client.js` library class that provides methods to integrate with the

package/lib/index.d.ts

@@ -1,16 +1,6 @@
 import "./Viewer/Commands";
 export * from "@inweb/viewer-core";
+export * from "@inweb/markup";
 export { Viewer } from "./Viewer/Viewer";
 export { OdBaseDragger } from "./Viewer/Draggers/Common/OdBaseDragger";
-export { IMarkup } from "./Viewer/Markup/IMarkup";
-export { IMarkupArrow } from "./Viewer/Markup/Api/IMarkupArrow";
-export { IMarkupCloud } from "./Viewer/Markup/Api/IMarkupCloud";
-export { IMarkupColorable } from "./Viewer/Markup/Api/IMarkupColorable";
-export { IMarkupEllipse } from "./Viewer/Markup/Api/IMarkupEllipse";
-export { IMarkupImage } from "./Viewer/Markup/Api/IMarkupImage";
-export { IMarkupLine, MarkupLineType } from "./Viewer/Markup/Api/IMarkupLine";
-export { IMarkupRectangle } from "./Viewer/Markup/Api/IMarkupRectangle";
-export { IMarkupObject } from "./Viewer/Markup/Api/IMarkupObject";
-export { IMarkupText } from "./Viewer/Markup/Api/IMarkupText";
-export { IWorldTransform } from "./Viewer/Markup/IWorldTransform";
 export { MarkupType } from "./Viewer/Markup/MarkupFactory";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "25.7.2",
+  "version": "25.7.4",
   "description": "3D CAD and BIM data Viewer powered by Visualize",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -29,17 +29,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~25.7.2",
-    "@inweb/eventemitter2": "~25.7.2",
-    "@inweb/viewer-core": "~25.7.2"
-  },
-  "devDependencies": {
-    "canvas": "^2.11.2",
-    "konva": "^9.2.0"
-  },
-  "peerDependencies": {
-    "canvas": "^2.11.2",
-    "konva": "^9.2.0"
+    "@inweb/client": "~25.7.4",
+    "@inweb/eventemitter2": "~25.7.4",
+    "@inweb/markup": "~25.7.4",
+    "@inweb/viewer-core": "~25.7.4"
   },
   "visualizeJS": "https://opencloud.azureedge.net/libs/visualizejs/master/Visualize.js"
 }

package/src/Viewer/Markup/MarkupFactory.ts

@@ -21,9 +21,8 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { IMarkup } from "./IMarkup";
-import { KonvaMarkup } from "./Impl/Konva/KonvaMarkup";
-import { VisualizeMarkup } from "./Impl/Visualize/VisualizeMarkup";
+import { IMarkup, Markup as KonvaMarkup } from "@inweb/markup";
+import { VisualizeMarkup } from "./Visualize/VisualizeMarkup";
 
 /**
  * The markup type: `Visualize` (deprecated) or `Konva`.

package/src/Viewer/Markup/{Impl/Visualize → Visualize}/VisualizeMarkup.ts

@@ -1,11 +1,9 @@
 import { IEventEmitter } from "@inweb/eventemitter2";
 import { ILine, IText, IViewpoint } from "@inweb/viewer-core";
-import { IMarkup } from "../../IMarkup";
-import { IWorldTransform } from "../../IWorldTransform";
-import { Viewer } from "../../../Viewer";
-import { MARKUP_ENTITY_LINE, OdaLineDragger } from "../../../Draggers/OdaLineDragger";
-import { MARKUP_ENTITY_TEXT, OdaTextDragger } from "../../../Draggers/OdaTextDragger";
-import { IMarkupObject } from "../../Api/IMarkupObject";
+import { IMarkup, IMarkupObject, IWorldTransform } from "@inweb/markup";
+import { Viewer } from "../../Viewer";
+import { MARKUP_ENTITY_LINE, OdaLineDragger } from "../../Draggers/OdaLineDragger";
+import { MARKUP_ENTITY_TEXT, OdaTextDragger } from "../../Draggers/OdaTextDragger";
 
 const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
 

package/src/Viewer/Viewer.ts

@@ -38,6 +38,7 @@ import {
   OptionsEventMap,
   ViewerEventMap,
 } from "@inweb/viewer-core";
+import { IMarkup, IWorldTransform } from "@inweb/markup";
 
 import { MeasureLineDragger } from "./Draggers/MeasureLineDragger/index";
 import { OdaWalkDragger } from "./Draggers/OdaWalkDragger";
@@ -54,8 +55,6 @@ import { GestureManager } from "./Draggers/Common/GestureManager";
 
 import { loadVisualizeJs } from "./utils";
 import { LoaderFactory } from "./Loaders/LoaderFactory";
-import { IMarkup } from "./Markup/IMarkup";
-import { IWorldTransform } from "./Markup/IWorldTransform";
 import { MarkupFactory, MarkupType } from "./Markup/MarkupFactory";
 
 const isExist = (value) => value !== undefined && value !== null;

package/src/index.ts

@@ -24,17 +24,7 @@
 import "./Viewer/Commands";
 
 export * from "@inweb/viewer-core";
+export * from "@inweb/markup";
 export { Viewer } from "./Viewer/Viewer";
 export { OdBaseDragger } from "./Viewer/Draggers/Common/OdBaseDragger";
-export { IMarkup } from "./Viewer/Markup/IMarkup";
-export { IMarkupArrow } from "./Viewer/Markup/Api/IMarkupArrow";
-export { IMarkupCloud } from "./Viewer/Markup/Api/IMarkupCloud";
-export { IMarkupColorable } from "./Viewer/Markup/Api/IMarkupColorable";
-export { IMarkupEllipse } from "./Viewer/Markup/Api/IMarkupEllipse";
-export { IMarkupImage } from "./Viewer/Markup/Api/IMarkupImage";
-export { IMarkupLine, MarkupLineType } from "./Viewer/Markup/Api/IMarkupLine";
-export { IMarkupRectangle } from "./Viewer/Markup/Api/IMarkupRectangle";
-export { IMarkupObject } from "./Viewer/Markup/Api/IMarkupObject";
-export { IMarkupText } from "./Viewer/Markup/Api/IMarkupText";
-export { IWorldTransform } from "./Viewer/Markup/IWorldTransform";
 export { MarkupType } from "./Viewer/Markup/MarkupFactory";

package/lib/Viewer/Markup/Api/IMarkupArrow.d.ts

@@ -1,52 +0,0 @@
-import { IMarkupObject } from "./IMarkupObject";
-/**
- * Arrow Markup object
- */
-export interface IMarkupArrow extends IMarkupObject {
-    /**
-     * Get points of current Arrow
-     *
-     * @returns {{ x: number; y: number }} array of points
-     */
-    getPoints(): {
-        x: number;
-        y: number;
-    }[];
-    /**
-     * Set points of the Arrow
-     *
-     * @param {{ x: number; y: number }} points - array of points
-     */
-    setPoints(points: {
-        x: number;
-        y: number;
-    }[]): any;
-    /**
-     * Get Start Point of the Arrow
-     */
-    getStartPoint(): {
-        x: number;
-        y: number;
-    };
-    /**
-     * Set Start point of the Arrow
-     *
-     * @param x - value of X coordinate
-     * @param y - value of Y coordinate
-     */
-    setStartPoint(x: number, y: number): any;
-    /**
-     * Get End point of the Arrow
-     */
-    getEndPoint(): {
-        x: number;
-        y: number;
-    };
-    /**
-     * Set End point of the Arrow
-     *
-     * @param x - value of X coordinate
-     * @param y - value of Y coordinate
-     */
-    setEndPoint(x: number, y: number): any;
-}

package/lib/Viewer/Markup/Api/IMarkupCloud.d.ts

@@ -1,50 +0,0 @@
-import { IMarkupObject } from "./IMarkupObject";
-/**
- * Cloud Markup object
- */
-export interface IMarkupCloud extends IMarkupObject {
-    /**
-     * Get position of the Cloud
-     */
-    getPosition(): {
-        x: number;
-        y: number;
-    };
-    /**
-     * Set position of the Cloud
-     *
-     * @param x - value of X coordinate
-     * @param y - value of Y coordinate
-     */
-    setPosition(x: number, y: number): any;
-    /**
-     * Get width of the Cloud. Default value is 200
-     */
-    getWidth(): number;
-    /**
-     * Set width of the Cloud
-     *
-     * @param w - value of width. Default value is 200
-     */
-    setWidth(w: number): any;
-    /**
-     * Get height of the Cloud. Default value is 200
-     */
-    getHeigth(): number;
-    /**
-     * Set height of the Cloud
-     *
-     * @param h - value of height. Default value is 200
-     */
-    setHeight(h: number): any;
-    /**
-     * Get line width of the Cloud. Defailt value is 4
-     */
-    getLineWidth(): number;
-    /**
-     * Set line width of the Cloud
-     *
-     * @param size - value of width. Defailt value is 4
-     */
-    setLineWidth(size: number): any;
-}

package/lib/Viewer/Markup/Api/IMarkupColorable.d.ts

@@ -1,15 +0,0 @@
-/**
- * Markup Colorable
- */
-export interface IMarkupColorable {
-    /**
-     * Get color of the Markup instance
-     */
-    getColor(): string;
-    /**
-     * Set color of the Markup instance
-     *
-     * @param hex - color in #hex format. Default: `#ff0000`
-     */
-    setColor(hex: string): void;
-}

package/lib/Viewer/Markup/Api/IMarkupEllipse.d.ts

@@ -1,50 +0,0 @@
-import { IMarkupObject } from "./IMarkupObject";
-/**
- * Ellipse Markup object
- */
-export interface IMarkupEllipse extends IMarkupObject {
-    /**
-     * Get position of the Ellipse
-     */
-    getPosition(): {
-        x: number;
-        y: number;
-    };
-    /**
-     * Set position of the Ellipse
-     *
-     * @param x - value of X coordinate
-     * @param y - value of Y coordinate
-     */
-    setPosition(x: number, y: number): any;
-    /**
-     * Get X radius of the Ellipse
-     */
-    getRadiusX(): number;
-    /**
-     * Set X radius of the Ellipse
-     *
-     * @param r - value of X radius of the Ellipse
-     */
-    setRadiusX(r: number): any;
-    /**
-     * Get Y radius of the Ellipse
-     */
-    getRadiusY(): number;
-    /**
-     * Set Y radius of the Ellipse
-     *
-     * @param r - value of Y radius of the Ellipse
-     */
-    setRadiusY(r: number): any;
-    /**
-     * Get line width of the Ellipse. Defailt is 4
-     */
-    getLineWidth(): number;
-    /**
-     * Set line width of the Ellipse. Default is 4
-     *
-     * @param size - value of width
-     */
-    setLineWidth(size: number): any;
-}

package/lib/Viewer/Markup/Api/IMarkupImage.d.ts

@@ -1,50 +0,0 @@
-import { IMarkupObject } from "./IMarkupObject";
-/**
- * Image Markup object
- */
-export interface IMarkupImage extends IMarkupObject {
-    /**
-     * Get position of the Image
-     */
-    getPosition(): {
-        x: number;
-        y: number;
-    };
-    /**
-     * Set position of the Image
-     *
-     * @param x - value of X coordinate
-     * @param y - value of Y coordinate
-     */
-    setPosition(x: number, y: number): any;
-    /**
-     * Get source of the Image. Provides base64 string
-     */
-    getSrc(): string;
-    /**
-     * Set source of the Image
-     *
-     * @param src - string in base64 format
-     */
-    setSrc(src: string): any;
-    /**
-     * Get width of the Image
-     */
-    getWidth(): number;
-    /**
-     * Set width of the Image
-     *
-     * @param w - value of width. Height will be automatically updated according to ratio of the Image
-     */
-    setWidth(w: number): any;
-    /**
-     * Get height of the Image
-     */
-    getHeight(): number;
-    /**
-     * Set height of the Image
-     *
-     * @param h - value of height. Width will be automatically updated according to ratio of the Image
-     */
-    setHeight(h: number): any;
-}

package/lib/Viewer/Markup/Api/IMarkupLine.d.ts

@@ -1,43 +0,0 @@
-import { IMarkupObject } from "./IMarkupObject";
-/**
- * Type of the markup line.
- */
-export type MarkupLineType = "solid" | "dot" | "dash";
-/**
- * Line Markup object
- */
-export interface IMarkupLine extends IMarkupObject {
-    /**
-     * Get points of the Line
-     */
-    getPoints(): number[];
-    /**
-     * Get Line width. Default value is 4
-     */
-    getLineWidth(): number;
-    /**
-     * Set Line width. Default value is 4
-     *
-     * @param size - value of width
-     */
-    setLineWidth(size: number): any;
-    /**
-     * Get Type of the Line. Available values: `solid`, `dot`, `dash`. Default is `solid`
-     */
-    getLineType(): string;
-    /**
-     * Set Type of the Line. Available values: `solid`, `dot`, `dash`. Default is `solid`
-     *
-     * @param type
-     */
-    setLineType(type: string): any;
-    /**
-     * Add points to the Line
-     *
-     * @param {{ x: number; y: number }} points array of points
-     */
-    addPoints(points: [{
-        x: number;
-        y: number;
-    }]): any;
-}

package/lib/Viewer/Markup/Api/IMarkupObject.d.ts

@@ -1,47 +0,0 @@
-/**
- * Markup object
- */
-export interface IMarkupObject {
-    /**
-     * Link to Library object (Konva, VisualizeJS)
-     */
-    ref(): any;
-    /**
-     * Get an internal identificator of the object. Not unique
-     */
-    id(): string;
-    /**
-     * Set Mouse editing feature
-     *
-     * @param value true / false
-     */
-    enableMouseEditing(value: boolean): any;
-    /**
-     * Get type of the Markup object
-     */
-    type(): string;
-    /**
-     * Get rotation of the Markup object
-     */
-    getRotation(): number;
-    /**
-     * Set rotation of the Markup object
-     *
-     * @param degrees number of degress to rotate
-     */
-    setRotation(degrees: number): void;
-    /**
-     * Get Z-Index of the Markup object
-     */
-    getZIndex(): number;
-    /**
-     * Set Z-Index of the Markup object
-     *
-     * @param zIndex integer value of Z-Index
-     */
-    setZIndex(zIndex: number): void;
-    /**
-     * Delete current Markup object
-     */
-    delete(): void;
-}

package/lib/Viewer/Markup/Api/IMarkupRectangle.d.ts

@@ -1,50 +0,0 @@
-import { IMarkupObject } from "./IMarkupObject";
-/**
- * Rectangle Markup object
- */
-export interface IMarkupRectangle extends IMarkupObject {
-    /**
-     * Get position of the Rectangle
-     */
-    getPosition(): {
-        x: number;
-        y: number;
-    };
-    /**
-     * Set position of the Rectangle
-     *
-     * @param x - value of X coordinate
-     * @param y - value of Y coordinate
-     */
-    setPosition(x: number, y: number): any;
-    /**
-     * Get width of the Rectangle. Default value is 200
-     */
-    getWidth(): number;
-    /**
-     * Set width of the Rectangle
-     *
-     * @param w - value of width. Default value is 200
-     */
-    setWidth(w: number): any;
-    /**
-     * Get height of the Rectangle. Default value is 200
-     */
-    getHeigth(): number;
-    /**
-     * Set height of the Rectangle
-     *
-     * @param h - value of height. Default value is 200
-     */
-    setHeight(h: number): any;
-    /**
-     * Get line width of the Rectangle. Defailt value is 4
-     */
-    getLineWidth(): number;
-    /**
-     * Set line width of the Rectangle
-     *
-     * @param size - value of width. Defailt value is 4
-     */
-    setLineWidth(size: number): any;
-}

package/lib/Viewer/Markup/Api/IMarkupText.d.ts

@@ -1,40 +0,0 @@
-import { IMarkupObject } from "./IMarkupObject";
-/**
- * Text Markup object
- */
-export interface IMarkupText extends IMarkupObject {
-    /**
-     * Get Text value
-     */
-    getText(): string;
-    /**
-     * Set Text value
-     *
-     * @param text - string value
-     */
-    setText(text: string): void;
-    /**
-     * Get position of the Text
-     */
-    getPosition(): {
-        x: number;
-        y: number;
-    };
-    /**
-     * Set position of the Text
-     *
-     * @param x - value of X coordinate
-     * @param y - value of Y coordinate
-     */
-    setPosition(x: number, y: number): any;
-    /**
-     * Get font size. Default value is 34
-     */
-    getFontSize(): any;
-    /**
-     * Set font size. Default value is 34
-     *
-     * @param size
-     */
-    setFontSize(size: number): any;
-}

package/lib/Viewer/Markup/Api/Impl/Konva/KonvaArrow.d.ts

@@ -1,46 +0,0 @@
-import { IMarkupArrow } from "../../IMarkupArrow";
-import { IMarkupColorable } from "../../IMarkupColorable";
-export declare class KonvaArrow implements IMarkupArrow, IMarkupColorable {
-    private _ref;
-    constructor(params: {
-        start: {
-            x: number;
-            y: number;
-        };
-        end: {
-            x: number;
-            y: number;
-        };
-        color?: string;
-        id?: string;
-    }, ref?: any);
-    ref(): import("konva/lib/shapes/Arrow").Arrow;
-    id(): string;
-    enableMouseEditing(value: boolean): void;
-    type(): string;
-    getColor(): string;
-    setColor(hex: string): void;
-    getRotation(): number;
-    setRotation(degrees: number): void;
-    getZIndex(): number;
-    setZIndex(zIndex: number): void;
-    delete(): void;
-    getPoints(): {
-        x: number;
-        y: number;
-    }[];
-    setPoints(points: {
-        x: number;
-        y: number;
-    }[]): void;
-    getStartPoint(): {
-        x: number;
-        y: number;
-    };
-    setStartPoint(x: number, y: number): void;
-    getEndPoint(): {
-        x: number;
-        y: number;
-    };
-    setEndPoint(x: number, y: number): void;
-}

package/lib/Viewer/Markup/Api/Impl/Konva/KonvaCloud.d.ts

@@ -1,35 +0,0 @@
-import { IMarkupColorable } from "../../IMarkupColorable";
-import { IMarkupCloud } from "../../IMarkupCloud";
-export declare class KonvaCloud implements IMarkupCloud, IMarkupColorable {
-    private _ref;
-    constructor(params: {
-        position: {
-            x: number;
-            y: number;
-        };
-        width?: number;
-        height?: number;
-        lineWidth?: number;
-        color?: string;
-        id?: string;
-    }, ref?: any);
-    ref(): import("konva/lib/Shape").Shape<import("konva/lib/Shape").ShapeConfig>;
-    id(): string;
-    enableMouseEditing(value: boolean): void;
-    type(): string;
-    getColor(): string;
-    setColor(hex: string): void;
-    getRotation(): number;
-    setRotation(degrees: number): void;
-    getZIndex(): number;
-    setZIndex(zIndex: number): void;
-    delete(): void;
-    getPosition(): import("konva/lib/types").Vector2d;
-    setPosition(x: number, y: number): void;
-    getWidth(): number;
-    setWidth(w: number): void;
-    getHeigth(): number;
-    setHeight(h: number): void;
-    getLineWidth(): number;
-    setLineWidth(size: number): void;
-}

package/lib/Viewer/Markup/Api/Impl/Konva/KonvaEllipse.d.ts

@@ -1,40 +0,0 @@
-import { IMarkupEllipse } from "../../IMarkupEllipse";
-import { IMarkupColorable } from "../../IMarkupColorable";
-export declare class KonvaEllipse implements IMarkupEllipse, IMarkupColorable {
-    private _ref;
-    constructor(params: {
-        position: {
-            x: number;
-            y: number;
-        };
-        radius: {
-            x: number;
-            y: number;
-        };
-        lineWidth?: number;
-        color?: string;
-        id?: string;
-    }, ref?: any);
-    getPosition(): {
-        x: number;
-        y: number;
-    };
-    setPosition(x: number, y: number): void;
-    getRadiusX(): number;
-    setRadiusX(r: number): void;
-    getRadiusY(): number;
-    setRadiusY(r: number): void;
-    getLineWidth(): number;
-    setLineWidth(size: number): void;
-    ref(): import("konva/lib/shapes/Ellipse").Ellipse;
-    id(): string;
-    enableMouseEditing(value: boolean): void;
-    type(): string;
-    getColor(): string;
-    setColor(hex: string): void;
-    getRotation(): number;
-    setRotation(degrees: number): void;
-    getZIndex(): number;
-    setZIndex(zIndex: number): void;
-    delete(): void;
-}