@vitrosoftware/common-ui-ts 1.1.206 → 1.1.207

package/dist/index.js

@@ -63168,7 +63168,7 @@ var Viewer = function Viewer(props) {
 };
 
 var name = "@vitrosoftware/common-ui-ts";
-var version$1 = "1.1.206";
+var version$1 = "1.1.207";
 var description = "vitro software common ui ts";
 var author = "";
 var license = "MIT";

package/dist/src/controls/BimViewer/services/BimViewerService.d.ts

@@ -4,13 +4,14 @@ export interface BimViewerService {
     versionId?: string;
     currentVersionId: string;
     fileVersionList: models.FileVersion[];
-    onCreateIssue(data: any): any;
+    onCreateIssue(itemId: string, data: any): any;
     createLocale(key: string): any;
     getIssueList(): Promise<any>;
     getFilePath: (itemId: string, version?: string) => string;
     deleteIssueEvent?: string;
     updateIssueEvent?: string;
     getItem: (id: string) => Promise<any>;
+    addItem: (item: any) => void;
     onChangeFileVersion: (version: models.FileVersion) => any;
     currentVersionTooltipText?: string;
     notCurrentVersionTooltipText?: string;

package/lib/xeokit/xeokit-sdk-2.6.10.es.js

@@ -7945,7 +7945,12 @@ class Component {
                     sub = subs[subId];
                     this._eventCallDepth++;
                     if (this._eventCallDepth < 300) {
-                        sub.callback.call(sub.scope, value);
+                        try {
+                            sub.callback.call(sub.scope, value);
+                        } catch (e) {
+                            this.error(e);
+                        }
+
                     } else {
                         this.error("fire: potential stack overflow from recursive event '" + event + "' - dropping this event");
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.206",
+    "version": "1.1.207",
     "description": "vitro software common ui ts",
     "author": "",
     "license": "MIT",

package/src/controls/BimViewer/js/bim-viewer-models.js

@@ -350,6 +350,37 @@ class VitroModel {
             }
         });
     },
+
+    GetModel: function (elementId, callback, error, async = true) {
+
+        var paramObj = {};
+
+        paramObj.modelList = BIMCommon.GetModelList(BIMCommon.ModelList);
+        paramObj.elementId = elementId.toString();
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/bimViewer/api/ModelElement/GetModel",
+            data: JSON.stringify(paramObj),
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: async,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                if (error) {
+                    error(jqXHR, textStatus, errorThrown);
+                }
+            },
+            success: function (data, status, jqXHR) {
+                //console.log(data);
+                if (callback) {
+                    callback(data);
+                }
+            }
+        });
+    },
 	
     GetPropertyList: function (elementId, callback, error, async = true) {
         var paramObj = {};

package/src/controls/BimViewer/js/bim-viewer.js

@@ -1,11 +1,11 @@
-import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.206';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.207';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
     GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.206';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.207';
 
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -808,7 +808,7 @@ class VitroTreeViewPlugin extends TreeViewPlugin
         }
 
         var sceneModel = this.load({
-            id: Date.now() + '_' + this.vitroModel.FileItemId + this.vitroModel.FileVersion + '_' + numPart,
+            id: Date.now() + '_' + numPart,
             xkt: data,
             edges: true,
             backfaces: true,
@@ -816,6 +816,7 @@ class VitroTreeViewPlugin extends TreeViewPlugin
         });
 
         sceneModel.largeModel = this.largeModel;
+
         this.smallModelList.push(sceneModel);
 
         sceneModel.on('loaded', () => {
@@ -1572,19 +1573,38 @@ function doLoadModel(srcModel, isMain) {
             model.vitroModelLoader = new VitroXKTLoaderPlugin(viewer);
 
             model.vitroModelLoader.largeModel = model;
-            model.vitroModelLoader.vitroModel = srcModel;
             model.vitroModelLoader.startSmallLoad = true;
 
-
             $('#btnToggleSectionPlan').addClass('toggled');
         }
         else {
             viewer.scene.fire("reloadSmallScenes");
         }
+
+        //------------------------------------------------------------------------------------------------------------------
+        // Create some Annotations
+        //------------------------------------------------------------------------------------------------------------------
+        loadAnnotations();
     });
+
+    window.model = model;
+
+    if (isPointCloud(srcModel.FileName)) {
+        var navPlugin = viewer._plugins.find((p) => p.id == 'FastNav');
+
+        if (navPlugin) {
+            navPlugin.hideTransparentObjects = false;
+        }
+    }
+
     return model;
 }
 
+function isPointCloud(filename) {
+    const ext = filename.split('.').pop().toLowerCase();
+    return ext === 'las' || ext === 'laz';
+}
+
 function getDisableCacheStr() {
     var dt = new Date();
     return "?rev=" + dt.getTime();
@@ -1592,10 +1612,7 @@ function getDisableCacheStr() {
 
 function modelOnLoaded() {
 
-    //------------------------------------------------------------------------------------------------------------------
-    // Create some Annotations
-    //------------------------------------------------------------------------------------------------------------------
-    loadAnnotations();
+
 
     //----------------------------------------------------------------------------------------------------------
     // Angle Measurements
@@ -2877,19 +2894,19 @@ function highlightModelsDifference(result, isSideBySide) {
             color = [0.9, 0.9, 0.9]; // TODO: old Model unique-objects color -> gray
             setOpacityArObject(window.model, arObjId, opacity);
         }
-        colorizeArObject(window.model, arObjId, color); // TODO: old Model unique-objects change color
+        colorizeArObject(window.model2, arObjId, color); // TODO: old Model unique-objects change color
     }
 
     // Make old Model not unique-objects unvisible
     if (result['old']['notUnique'].length && !isSideBySide) {
         arObjId = result['old']['notUnique'];
-        setVisibilityArObject(window.model, arObjId, false);
+        setVisibilityArObject(window.model2, arObjId, false);
     }
 
     if (result['new'].length) {
         arObjId = result['new'];
         color = [1.0, 0.0, 0.8]; // TODO: new Model unique-objects color
-        colorizeArObject(window.model2, arObjId, color);
+        colorizeArObject(window.model, arObjId, color);
     }
 }
 
@@ -3070,7 +3087,7 @@ const fastNavPlugin = new FastNavPlugin(viewer, {
 //
 //------------------------------------------------------------------------------------------------------------------
 
-var notesDescriptionVisibleList = {};
+var notesDescriptionVisibleList = {};
 
 BIMAnnotation.GetNote = (callback) => {
     callback([]);
@@ -3112,13 +3129,41 @@ function createMarkupData(pickResult) {
     return markup;
 }
 
-function createAnnotationByClick(pickResult) {
-    let data = createMarkupData(pickResult);
-    context.onCreateIssue(data);
+function addIssue(itemId, data) {
+    context.onCreateIssue(itemId, data);
+
     hidePropInspector();
     expandSidebarIssueDetail();
 }
 
+function createAnnotationByClick(pickResult) {
+    let data = createMarkupData(pickResult);
+
+    if (data.entity) {
+        viewer.scene.canvas.spinner.processes++;
+
+        const callback = (modelInfo, status, jqXHR) => {
+
+            const itemId = modelInfo?.itemId ? modelInfo?.itemId : context.file.id;
+
+            addIssue(itemId, data);
+
+            viewer.scene.canvas.spinner.processes--;
+        };
+
+        const error = () => {
+            viewer.scene.canvas.spinner.processes--;
+        };
+
+        BIMModel.GetModel(data.entity, callback, error);
+    }
+    else {
+        addIssue(context.file.id, data);
+    }
+}
+
+
+
 function bindBtnToggleCreateNotes() {
     $(document).on('click', '#btnCreateNotes', function () {
         $(this).toggleClass('toggled');
@@ -3825,8 +3870,14 @@ function bindBtnAddModel() {
             itemIdList.forEach(itemId =>
             {
                 BIMCommon.GetFileItem(itemId, undefined, function (modelId) {
-                    context.getItem(modelId).then(item => {
-                        const filePath = context.getFilePath(item.id);
+                    context.getItem(modelId).then(itemAttach => {
+
+                        context.getItem(itemId).then(item =>
+                        {
+                            context.addItem(item);
+                        });
+
+                        const filePath = context.getFilePath(itemAttach.id);
                         const fileName = context.file.fieldValueMap?.name;
                         const model = new BIMCommon.VitroModel(itemId, versionStr, filePath, fileName);
 

package/src/controls/DxfViewer/js/dxf-viewer.js

@@ -1,17 +1,17 @@
-import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.206';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.206';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.206';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.206';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.206';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.206';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.206';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.206';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.206';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.206';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.206';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.206';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.206';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.206';
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.207';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.207';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.207';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.207';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.207';
+import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.207';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.207';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.207';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.207';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.207';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.207';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.207';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.207';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.207';
 
 let treeViewData = [];
 let notes = [];

package/src/controls/PdfViewer/js/pdf-viewer.js

@@ -21208,7 +21208,7 @@ const defaultOptions = {
     kind: OptionKind.WORKER
   },
   workerSrc: {
-    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.206",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.207",
     kind: OptionKind.WORKER
   }
 };