@inweb/viewer-visualize 25.8.8 → 25.8.10

package/dist/viewer-visualize.module.js

@@ -827,7 +827,7 @@ class KonvaLine {
             this._ref = ref;
             return;
         }
-        if (!params.points) return;
+        if (!params || !params.points) return;
         const konvaPoints = [];
         params.points.forEach((point => konvaPoints.push(point.x, point.y)));
         this._ref = new Konva.Line({
@@ -929,7 +929,7 @@ class KonvaText {
             this._ref = ref;
             return;
         }
-        if (!params || !params.text) return;
+        if (!params || !params.position || !params.text) return;
         this._ref = new Konva.Text({
             x: params.position.x,
             y: params.position.y,
@@ -1031,7 +1031,7 @@ class KonvaRectangle {
             this._ref = ref;
             return;
         }
-        if (!params.position) return;
+        if (!params || !params.position) return;
         this._ref = new Konva.Rect({
             stroke: (_a = params.color) !== null && _a !== void 0 ? _a : "#ff0000",
             strokeWidth: (_b = params.lineWidth) !== null && _b !== void 0 ? _b : 4,
@@ -1141,7 +1141,7 @@ class KonvaEllipse {
             this._ref = ref;
             return;
         }
-        if (!params.position) return;
+        if (!params || !params.position || !params.radius) return;
         this._ref = new Konva.Ellipse({
             stroke: (_a = params.color) !== null && _a !== void 0 ? _a : "#ff0000",
             strokeWidth: (_b = params.lineWidth) !== null && _b !== void 0 ? _b : 4,
@@ -1263,7 +1263,7 @@ class KonvaArrow {
             this._ref = ref;
             return;
         }
-        if (!params.start || !params.end) return;
+        if (!params || !params.start || !params.end) return;
         this._ref = new Konva.Arrow({
             stroke: (_a = params.color) !== null && _a !== void 0 ? _a : "#ff0000",
             fill: (_b = params.color) !== null && _b !== void 0 ? _b : "#ff0000",
@@ -1357,22 +1357,22 @@ class KonvaArrow {
 
 class KonvaImage {
     constructor(params, ref = null) {
+        var _a, _b;
         this._ratio = 1;
         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();
+            this._ratio = this._ref.height() === 0 || this._ref.width() === 0 ? 1 : this._ref.height() / this._ref.width();
             return;
         }
-        if (!params.position || !params.src) return;
+        if (!params || !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,
+            width: (_a = params.width) !== null && _a !== void 0 ? _a : 0,
+            height: (_b = params.height) !== null && _b !== void 0 ? _b : 0,
             draggable: true
         });
         this._canvasImage.onload = () => {
@@ -1480,7 +1480,7 @@ class KonvaCloud {
             this._ref = ref;
             return;
         }
-        if (!params.position || !params.width || !params.height) return;
+        if (!params || !params.position) return;
         const arcRadius = 16;
         this._ref = new Konva.Shape({
             x: params.position.x,
@@ -1684,7 +1684,7 @@ const MarkupMode2Konva = {
     },
     Cloud: {
         name: "Cloud",
-        initializer: ref => new KonvaCloud(null, ref),
+        initializer: (ref, params = null) => new KonvaCloud(params, ref),
         zIndex: 1
     }
 };
@@ -3152,6 +3152,14 @@ class MeasureLineDragger extends OdBaseDragger {
         pt2[1] -= pt1[1];
         return Math.min(pt2[0], pt2[1]) / 120;
     }
+    start(x, y) {
+        this.createNewMeasureIfNeed();
+        const point = this.getViewer().getSnapPoint(x, y, this.gripingRadius);
+        if (point) {
+            this.firstPoint = point;
+            this.previewMeasureLine.setStartPoint(this.firstPoint);
+        }
+    }
     drag(x, y) {
         this.createNewMeasureIfNeed();
         const point = this.getViewer().getSnapPoint(x, y, this.gripingRadius);
@@ -5532,10 +5540,24 @@ class Viewer extends EventEmitter2 {
         return extHeight !== 0;
     }
     screenToWorld(position) {
-        return this.visViewer().screenToWorld(position.x * window.devicePixelRatio, position.y * window.devicePixelRatio);
+        if (!this.visualizeJs) return {
+            x: position.x,
+            y: position.y,
+            z: 0
+        };
+        const worldPoint = this.visViewer().screenToWorld(position.x * window.devicePixelRatio, position.y * window.devicePixelRatio);
+        const result = {
+            x: worldPoint[0],
+            y: worldPoint[1],
+            z: worldPoint[2]
+        };
+        return result;
     }
     worldToScreen(position) {
-        if (!this.visualizeJs) return position;
+        if (!this.visualizeJs) return {
+            x: position.x,
+            y: position.y
+        };
         const activeView = this.visViewer().activeView;
         const worldMatrix = activeView.worldToDeviceMatrix;
         const worldPoint = this.visLib().Point3d.createFromArray([ position.x, position.y, position.z ]);
@@ -5558,12 +5580,12 @@ class Viewer extends EventEmitter2 {
         };
         const projMatrix = this.visViewer().activeView.projectionMatrix;
         const tolerance = 1e-6;
-        const x = projMatrix.get(1, 1);
-        if (x > tolerance || x < -tolerance) result.x = 1 / result.x;
+        const x = projMatrix.get(0, 0);
+        if (x > tolerance || x < -tolerance) result.x = 1 / x;
         const y = projMatrix.get(1, 1);
-        if (y > tolerance || y < -tolerance) result.y = 1 / result.y;
+        if (y > tolerance || y < -tolerance) result.y = 1 / y;
         const z = projMatrix.get(2, 2);
-        if (z > tolerance || z < -tolerance) result.z = 1 / result.z;
+        if (z > tolerance || z < -tolerance) result.z = 1 / z;
         return result;
     }
     getSelected() {