@vitrosoftware/common-ui-ts 1.1.121 → 1.1.123

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.121",
+    "version": "1.1.123",
     "description": "vitro software common ui ts",
     "author": "",
     "license": "MIT",
@@ -11,7 +11,7 @@
         "node": ">=10"
     },
     "scripts": {
-        "build": "node clean.js && node build.js && microbundle-crl --no-compress --format cjs --css-modules _[name]_[local]_[hash:base64:7] && node src/controls/PdfViewer/build.js  && node src/controls/BimViewer/build.js",
+        "build": "node clean.js && node build.js && microbundle-crl --no-compress --format cjs --css-modules _[name]_[local]_[hash:base64:7] && node src/controls/PdfViewer/build.js && node src/controls/BimViewer/build.js && node src/controls/DxfViewer/build.js",
         "start": "microbundle-crl watch --no-compress --format modern,cjs",
         "prepare": "run-s build",
         "test": "run-s test:unit test:lint test:build",
@@ -36,6 +36,8 @@
         "@typescript-eslint/eslint-plugin": "^2.26.0",
         "@typescript-eslint/parser": "^2.26.0",
         "babel-eslint": "^10.0.3",
+        "concat": "1.0.3",
+        "concat-glob-cli": "0.1.0",
         "cross-env": "^7.0.2",
         "eslint": "^6.8.0",
         "eslint-config-prettier": "^6.7.0",
@@ -54,12 +56,10 @@
         "npm-run-all": "^4.1.5",
         "prettier": "^2.0.4",
         "react": "18.2.0",
+        "react-bootstrap": "2.9.1",
         "react-dom": "18.2.0",
         "react-scripts": "5.0.1",
-        "typescript": "^4.7.4",
-        "concat": "1.0.3",
-        "concat-glob-cli": "0.1.0",
-        "react-bootstrap": "2.9.1"
+        "typescript": "^4.7.4"
     },
     "files": [
         "dist",
@@ -67,15 +67,17 @@
         "lib",
         "src/controls/PdfViewer/js/pdf-viewer.js",
         "src/controls/BimViewer/js/bim-viewer.js",
-        "src/controls/BimViewer/js/bim-viewer-models.js"
+        "src/controls/BimViewer/js/bim-viewer-models.js",
+        "src/controls/DxfViewer/js/dxf-viewer.js"
     ],
     "dependencies": {
-        "rollup-plugin-postcss": "^3.1.3",
         "inversify": "6.0.1",
         "inversify-react": "1.0.2",
-        "react-router-bootstrap": "^0.24.4",
         "m-react-splitters": "^1.2.0",
+        "opentype": "^0.1.2",
         "react-click-outside": "^3.0.1",
-        "reactstrap": "^9.2.2"
+        "react-router-bootstrap": "^0.24.4",
+        "reactstrap": "^9.2.2",
+        "rollup-plugin-postcss": "^3.1.3"
     }
 }

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

@@ -28,6 +28,99 @@
         });
     },
 
+    GetSmallModel: async function (viewer, version, signal, callback, error) {        
+        function ConvertToInt32(buffer) {
+            return new DataView(buffer).getInt32(0, true);
+        }
+        
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+        var paramObj = {};
+
+        paramObj.itemId = BIMCommon.FileItemId;
+        paramObj.version = version;
+        paramObj.canvasBoundary = viewer.scene.canvas.boundary;
+        paramObj.viewMatrix = Array.from(viewer.camera.viewMatrix);
+        paramObj.projMatrix = Array.from(viewer.camera.projMatrix);
+        paramObj.eye = Array.from(viewer.camera.eye);
+
+        try 
+        {
+            let response = await fetch(webRelativeUrl + "/bimViewer/api/Scene/SmallModel", {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify(paramObj),
+                signal: signal
+            });
+
+
+            if (!response.ok) {
+                console.error(response.status);
+                return;
+            }
+
+            const reader = response.body.getReader({ mode: "byob" });
+
+            async function readModel(reader) {
+                var chunkCountBuffer = await readStream(reader, 4);
+
+                if (!chunkCountBuffer) {
+                    return;
+                }
+
+                var chankCount = ConvertToInt32(chunkCountBuffer);
+
+                for (var i = 0; i < chankCount; i++) {
+                    var chunkSizeBuffer = await readStream(reader, 4);
+
+                    if (!chunkSizeBuffer) {
+                        return;
+                    }
+
+                    var chakSize =  ConvertToInt32(chunkSizeBuffer);
+
+                    if (chakSize != 0) {
+                        var chunkBuffer = await readStream(reader, chakSize);
+
+                        if (!chunkBuffer) {
+                            return;
+                        }
+
+                        callback(chunkBuffer, i);
+                    }
+                }
+            }
+
+            async function readStream(reader, size) {
+                var buffer = new ArrayBuffer(size);
+                let bytesReceived = 0;
+
+                do {      
+                    var { done, value } = await reader.read(new Uint8Array(buffer, bytesReceived, buffer.byteLength - bytesReceived));
+
+                    if (signal.aborted) {
+                        console.log('The download was aborted');
+                        break;
+                    }
+
+                    if (!done ?? value) {
+                        bytesReceived += value.byteLength;
+                        buffer = value.buffer;
+                    } else {
+                        return false;
+                    }    
+                } while (bytesReceived  < size);
+
+                return buffer;
+            }
+
+            await readModel(reader);
+        } catch (e) {
+            console.error('Error receiving files:', e);
+        }
+    },
+
     GetURLParameter: function(sParam) {
         var sPageURL = window.location.search.substring(1);
 

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.121';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.123';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
-    GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject
+    GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.121';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.123';
 
 
 const processByChildIdList = (treeViewNode, event) => {
@@ -624,6 +624,120 @@ class VitroTreeViewPlugin extends TreeViewPlugin
 	}
 }
 
+class VitroXKTLoaderPlugin extends XKTLoaderPlugin {
+    constructor(viewer, cfg = {}) {
+        super(viewer, cfg);
+
+        this._delayBeforeRestore = (cfg.delayBeforeRestore !== false);
+        this._delayBeforeRestoreSeconds = cfg.delayBeforeRestoreSeconds || 1.0;
+        this.smallModelList = [];
+        let timer = this._delayBeforeRestoreSeconds * 1000;
+        let fastMode = false;
+
+        const culledSmallModelList = () => {
+            timer = (this._delayBeforeRestoreSeconds * 1000);
+            if (!fastMode) {
+                this.culledModels();
+                fastMode = true;
+            }
+        };
+
+        const loadSmallModels = () => {
+            this.loadData();
+        };
+
+        this._onCanvasBoundary = viewer.scene.canvas.on("boundary", culledSmallModelList);
+        this._onCameraMatrix = viewer.scene.camera.on("matrix", culledSmallModelList);
+
+        this._onSceneTick = viewer.scene.on("tick", (tickEvent) => {
+            if (!fastMode) {
+                return;
+            }
+            if (this._delayBeforeRestoreSeconds * 1000 > tickEvent.deltaTime) {
+                timer -= tickEvent.deltaTime;
+                if ((!this._delayBeforeRestore) || timer <= 0) {
+                    loadSmallModels();
+                    fastMode = false;
+                }
+            }
+        });
+
+        let down = false;
+
+        this._onSceneMouseDown = viewer.scene.input.on("mousedown", () => {
+            down = true;
+        });
+
+        this._onSceneMouseUp = viewer.scene.input.on("mouseup", () => {
+            down = false;
+        });
+
+        this._onSceneMouseMove = viewer.scene.input.on("mousemove", () => {
+            if (!down) {
+                return;
+            }
+            culledSmallModelList();
+        });
+
+        this.scene = viewer.scene;
+        window.VitroXKTLoaderPlugin = this;
+
+        this.startSmallLoad = false;
+        this.isDeleteModelList = false;
+    }
+
+    culledModels() {
+        if (this.controller) {
+            this.controller.abort();
+        }
+
+        this.smallModelList.forEach(model => {
+            model.culled = true;
+        });
+
+        this.isDeleteModelList = true;
+    }
+
+
+
+    deleteModels() {
+        this.smallModelList.forEach(model => {
+            model.destroy();
+        });
+
+        this.smallModelList = [];
+        this.isDeleteModelList = false;
+    }
+
+    loadSmallPart(data, numPart) {
+
+        if (this.isDeleteModelList) {
+            this.deleteModels();
+        }
+
+        var sceneModel = this.load({
+            id: Date.now() + '_' + this.version + '_' + numPart,
+            xkt: data,
+            edges: true,
+            backfaces: true,
+        });
+
+        this.smallModelList.push(sceneModel);
+
+        sceneModel.on('loaded', () => {
+            sceneModel.IsRunning = false;
+        });
+    }
+
+
+    loadData() {
+        this.controller = new AbortController();
+        if (this.startSmallLoad) {
+            BIMCommon.GetSmallModel(this.viewer.scene, this.version, this.controller.signal, this.loadSmallPart.bind(this));
+        }
+    }
+}
+
 /*! jquery-dialogextend 2.0.3 2014-07-08 */
 (function(){var i;i=jQuery,i.widget("ui.dialogExtend",{version:"2.0.0",modes:{},options:{closable:!0,dblclick:!1,titlebar:!1,icons:{close:"ui-icon-closethick",restore:"ui-icon-newwin"},load:null,beforeRestore:null,restore:null},_create:function(){return this._state="normal",i(this.element[0]).data("ui-dialog")||i.error("jQuery.dialogExtend Error : Only jQuery UI Dialog element is accepted"),this._verifyOptions(),this._initStyles(),this._initButtons(),this._initTitleBar(),this._setState("normal"),this._on("load",function(i){return console.log("test",i)}),this._trigger("load")},_setState:function(t){return i(this.element[0]).removeClass("ui-dialog-"+this._state).addClass("ui-dialog-"+t),this._state=t},_verifyOptions:function(){var t,e,o;!this.options.dblclick||this.options.dblclick in this.modes||(i.error("jQuery.dialogExtend Error : Invalid <dblclick> value '"+this.options.dblclick+"'"),this.options.dblclick=!1),this.options.titlebar&&"none"!==(e=this.options.titlebar)&&"transparent"!==e&&(i.error("jQuery.dialogExtend Error : Invalid <titlebar> value '"+this.options.titlebar+"'"),this.options.titlebar=!1),o=[];for(t in this.modes)this["_verifyOptions_"+t]?o.push(this["_verifyOptions_"+t]()):o.push(void 0);return o},_initStyles:function(){var t,e,o;i(".dialog-extend-css").length||(e="",e+='<style class="dialog-extend-css" type="text/css">',e+=".ui-dialog .ui-dialog-titlebar-buttonpane>a { float: right; }",e+=".ui-dialog .ui-dialog-titlebar-restore { width: 19px; height: 18px; }",e+=".ui-dialog .ui-dialog-titlebar-restore span { display: block; margin: 1px; }",e+=".ui-dialog .ui-dialog-titlebar-restore:hover,",e+=".ui-dialog .ui-dialog-titlebar-restore:focus { padding: 0; }",e+=".ui-dialog .ui-dialog-titlebar ::selection { background-color: transparent; }",e+="</style>",i(e).appendTo("body")),o=[];for(t in this.modes)o.push(this["_initStyles_"+t]());return o},_initButtons:function(){var t,e,o,n,a,l=this;n=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar"),t=i('<div class="ui-dialog-titlebar-buttonpane"></div>').appendTo(n),t.css({position:"absolute",top:"50%",right:"0.3em","margin-top":"-10px",height:"18px"}),n.find(".ui-dialog-titlebar-close").css({position:"relative","float":"right",top:"auto",right:"auto",margin:0}).find(".ui-icon").removeClass("ui-icon-closethick").addClass(this.options.icons.close).end().appendTo(t).end(),t.append('<a class="ui-dialog-titlebar-restore ui-corner-all ui-state-default" href="#"><span class="ui-icon '+this.options.icons.restore+'" title="restore">restore</span></a>').find(".ui-dialog-titlebar-restore").attr("role","button").mouseover(function(){return i(this).addClass("ui-state-hover")}).mouseout(function(){return i(this).removeClass("ui-state-hover")}).focus(function(){return i(this).addClass("ui-state-focus")}).blur(function(){return i(this).removeClass("ui-state-focus")}).end().find(".ui-dialog-titlebar-close").toggle(this.options.closable).end().find(".ui-dialog-titlebar-restore").hide().click(function(i){return i.preventDefault(),l.restore()}).end(),a=this.modes;for(o in a)e=a[o],this._initModuleButton(o,e);return n.dblclick(function(){return l.options.dblclick?"normal"!==l._state?l.restore():l[l.options.dblclick]():void 0}).select(function(){return!1})},_initModuleButton:function(t,e){var o,n=this;return o=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-buttonpane"),o.append('<a class="ui-dialog-titlebar-'+t+' ui-corner-all ui-state-default" href="#" title="'+t+'"><span class="ui-icon '+this.options.icons[t]+'">'+t+"</span></a>").find(".ui-dialog-titlebar-"+t).attr("role","button").mouseover(function(){return i(this).addClass("ui-state-hover")}).mouseout(function(){return i(this).removeClass("ui-state-hover")}).focus(function(){return i(this).addClass("ui-state-focus")}).blur(function(){return i(this).removeClass("ui-state-focus")}).end().find(".ui-dialog-titlebar-"+t).toggle(this.options[e.option]).click(function(i){return i.preventDefault(),n[t]()}).end()},_initTitleBar:function(){var t;switch(this.options.titlebar){case!1:return 0;case"none":return i(this.element[0]).dialog("option","draggable")&&(t=i("<div />").addClass("ui-dialog-draggable-handle").css("cursor","move").height(5),i(this.element[0]).dialog("widget").prepend(t).draggable("option","handle",t)),i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").find(".ui-dialog-title").html("&nbsp;").end().css({"background-color":"transparent","background-image":"none",border:0,position:"absolute",right:0,top:0,"z-index":9999}).end();case"transparent":return i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").css({"background-color":"transparent","background-image":"none",border:0});default:return i.error("jQuery.dialogExtend Error : Invalid <titlebar> value '"+this.options.titlebar+"'")}},state:function(){return this._state},restore:function(){return this._trigger("beforeRestore"),this._restore(),this._toggleButtons(),this._trigger("restore")},_restore:function(){return"normal"!==this._state?(this["_restore_"+this._state](),this._setState("normal"),i(this.element[0]).dialog("widget").focus()):void 0},_saveSnapshot:function(){return"normal"===this._state?(this.original_config_resizable=i(this.element[0]).dialog("option","resizable"),this.original_config_draggable=i(this.element[0]).dialog("option","draggable"),this.original_size_height=i(this.element[0]).dialog("widget").outerHeight(),this.original_size_width=i(this.element[0]).dialog("option","width"),this.original_size_maxHeight=i(this.element[0]).dialog("option","maxHeight"),this.original_position_mode=i(this.element[0]).dialog("widget").css("position"),this.original_position_left=i(this.element[0]).dialog("widget").offset().left-i("body").scrollLeft(),this.original_position_top=i(this.element[0]).dialog("widget").offset().top-i("body").scrollTop(),this.original_titlebar_wrap=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").css("white-space")):void 0},_loadSnapshot:function(){return{config:{resizable:this.original_config_resizable,draggable:this.original_config_draggable},size:{height:this.original_size_height,width:this.original_size_width,maxHeight:this.original_size_maxHeight},position:{mode:this.original_position_mode,left:this.original_position_left,top:this.original_position_top},titlebar:{wrap:this.original_titlebar_wrap}}},_toggleButtons:function(t){var e,o,n,a,l,s;n=t||this._state,i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-restore").toggle("normal"!==n).css({right:"1.4em"}).end(),a=this.modes;for(o in a)e=a[o],i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-"+o).toggle(n!==e.state&&this.options[e.option]);l=this.modes,s=[];for(o in l)e=l[o],e.state===n?s.push(i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-restore").insertAfter(i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-"+o)).end()):s.push(void 0);return s}})}).call(this),function(){var i;i=jQuery,i.extend(!0,i.ui.dialogExtend.prototype,{modes:{collapse:{option:"collapsable",state:"collapsed"}},options:{collapsable:!1,icons:{collapse:"ui-icon-triangle-1-s"},beforeCollapse:null,collapse:null},collapse:function(){var t,e;return t=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").height()+15,this._trigger("beforeCollapse"),"normal"!==this._state&&this._restore(),this._saveSnapshot(),e=i(this.element[0]).dialog("widget").position(),i(this.element[0]).dialog("option",{resizable:!1,height:t,maxHeight:t,position:[e.left-i(document).scrollLeft(),e.top-i(document).scrollTop()]}).on("dialogclose",this._collapse_restore).hide().dialog("widget").find(".ui-dialog-buttonpane:visible").hide().end().find(".ui-dialog-titlebar").css("white-space","nowrap").end().find(".ui-dialog-content"),this._setState("collapsed"),this._toggleButtons(),this._trigger("collapse")},_restore_collapsed:function(){var t;return t=this._loadSnapshot(),i(this.element[0]).show().dialog("widget").find(".ui-dialog-buttonpane:hidden").show().end().find(".ui-dialog-titlebar").css("white-space",t.titlebar.wrap).end().find(".ui-dialog-content").dialog("option",{resizable:t.config.resizable,height:t.size.height,maxHeight:t.size.maxHeight}).off("dialogclose",this._collapse_restore)},_initStyles_collapse:function(){var t;return i(".dialog-extend-collapse-css").length?void 0:(t="",t+='<style class="dialog-extend-collapse-css" type="text/css">',t+=".ui-dialog .ui-dialog-titlebar-collapse { width: 19px; height: 18px; }",t+=".ui-dialog .ui-dialog-titlebar-collapse span { display: block; margin: 1px; }",t+=".ui-dialog .ui-dialog-titlebar-collapse:hover,",t+=".ui-dialog .ui-dialog-titlebar-collapse:focus { padding: 0; }",t+="</style>",i(t).appendTo("body"))},_collapse_restore:function(){return i(this).dialogExtend("restore")}})}.call(this),function(){var i;i=jQuery,i.extend(!0,i.ui.dialogExtend.prototype,{modes:{maximize:{option:"maximizable",state:"maximized"}},options:{maximizable:!1,icons:{maximize:"ui-icon-extlink"},beforeMaximize:null,maximize:null},maximize:function(){var t,e;return t=i(window).height()-11,e=i(window).width()-11,this._trigger("beforeMaximize"),"normal"!==this._state&&this._restore(),this._saveSnapshot(),i(this.element[0]).dialog("option","draggable")&&i(this.element[0]).dialog("widget").draggable("option","handle",null).find(".ui-dialog-draggable-handle").css("cursor","text").end(),i(this.element[0]).dialog("widget").css("position","fixed").find(".ui-dialog-content").show().dialog("widget").find(".ui-dialog-buttonpane").show().end().find(".ui-dialog-content").dialog("option",{resizable:!1,draggable:!1,height:t,width:e,position:{my:"left top",at:"left top",of:window}}),this._setState("maximized"),this._toggleButtons(),this._trigger("maximize")},_restore_maximized:function(){var t;return t=this._loadSnapshot(),i(this.element[0]).dialog("widget").css("position",t.position.mode).find(".ui-dialog-titlebar").css("white-space",t.titlebar.wrap).end().find(".ui-dialog-content").dialog("option",{resizable:t.config.resizable,draggable:t.config.draggable,height:t.size.height,width:t.size.width,maxHeight:t.size.maxHeight,position:{my:"left top",at:"left+"+t.position.left+" top+"+t.position.top,of:window}}),i(this.element[0]).dialog("option","draggable")?i(this.element[0]).dialog("widget").draggable("option","handle",i(this.element[0]).dialog("widget").find(".ui-dialog-draggable-handle").length?i(this.element[0]).dialog("widget").find(".ui-dialog-draggable-handle"):".ui-dialog-titlebar").find(".ui-dialog-draggable-handle").css("cursor","move"):void 0},_initStyles_maximize:function(){var t;return i(".dialog-extend-maximize-css").length?void 0:(t="",t+='<style class="dialog-extend-maximize-css" type="text/css">',t+=".ui-dialog .ui-dialog-titlebar-maximize { width: 19px; height: 18px; }",t+=".ui-dialog .ui-dialog-titlebar-maximize span { display: block; margin: 1px; }",t+=".ui-dialog .ui-dialog-titlebar-maximize:hover,",t+=".ui-dialog .ui-dialog-titlebar-maximize:focus { padding: 0; }",t+="</style>",i(t).appendTo("body"))}})}.call(this),function(){var i;i=jQuery,i.extend(!0,i.ui.dialogExtend.prototype,{modes:{minimize:{option:"minimizable",state:"minimized"}},options:{minimizable:!1,minimizeLocation:"left",icons:{minimize:"ui-icon-minus"},beforeMinimize:null,minimize:null},minimize:function(){var t,e,o;return this._trigger("beforeMinimize"),"normal"!==this._state&&this._restore(),o=200,i("#dialog-extend-fixed-container").length?e=i("#dialog-extend-fixed-container"):(e=i('<div id="dialog-extend-fixed-container"></div>').appendTo("body"),e.css({position:"fixed",bottom:1,left:1,right:1,"z-index":9999})),this._toggleButtons("minimized"),t=i(this.element[0]).dialog("widget").clone().children().remove().end(),i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").clone(!0,!0).appendTo(t),t.css({"float":this.options.minimizeLocation,margin:1}),e.append(t),i(this.element[0]).data("dialog-extend-minimize-controls",t),i(this.element[0]).dialog("option","draggable")&&t.removeClass("ui-draggable"),t.css({height:"auto",width:o,position:"static"}),i(this.element[0]).on("dialogbeforeclose",this._minimize_restoreOnClose).dialog("widget").hide(),this._setState("minimized"),this._trigger("minimize")},_restore_minimized:function(){return i(this.element[0]).dialog("widget").show(),i(this.element[0]).off("dialogbeforeclose",this._minimize_restoreOnClose),i(this.element[0]).data("dialog-extend-minimize-controls").remove(),i(this.element[0]).removeData("dialog-extend-minimize-controls")},_initStyles_minimize:function(){var t;return i(".dialog-extend-minimize-css").length?void 0:(t="",t+='<style class="dialog-extend-minimize-css" type="text/css">',t+=".ui-dialog .ui-dialog-titlebar-minimize { width: 19px; height: 18px; }",t+=".ui-dialog .ui-dialog-titlebar-minimize span { display: block; margin: 1px; }",t+=".ui-dialog .ui-dialog-titlebar-minimize:hover,",t+=".ui-dialog .ui-dialog-titlebar-minimize:focus { padding: 0; }",t+="</style>",i(t).appendTo("body"))},_verifyOptions_minimize:function(){var t;return!this.options.minimizeLocation||"left"!==(t=this.options.minimizeLocation)&&"right"!==t?(i.error("jQuery.dialogExtend Error : Invalid <minimizeLocation> value '"+this.options.minimizeLocation+"'"),this.options.minimizeLocation="left"):void 0},_minimize_restoreOnClose:function(){return i(this).dialogExtend("restore")}})}.call(this);window.initBimViewer = function(context) {var angleMeasurementsData = [
 
@@ -3502,6 +3616,10 @@ function doCompare() {
             window.model2 = xktLoader.load(settings);
             window.model2.on('loaded', () => {
                 viewer.scene.canvas.spinner.processes++;
+                var vitroModelLoader = new VitroXKTLoaderPlugin(viewer);
+
+                vitroModelLoader.version = BIMCommon.FileCompareVersion;
+                vitroModelLoader.startSmallLoad = true;
                 doCompareModels(isCompareSideBySide);
             });
         })
@@ -3545,6 +3663,77 @@ function convertProperty(data) {
         }
     }
 
+    return groups;
+}
+
+function modelOnLoaded() {
+
+	window.model.fileVersion = fileVersion;
+	window.model.filename = srcModel.substring(srcModel.lastIndexOf('/') + 1).replace('.xkt', '');
+    //------------------------------------------------------------------------------------------------------------------
+    // Create some Annotations
+    //------------------------------------------------------------------------------------------------------------------
+    loadAnnotations();
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Custom Colorize Entity
+    //------------------------------------------------------------------------------------------------------------------
+    viewer.scene.setObjectsColorized(['2O2Fr$t4X7Zf8NOew3FLPP'], [1.0, 0.0, 0.8]); // entityId, color
+
+    //----------------------------------------------------------------------------------------------------------
+    // Angle Measurements
+    //----------------------------------------------------------------------------------------------------------
+    const angleMeasurements = createAngleMeasurements(angleMeasurementsData);
+
+    //----------------------------------------------------------------------------------------------------------
+    // Storey Views
+    //----------------------------------------------------------------------------------------------------------
+    // ????????! ???? ?? initStoreyViews ????? ?????? SectionPlane -> ???????? ?????? ?????? ????? ????????? ? "??????????" ????
+    // ?? ??? ????? ?????? ??????? ????? ??????????? ???????? ??????????? SectionPlane
+    initStoreyViews();
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Load predefined SectionPlanes
+    //------------------------------------------------------------------------------------------------------------------
+    createSectionPlane();
+
+    //----------------------------------------------------------------------------------------------------------
+    // Distance Measurements
+    //----------------------------------------------------------------------------------------------------------
+    const distanceMeasurements = createDistanceMeasurements(distanceMeasurementsData);
+
+    ViewFitAll(viewer);
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Load Small Scene
+    //------------------------------------------------------------------------------------------------------------------
+
+    var vitroModelLoader = new VitroXKTLoaderPlugin(viewer);
+
+    vitroModelLoader.version = BIMCommon.FileVersion;
+    vitroModelLoader.startSmallLoad = true;
+}
+
+function convertProperty(data) {
+    let groups = [];
+
+    for (let property of data) {
+        let existingGroups = groups.filter(group => group.name == property.groupName);
+        if (existingGroups.length > 0) {
+            existingGroups[0].properties.push({ name: property.name, value: getPropertyValue(property) });
+        }
+        else {
+            let newGroup = {
+                name: property.groupName,
+                properties: [],
+            };
+            newGroup.properties.push({ name: property.name, value: getPropertyValue(property) });
+
+
+            groups.push(newGroup);
+        }
+    }
+
     return groups;
 }
 //------------------------------------------------------------------------------------------------------------------
@@ -3603,11 +3792,11 @@ BIMCommon.GetFileItem(context.file.id, versionStr, function (modelId) {
         fileVersion = '';
         fileVersionPath = filePath;
         hideXeokitSpinner();
-        doLoadModel();
-
 
         BIMCommon.FileVersion = versionStr;
         BIMCommon.FileItemId = context.file.id;
+
+        doLoadModel();
     })
     
 }, function () {