@inweb/viewer-visualize 25.11.0 → 25.11.2

package/dist/viewer-visualize.module.js

@@ -552,7 +552,7 @@ commands("VisualizeJS").registerCommand("regenerateAll", regenerateAll);
 
 function resetView(viewer) {
     if (!viewer.visualizeJs) return;
-    viewer.executeCommand("setActiveDragger", "");
+    viewer.executeCommand("setActiveDragger");
     viewer.executeCommand("clearSlices");
     viewer.executeCommand("clearOverlay");
     viewer.executeCommand("setMarkupColor");
@@ -1944,8 +1944,8 @@ class KonvaMarkup {
             this.addImage(screenPoint, image.src, image.width, image.height, image.id);
         }));
     }
-    getViewpoint() {
-        const viewpoint = {};
+    getViewpoint(viewpoint) {
+        if (!viewpoint) viewpoint = {};
         viewpoint.lines = this.getMarkupLines();
         viewpoint.texts = this.getMarkupTexts();
         viewpoint.arrows = this.getMarkupArrows();
@@ -1959,7 +1959,6 @@ class KonvaMarkup {
         viewpoint.snapshot = {
             data: this.combineMarkupWithDrawing()
         };
-        viewpoint.description = (new Date).toDateString();
         return viewpoint;
     }
     enableEditMode(mode) {
@@ -3516,7 +3515,7 @@ class OdaWalkDragger extends OdBaseDragger {
             const avp = this.viewer.activeView;
             avp.delete();
         }
-        this.subject.update();
+        this.subject.update(true);
         this.subject.options.enableZoomWheel = this.enableZoomWheelPreviousValue;
     }
     keydown(ev) {
@@ -4645,6 +4644,7 @@ class TCSLoader extends BaseLoader {
                     this.viewer.update(true);
                     this.viewer.syncOpenCloudVisualStyle(false);
                     this.viewer.syncOptions();
+                    this.viewer.syncOverlay();
                     this.viewer.resize();
                     this.viewer.emitEvent({
                         type: "databasechunk",
@@ -4704,6 +4704,7 @@ class VsfXLoader extends BaseLoader {
                 visViewer.parseVsfx(data);
                 this.viewer.syncOpenCloudVisualStyle(false);
                 this.viewer.syncOptions();
+                this.viewer.syncOverlay();
                 this.viewer.resize();
             }
             console.timeEnd("File load time");
@@ -4787,6 +4788,7 @@ class VsfXStreamingLoader extends BaseLoader {
                 updaterController.update(UpdateType.kForce);
                 this.viewer.syncOpenCloudVisualStyle(false);
                 this.viewer.syncOptions();
+                this.viewer.syncOverlay();
                 this.viewer.resize();
                 this.viewer.emitEvent({
                     type: "databasechunk",
@@ -4860,6 +4862,7 @@ class VsfXPartialLoader extends BaseLoader {
                 updaterController.update(UpdateType.kForce);
                 this.viewer.syncOpenCloudVisualStyle(false);
                 this.viewer.syncOptions();
+                this.viewer.syncOverlay();
                 this.viewer.resize();
                 this.viewer.emitEvent({
                     type: "databasechunk",
@@ -5253,7 +5256,8 @@ class VisualizeMarkup {
         }
         this._viewer.update();
     }
-    getViewpoint() {
+    getViewpoint(viewpoint) {
+        if (!this._viewer.visualizeJs) return {};
         function getLogicalPoint3dFromArray(array) {
             return {
                 x: array[0],
@@ -5261,13 +5265,11 @@ class VisualizeMarkup {
                 z: array[2]
             };
         }
-        if (!this._viewer.visualizeJs) return {};
         const visLib = this._viewer.visLib();
         const visViewer = visLib.getViewer();
-        const viewpoint = {
-            lines: [],
-            texts: []
-        };
+        if (!viewpoint) viewpoint = {};
+        viewpoint.lines = [];
+        viewpoint.texts = [];
         const model = visViewer.getMarkupModel();
         const itr = model.getEntitiesIterator();
         for (;!itr.done(); itr.step()) {
@@ -5312,7 +5314,6 @@ class VisualizeMarkup {
         viewpoint.custom_fields = {
             markup_color: this.getMarkupColor()
         };
-        viewpoint.description = (new Date).toDateString();
         return viewpoint;
     }
     enableEditMode(mode) {
@@ -5443,6 +5444,7 @@ class Viewer extends EventEmitter2 {
         this._gestureManager.initialize();
         this.syncOpenCloudVisualStyle(true);
         this.syncOptions();
+        this.syncOverlay();
         this._renderTime = performance.now();
         this.render(this._renderTime);
         this.emitEvent({
@@ -5725,6 +5727,7 @@ class Viewer extends EventEmitter2 {
                 type: "changeactivedragger",
                 data: name
             });
+            this.update();
         }
         return this._activeDragger;
     }
@@ -5933,6 +5936,7 @@ class Viewer extends EventEmitter2 {
             visViewer.parseFile(data);
             this.syncOpenCloudVisualStyle(false);
             this.syncOptions();
+            this.syncOverlay();
             this.resize();
             this.emitEvent({
                 type: "geometryprogress",
@@ -5977,6 +5981,7 @@ class Viewer extends EventEmitter2 {
             visViewer.parseVsfx(data);
             this.syncOpenCloudVisualStyle(false);
             this.syncOptions();
+            this.syncOverlay();
             this.resize();
             this.emitEvent({
                 type: "geometryprogress",
@@ -6020,11 +6025,13 @@ class Viewer extends EventEmitter2 {
         const visLib = this.visLib();
         const visViewer = visLib.getViewer();
         this.setActiveDragger();
+        this.clearSlices();
         this.clearOverlay();
         visViewer.clear();
         visViewer.createLocalDatabase();
         this.syncOpenCloudVisualStyle(true);
         this.syncOptions();
+        this.syncOverlay();
         this.resize();
         this.emitEvent({
             type: "clear"
@@ -6061,14 +6068,38 @@ class Viewer extends EventEmitter2 {
         return entityId;
     }
     drawViewpoint(viewpoint) {
+        var _a;
+        if (!this.visualizeJs) return;
+        const draggerName = (_a = this._activeDragger) === null || _a === void 0 ? void 0 : _a.name;
+        this.setActiveDragger();
+        this.clearSlices();
+        this.clearOverlay();
+        this.clearSelected();
+        this.showAll();
+        this.explode();
         this.setOrthogonalCameraSettings(viewpoint.orthogonal_camera);
         this.setClippingPlanes(viewpoint.clipping_planes);
+        this.setSelection(viewpoint.selection);
         this._markup.setViewpoint(viewpoint);
+        this.setActiveDragger(draggerName);
+        this.emitEvent({
+            type: "drawviewpoint",
+            data: viewpoint
+        });
+        this.update();
     }
     createViewpoint() {
-        const viewpoint = this._markup.getViewpoint();
+        if (!this.visualizeJs) return {};
+        const viewpoint = {};
         viewpoint.orthogonal_camera = this.getOrthogonalCameraSettings();
         viewpoint.clipping_planes = this.getClippingPlanes();
+        viewpoint.selection = this.getSelection();
+        viewpoint.description = (new Date).toDateString();
+        this._markup.getViewpoint(viewpoint);
+        this.emitEvent({
+            type: "createviewpoint",
+            data: viewpoint
+        });
         return viewpoint;
     }
     getPoint3dFromArray(array) {
@@ -6095,13 +6126,10 @@ class Viewer extends EventEmitter2 {
     setOrthogonalCameraSettings(settings) {
         const visViewer = this.visViewer();
         const activeView = visViewer.activeView;
-        this.resetActiveDragger();
-        this.clearSlices();
-        this.clearOverlay();
         if (settings) {
             activeView.setView(this.getLogicalPoint3dAsArray(settings.view_point), this.getLogicalPoint3dAsArray(settings.direction), this.getLogicalPoint3dAsArray(settings.up_vector), settings.field_width, settings.field_height, true);
+            this.syncOverlay();
         }
-        this.syncOverlay();
     }
     getClippingPlanes() {
         const visViewer = this.visViewer();
@@ -6109,26 +6137,34 @@ class Viewer extends EventEmitter2 {
         const clipping_planes = [];
         for (let i = 0; i < activeView.numCuttingPlanes(); i++) {
             const cuttingPlane = activeView.getCuttingPlane(i);
-            const plane = {
+            const clipping_plane = {
                 location: this.getPoint3dFromArray(cuttingPlane.getOrigin()),
                 direction: this.getPoint3dFromArray(cuttingPlane.normal())
             };
-            clipping_planes.push(plane);
+            clipping_planes.push(clipping_plane);
         }
         return clipping_planes;
     }
-    setClippingPlanes(clippingPlanes) {
-        if (clippingPlanes) {
+    setClippingPlanes(clipping_planes) {
+        if (clipping_planes) {
             const visViewer = this.visViewer();
             const activeView = visViewer.activeView;
-            for (const plane of clippingPlanes) {
+            for (const clipping_plane of clipping_planes) {
                 const cuttingPlane = new (this.visLib().OdTvPlane);
-                cuttingPlane.set(this.getLogicalPoint3dAsArray(plane.location), this.getLogicalPoint3dAsArray(plane.direction));
+                cuttingPlane.set(this.getLogicalPoint3dAsArray(clipping_plane.location), this.getLogicalPoint3dAsArray(clipping_plane.direction));
                 activeView.addCuttingPlane(cuttingPlane);
                 activeView.setEnableCuttingPlaneFill(true, 102, 102, 102);
             }
         }
     }
+    getSelection() {
+        return this.getSelected().map((handle => ({
+            handle: handle
+        })));
+    }
+    setSelection(selection) {
+        this.setSelected(selection === null || selection === void 0 ? void 0 : selection.map((component => component.handle)));
+    }
     executeCommand(id, ...args) {
         return commands("VisualizeJS").executeCommand(id, this, ...args);
     }