@vitrosoftware/common-ui-ts 1.1.250 → 1.1.252

package/dist/src/controls/TableView/services/TableViewService.d.ts

@@ -152,4 +152,5 @@ export interface TableViewService {
     getBodyWidth(): number;
     getBodyScrollWidth(): number;
     getLastVisibleCol(section?: number): string;
+    calcWidth(col: string): void;
 }

package/dist/src/controls/TableView/services/impl/TableViewServiceImpl.d.ts

@@ -167,4 +167,5 @@ export declare class TableViewServiceImpl implements services.TableViewService {
     getBodyWidth(): number;
     getBodyScrollWidth(): number;
     getLastVisibleCol(section?: number): string;
+    calcWidth(col: string): void;
 }

package/package.json

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

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.250';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.252';
 
 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.250';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.252';
 
 
 //----------------------------------------------------------------------------------------------------------------------

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

@@ -1,18 +1,18 @@
-import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.250';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.250';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.250';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.250';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.250';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.250';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.250';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.250';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.250';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.250';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.250';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.250';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.250';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.250';
-import * as fflate from '/resource/dxfViewer/js/fflate/fflate.module.js?version=1.1.250'
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.252';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.252';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.252';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.252';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.252';
+import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.252';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.252';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.252';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.252';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.252';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.252';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.252';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.252';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.252';
+import * as fflate from '/resource/dxfViewer/js/fflate/fflate.module.js?version=1.1.252'
 
 let treeViewData = [];
 let notes = [];
@@ -162,7 +162,7 @@ export class VitroBatch {
                 geometry.setIndex(chunk.indices)
             }
             const obj = new objConstructor(geometry, material)
-            obj.frustumCulled = false
+            obj.frustumCulled = true
             obj.matrixAutoUpdate = false
             obj._dxfViewerLayer = layer
 			if (chunk && chunk.handle) {
@@ -440,10 +440,16 @@ export class VitroDxfScene extends DxfScene {
         /* Scan all entities to analyze block usage statistics and create viewport vertices. */
         this.layouts = []
         this.viewports = []
+        console.log("_ProcessInserts")
         this._ProcessInserts(dxf)
+        console.log("_ProcessEntities")
         this._ProcessEntities(dxf)
+        console.log("_ProcessLayouts")
         this._ProcessLayouts(dxf)
 
+        console.log("_FreeMemory")
+        this._FreeMemory(dxf)
+        console.log("_BuildScene")
         this.scene = this._BuildScene()
         this.scene.layouts = this.layouts
         this.scene.tileMode = dxf.header["$TILEMODE"] || 0
@@ -451,7 +457,6 @@ export class VitroDxfScene extends DxfScene {
         delete this.batches//not used RBTree -> replaced by vitroBatches array (ordered for render)
         delete this.vitroRenderBatches
         delete this.layers
-        delete this.blocks
         delete this.textRenderer
         delete this.layouts
         delete this.viewports
@@ -460,6 +465,25 @@ export class VitroDxfScene extends DxfScene {
         delete this.overlays
     }
 
+    _FreeMemory(dxf) {
+        for (const block of this.blocks.values()) {
+            if (block.HasEntities()) {
+                for (const entity of block.data.entities) {
+                    if (entity.type !== "VIEWPORT") {
+                        entity.vertices = null
+                    }
+                }
+            }
+        }
+        delete this.blocks
+
+        for (const entity of dxf.entities) {
+            if (entity.type !== "VIEWPORT") {
+                entity.vertices = null
+            }
+        }
+    }
+
 	_BuildScene() {
         const originScene = super._BuildScene()
 
@@ -493,8 +517,11 @@ export class VitroDxfScene extends DxfScene {
             transformsOffset: 0
         }
 
-        for (const batch of this.vitroRenderBatches) {
-            scene.batches.push(batch.Serialize(buffers));
+        var i = this.vitroRenderBatches.length
+        while (i--) {
+            scene.batches.push(this.vitroRenderBatches[0].Serialize(buffers));
+            this.vitroRenderBatches[0] = null
+            this.vitroRenderBatches.splice(0, 1);
         }
 
         scene.pointShapeHasDot = originScene.pointShapeHasDot
@@ -575,6 +602,7 @@ export class VitroDxfScene extends DxfScene {
                 this._ProcessDxfEntity(viewport, blockCtx)
             }
 			
+            layout.block.batches = null
             layout.origin = this.origins.get(layout.spaceHandle)
             layout.bounds = this.bounds.get(layout.spaceHandle)
 			if (IsModelSpace(layout.space) && !layout.origin)
@@ -628,8 +656,9 @@ export class VitroDxfScene extends DxfScene {
         for (const block of this.blocks.values()) {
             if (block.HasEntities()) {
                 const blockCtx = block.DefinitionContext()
+                const isSpace = block.IsSpace()
                 for (const entity of block.data.entities) {
-                    if (block.IsSpace()) {
+                    if (isSpace) {
                         if (entity.type === "INSERT") {//analyze block usage statistics
                             this.inserts.set(entity.handle, entity)
                             const blkDef = this.blocks.get(entity.name)
@@ -1341,7 +1370,7 @@ export class Viewer extends DxfViewer {
 			options.colorCorrection = true
 			options.clearColor = new three.Color("#fff")
 			options.buildScene = true
-			options.retainParsedDxf = false,
+			options.retainParsedDxf = true,
 			options.autoZoom = true
 		}
 
@@ -1518,20 +1547,16 @@ export class Viewer extends DxfViewer {
 			this._Emit("init", { layout, isLast: (index + 1) === layoutsLength });
 		}
 		var space = this.CreateSpace(scene.layouts[0], this.camera)//"*Model_Space"
+		console.log("LoadBatches")
 		this.LoadBatches()
 		this._Emit("loaded", { space })
 
-		this.SwitchSpace(scene.layouts[0]);
-
 		if (this.hasMissingChars) {
 			this._Message("Some characters cannot be properly displayed due to missing fonts",
 				MessageLevel.WARN)
 		}
 
-	//	if (!scene.tileMode) {
-	//		this.SwitchSpace(scene.layouts[1])
-	//		return
-	//	}
+		this.Render()
 	}
 
 	Render() {
@@ -1563,7 +1588,9 @@ export class Viewer extends DxfViewer {
 		//render current space entities (viewport borders (for layouts) and etc.)
 		this.renderer.setViewport(0, 0, this.canvasWidth, this.canvasHeight);
 		this.renderer.setScissor(0, 0, this.canvasWidth, this.canvasHeight);
+		console.log("Start render")
 		this.renderer.render(space.scene, this.camera)
+		console.log("Finish render")
 
 		if (isFirstRenderVieports) {
 			this.DoFakeZoomToRedrawScene()
@@ -1596,6 +1623,7 @@ export class Viewer extends DxfViewer {
 				obj.visible = layer.isVisible
 			}
 		}
+		console.info(`Objects added ${space.scene.children.length}`)
 	}
 
 	OnProgress(phase, size, totalSize) {
@@ -1643,7 +1671,7 @@ export class Viewer extends DxfViewer {
 	LoadBatches() {
 		let i = 0;
 		for (const batch of this.scene.batches) {
-			batch.renderOrder = i;
+			batch.renderOrder = 0 //renderer.sortObjects = false -> objects are drawn as added
 			this._LoadBatch(this.scene, batch)
 			i = i + 1
 		}
@@ -1982,6 +2010,7 @@ export class Viewer extends DxfViewer {
 	}
 
 	AddObject(obj) {
+/*
 		this.objects.push(obj)
 		const name = obj.name
 		if (name) {
@@ -1992,6 +2021,7 @@ export class Viewer extends DxfViewer {
 			}
 			objectList.push(obj)
 		}
+*/
 	}
 
 	ZoomTo(input, offset) {
@@ -2752,7 +2782,8 @@ export class VitroRenderBatch extends RenderBatch {
         let curSpace = 0
         for (const chunk of this.chunks) {
             const space = INDEXED_CHUNK_SIZE - chunk.vertices.GetSize() / 3 //vitro 3 instead 2
-            if (space < verticesCount) {
+            if (space < verticesCount
+                || (entity && chunk.handle != entity.handle)) {
                 continue
             }
             if (curChunk === null || space < curSpace) {
@@ -2761,7 +2792,7 @@ export class VitroRenderBatch extends RenderBatch {
             }
         }
 
-        if (curChunk === null || (entity && entity.handle != curChunk.handle)) {
+        if (curChunk === null) {
             curChunk = this._NewChunk(verticesCount)
             if (entity && entity.handle) {//vitro
                 curChunk.handle = entity.handle

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.250",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.252",
     kind: OptionKind.WORKER
   }
 };