@vitrosoftware/common-ui-ts 1.1.80 → 1.1.82

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

@@ -1,13 +1,13 @@
-import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=v5';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
-    GLTFLoaderPlugin, utils
+    GLTFLoaderPlugin, utils, FastNavPlugin
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js';
-import { VitroTreeViewPlugin } from "/resource/bimViewer/js/xeokit/VitroTreeViewPlugin.js";
-import { VitroFastNavPlugin } from "/resource/bimViewer/js/xeokit/VitroFastNavPlugin.js";window.initBimViewer = function(context) {var angleMeasurementsData = [
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=v5';
+import { VitroTreeViewPlugin } from "/resource/bimViewer/js/xeokit/VitroTreeViewPlugin.js?version=v5";
+window.initBimViewer = function(context) {var angleMeasurementsData = [
 
 ];
 var bcfData = {};
@@ -98,6 +98,10 @@ const canvasContextMenu = new ContextMenu({
                 },
                 doAction: function (context) {
                     context.viewer.scene.setObjectsVisible(context.viewer.scene.visibleObjectIds, false);
+
+                    if (context.treeViewPlugin) {
+                        context.treeViewPlugin.setCheckedAll(false);
+                    }
                 }
             },
             {
@@ -111,6 +115,10 @@ const canvasContextMenu = new ContextMenu({
                     scene.setObjectsVisible(scene.objectIds, true);
                     scene.setObjectsXRayed(scene.xrayedObjectIds, false);
                     scene.setObjectsSelected(scene.selectedObjectIds, false);
+
+                    if (context.treeViewPlugin) {
+                        context.treeViewPlugin.setCheckedAll(true);
+                    }
                 }
             }
         ],
@@ -133,7 +141,7 @@ const objectContextMenu = new ContextMenu({
             {
                 getTitle: function (context) { return document.webL10n.get('inspect_properties') },
                 doAction: function (context) {
-                    if(context.entity && context.entity.id) {
+                    if (context.entity && context.entity.id) {
                         showPropertyInspector(context);
                     }
                 }
@@ -167,7 +175,11 @@ const objectContextMenu = new ContextMenu({
                 doAction: function (context) {
                     const objectId = context.entity.id;
 
-					context.treeViewPlugin.showInTree(objectId);
+                    if (!$('#btnToggleSidebarTreeView').hasClass('toggled')) {
+                        $('#btnToggleSidebarTreeView').toggleClass('toggled');
+                        openSidebarTreeView();
+                    }
+                    context.treeViewPlugin.showInTree(objectId);
                 }
             }
         ],
@@ -327,7 +339,8 @@ viewer.cameraControl.on("rightClick", function (e) {
     } else {
 
         canvasContextMenu.context = { // Must set context before showing menu
-            viewer: viewer
+            viewer: viewer,
+            treeViewPlugin: treeView,
         };
 
         canvasContextMenu.show(e.event.pageX, e.event.pageY);
@@ -359,11 +372,10 @@ const sectionPlanes = new SectionPlanesPlugin(viewer, {
 });
 
 //------------------------------------------------------------------------------------------------------------------
-// Add a GLTFModelsPlugin - we'll use this to load the model geometry and IFC metadata
+// Add a XKTLoaderPlugin - we'll use this to load the model geometry and IFC metadata
 //------------------------------------------------------------------------------------------------------------------
 
 const xktLoader = new XKTLoaderPlugin(viewer);
-const gltfLoader = new GLTFLoaderPlugin(viewer);
 
 
 xktLoader.globalizeObjectIds = false; // For multiple models in TreeView
@@ -436,7 +448,7 @@ function addModelToTreeView() {
         viewer.scene.canvas.spinner.processes--;
     };
 
-    BIMModel.GetChildList(-1, false, null, callback, error);
+    BIMModel.GetChildList("-1", false, null, callback, error);
 }
 
 //------------------------------------------------------------------------------------------------------------------
@@ -499,7 +511,7 @@ function doLoadModel() {
 
 
 
-    const vitroFastNavPlugin = new VitroFastNavPlugin(viewer, {
+    const fastNavPlugin = new FastNavPlugin(viewer, {
 		hideEdges: true,                   // Don't show edges while we interact (default is true)
 		hideSAO: true,                     // Don't show ambient shadows while we interact (default is true)
 		hideColorTexture: true,            // No color textures while we interact (default is true)
@@ -1645,43 +1657,22 @@ function compareModels(isSideBySide) {
     var modelUrl = compareModelUrl + disableCacheStr;
     var metaModelDataUrl = fileItem.MetaModelDataPath + disableCacheStr;
 
-    getJSON(compareModelUrl, metaModelDataUrl, function(data) {
-
-        window.model2DataUrl = metaModelDataUrl;
-
-        var settings = {
-            id: Date.now(),
-            src: modelUrl,
-            metaModelJSON: data,
-            edges: true,
-            performance: true,
-            position: [0, 0, 0]
-        };
-
-        if (isSideBySide) {
-            settings.position = [-55, 0, 0];
-        }
-
-        var model2 = undefined;
-        if (srcModel.endsWith('.xkt')) {
-            model2 = xktLoader.load(settings);
-        } else {
-            model2 = gltfLoader.load(settings);
-        }
+    var settings = {
+        id: Date.now(),
+        src: modelUrl,
+        edges: true,
+        performance: true,
+        position: [0, 0, 0]
+    };
 
-        var metaObj = data.metaObjects;
-        var result = [];
-        for (var id in metaObj) {
-            if (!metaObj.hasOwnProperty(id)) continue;
-            result[metaObj[id].id] = metaObj[id];
-        }
-        window.model2 = model2;
-        window.model2.customMeta = result;
+    if (isSideBySide) {
+        settings.position = [-55, 0, 0];
+    }
 
-        model2.on('loaded', () => {
-            viewer.scene.canvas.spinner.processes++;
-            doCompareModels(isSideBySide);
-        });
+    window.model2 = xktLoader.load(settings);
+    window.model2.on('loaded', () => {
+        viewer.scene.canvas.spinner.processes++;
+        doCompareModels(isSideBySide);
     });
 }
 
@@ -2075,18 +2066,63 @@ function getPickResultModelId(pickResult) {
     }
 }
 
+function getPropertyValue(property) {
+    if (property.value_bool != null && property.value_bool != undefined) {
+        return property.value_bool;
+    }
+    else if (property.value_int != null && property.value_int != undefined) {
+        return property.value_int;
+    }
+    else if (property.value_text != null && property.value_text != undefined) {
+        return property.value_text;
+    }
+    else if (property.value_real != null && property.value_real != undefined) {
+        return property.value_real;
+    }
+}
+
+function convertProperty(data) {
+    let groups = [];
+
+    for (let property of data) {
+        let existingGroups = groups.filter(group => group.name == property.group_name);
+        if (existingGroups.length > 0) {
+            existingGroups[0].properties.push({ name: property.name, value: getPropertyValue(property) });
+        }
+        else {
+            let newGroup = {
+                name: property.group_name,
+                properties: [],
+            };
+            newGroup.properties.push({ name: property.name, value: getPropertyValue(property) });
+
+
+            groups.push(newGroup);
+        }
+    }
+
+    return groups;
+}
+
 function setPropertyBDSets(id, version) {
     const html = [];
-
+	
     html.push('<div class="element-attributes">');
     html.push('</div>');
 
-	BIMModel.GetPropertyList(id,
-		(propertySets) => {
-			addPropertySet(propertySets, html);
-		});
-
+    viewer.scene.canvas.spinner.processes++;
 
+		BIMModel.GetPropertyList(id,  
+        (data) => {
+			const propertySets = convertProperty(data);
+			addPropertySet(propertySets, html);
+			viewer.scene.canvas.spinner.processes--;
+        }, 
+        (error) => {
+			viewer.scene.canvas.spinner.processes--;
+        }
+    );
+        
     $('#propInspector .prop-inspector-content')[0].innerHTML = html.join("");
     $('.xeokit-accordion-container').accordion({
         collapsible: true,
@@ -2177,104 +2213,10 @@ function initPropertySetsResizable() {
 //
 //------------------------------------------------------------------------------------------------------------------
 
-BIMCommon.GetFileItem = (callback) => {
-
-    const item = {
-        ModelPath: context.filePath,
-        SiteId: context.file.siteId,
-        ListId: context.file.listId,
-        UniqueId: context.file.id,
-        FileVersionList: [],
-        Path: context.filePath,
-        ...context.file
-    };
-   
-    if (callback) {
-        callback(item);
-    }
-}
-
-BIMCommon.CreateWebServerUrl = () => {
-    return 'http://79.143.70.197/Design';
-};
-
 BIMAnnotation.GetNote = (callback) => {
     callback([]);
 }
 
-BIMModel.GetParentIdList = (elementId, recurse, isGeometry, callback) => {
-    context.getParentIdList(elementId).then(res => {
-        if (callback) {
-            callback(res);
-        }
-    })
-}
-
-BIMModel.GetPropertyList = (elementId, callback) => {
-
-    const getValue = (property) => {
-        if (property.ValueBool != null && property.ValueBool != undefined) {
-            return property.ValueBool;
-        }
-        else if (property.ValueInt != null && property.ValueInt != undefined) {
-            return property.ValueInt;
-        }
-        else if (property.ValueText != null && property.ValueText != undefined) {
-            return property.ValueText;
-        }
-        else if (property.ValueReal != null && property.ValueReal != undefined) {
-            return property.ValueReal;
-        }
-    }
-
-    context.getPropertyList(elementId).then(res => {
-        let groups = [];
-
-        for (let property of res) {
-            let existingGroups = groups.filter(group => group.name == property.GroupName);
-            if (existingGroups.length > 0) {
-                existingGroups[0].properties.push({ name: property.Name, value: getValue(property) });
-            }
-            else {
-                let newGroup = {
-                    name: property.GroupName,
-                    properties: [],
-                };
-                newGroup.properties.push({ name: property.Name, value: getValue(property) });
-
-
-                groups.push(newGroup);
-            }
-        }
-
-        callback(groups);
-    })
-}
-
-BIMModel.GetChildList = (elementId, recurse, isGeometry, callback) => {
-    let data = {
-        recurse: recurse,
-        isGeometry: isGeometry
-    }
-    context.getChildList(elementId, data).then(res => {
-        if (callback) {
-            callback(res);
-        }
-    });
-}
-
-BIMModel.GetChildIdList = (elementId, recurse, isGeometry, callback) => {
-    let data = {
-        recurse: recurse,
-        isGeometry: isGeometry
-    };
-    context.getChildIdList(elementId, data).then(res => {
-        if (callback) {
-            callback(res);
-        }
-    });
-}
-
 function saveNote(pickResult) {
 
 }
@@ -2330,6 +2272,7 @@ function bindBtnToggleCreateNotes() {
             annotationByClick = true;
         } else {
             annotationByClick = false;
+            collapseSidebarIssueDetail();
         }
     });
 }
@@ -2346,14 +2289,18 @@ function bindBtnToggleSidebarNotes() {
                 expandSidebarNotes();
             }
         } else {
-            $('#navCubeCanvas').css('right', 10);
-            $('#sectionPlanesOverviewCanvas').css('right', 10);
-            $('.sidebar').hide();
-            $('body').removeClass('sidebar-expanded');
+            collapseSidebarNotes();
         }
     });
 }
 
+function bindSidebarNotesClose() {
+    $('.sidebar-close').on('click', function () {
+        $('#btnToggleSidebarNotes').removeClass('toggled');
+        collapseSidebarNotes();
+    });
+}
+
 function expandSidebarNotes() {
     hidePropInspector();
     collapseSidebarIssueDetail();
@@ -2448,10 +2395,12 @@ function updatePage(e) {
 }
 
 function goToNoteMarker(issue) {
-    var annotation = annotations.annotations[issue.id];
-    console.log('annotation', annotation);
-    viewer.cameraFlight.flyTo(annotation);
-    highlightSidebarNote(issue.id);
+    if (!$('#btnCreateNotes').hasClass('toggled')) {
+        var annotation = annotations.annotations[issue.id];
+        console.log('annotation', annotation);
+        viewer.cameraFlight.flyTo(annotation);
+        highlightSidebarNote(issue.id);
+    }
 }
 
 function onIssueShowMoreClick(issue) {
@@ -2478,6 +2427,7 @@ function onIssueShowMoreClick(issue) {
 }
 
 function collapseSidebarNotes() {
+    $('#sidebarWrap').hide();
     $('#navCubeCanvas').css('right', 10);
     $('#sectionPlanesOverviewCanvas').css('right', 10);
     $('.sidebar').hide();
@@ -2576,6 +2526,33 @@ function createSidebarNotesItemHeader(noteData) {
 function hidePropInspector() {
     $('#propInspector').hide();
 }
+
+function compareModels(isSideBySide) {
+
+    var version = context.fileVersionList[0];
+
+    var disableCacheStr = getDisableCacheStr();
+    var compareModelUrl = context.getFilePath(context.file.id, version.name);
+    var modelUrl = compareModelUrl + disableCacheStr;
+
+    var settings = {
+        id: Date.now(),
+        src: modelUrl,
+        edges: true,
+        performance: true,
+        position: [0, 0, 0]
+    };
+
+    if (isSideBySide) {
+        settings.position = [-55, 0, 0];
+    }
+
+    window.model2 = xktLoader.load(settings);
+    window.model2.on('loaded', () => {
+        viewer.scene.canvas.spinner.processes++;
+        doCompareModels(isSideBySide);
+    });
+}
 
 //------------------------------------------------------------------------------------------------------------------
 // Do action wherever we click on an object
@@ -2618,33 +2595,30 @@ viewer.cameraControl.on("picked", (pickResult) => {
 
 window.viewer = viewer;
 
-BIMCommon.GetFileItem(function (res) {
-    BIMCommon.FileItem = res;
+let version = context.fileVersionList.find(x => x.id === context.versionId);
+let versionStr = version ? version.name : null;
 
-    var fileItem = BIMCommon.FileItem;
+BIMCommon.GetFileItem(context.file.id, versionStr, function (modelId) {
 
-    var versionList = BIMCommon.FileItem.FileVersionList;
-    if (versionList.length == 0) {
-        $('#btnToggleCompare').hide();
-    } else {
-        $('#btnToggleCompare').show();
-    }
+    context.getItem(modelId).then(item => {
+        var filePath = context.getFilePath(item.id);
+        var fileName = context.file.fieldValueMap?.name;
+
+        document.title += " - " + fileName;
+        srcModel = filePath;
+        srcMetaModelData = '';
+        fileVersion = '';
+        fileVersionPath = filePath;
+        hideXeokitSpinner();
+        doLoadModel();
 
-    var filePath = fileItem.Path;
-    var fileName = context.file.fieldValueMap?.name;
 
-    document.title += " - " + fileName;
+        BIMCommon.FileVersion = versionStr;
+        BIMCommon.FileItemId = context.file.id;
+    })
     
-    if (fileItem.FileVersion)
-    {
-        $('#fileVersion').text("[v" + fileItem.FileVersion + "]");
-    }
-    srcModel = fileItem.ModelPath;
-    srcMetaModelData = fileItem.MetaModelDataPath;
-    fileVersion = fileItem.FileVersion;
-    fileVersionPath = filePath;
-    hideXeokitSpinner();
-    doLoadModel();
+}, function () {
+    alert("The file is being processed");
 });
 
 function init() {

package/src/controls/BimViewer/js/init-viewer-page.js

@@ -1,7 +1,7 @@
 async function initHtml() {
     let htmlContainer = document.getElementsByTagName('html')[0];
     htmlContainer.dir = 'ltr';
-    const resp = await fetch('resource/bimViewer/viewer.html?version=v2');
+    const resp = await fetch('resource/bimViewer/viewer.html?version=v5');
     const viewer = await resp.text();
     let container = document.getElementsByTagName('body')[0];
     container.insertAdjacentHTML('beforeend', viewer);
@@ -9,15 +9,15 @@ async function initHtml() {
 
 async function initPage() {
     let container = document.getElementsByTagName('head')[0];
-    container.innerHTML += '<link rel="resource" type="application/l10n" href="resource/bimViewer/locale/locale.js?version=v2">';
-    container.innerHTML += '<link href="/resource/bimViewer/css/bim-viewer.css?version=v2" rel="stylesheet">';
+    container.innerHTML += '<link rel="resource" type="application/l10n" href="resource/bimViewer/locale/locale.js?version=v5">';
+    container.innerHTML += '<link href="/resource/bimViewer/css/bim-viewer.css?version=v5" rel="stylesheet">';
 
     await initHtml();
 
     const script = document.createElement('script');
     script.type = 'module';
     script.id = 'bim-viewer';
-    script.src = 'resource/bimViewer/js/bim-viewer.js?version=v2';
+    script.src = 'resource/bimViewer/js/bim-viewer.js?version=v5';
     document.head.appendChild(script);
 }