diff --git a/packages/phoenix-event-display/src/event-display.ts b/packages/phoenix-event-display/src/event-display.ts index 2b05ab64..d42ea11c 100644 --- a/packages/phoenix-event-display/src/event-display.ts +++ b/packages/phoenix-event-display/src/event-display.ts @@ -333,8 +333,8 @@ export class EventDisplay { * @returns Promise for loading the geometry. */ public async parseGLTFGeometry(file: File): Promise { - name = file.name.split('/').pop(); - this.loadingManager.addLoadableItem(`parse_gltf_${name}`); + const filename = file.name.split('/').pop(); + this.loadingManager.addLoadableItem(`parse_gltf_${filename}`); const allGeometriesUIParameters = await this.graphicsLibrary.parseGLTFGeometry(file); @@ -342,7 +342,7 @@ export class EventDisplay { this.ui.addGeometry(object, menuNodeName); } - this.loadingManager.itemLoaded(`parse_gltf_${name}`); + this.loadingManager.itemLoaded(`parse_gltf_${filename}`); } /** diff --git a/packages/phoenix-event-display/src/managers/three-manager/import-manager.ts b/packages/phoenix-event-display/src/managers/three-manager/import-manager.ts index 53a32587..7a7677d0 100644 --- a/packages/phoenix-event-display/src/managers/three-manager/import-manager.ts +++ b/packages/phoenix-event-display/src/managers/three-manager/import-manager.ts @@ -222,8 +222,8 @@ export class ImportManager { callback: ( fileContent: ArrayBuffer, path: string, - name: string - ) => Promise + name: string, + ) => Promise, ): Promise { if (typeof file != 'string') { file = file.name; @@ -235,7 +235,7 @@ export class ImportManager { if (file.split('.').pop() == 'zip') { try { JSZip.loadAsync(data).then((archive) => { - const promises: Promise[] = []; + const promises: Promise[] = []; for (const filePath in archive.files) { promises.push( archive @@ -243,7 +243,7 @@ export class ImportManager { .async('arraybuffer') .then((fileData) => { return callback(fileData, path, filePath.split('.')[0]); - }) + }), ); } let allGeometriesUIParameters: GeometryUIParameters[] = []; @@ -256,9 +256,9 @@ export class ImportManager { }); }); } catch (error) { - this.eventDisplay - .getInfoLogger() - .add('Could not read zip file', 'Error'); + // this.eventDisplay + // .getInfoLogger() + // .add('Could not read zip file', 'Error'); reject(error); } } else { @@ -268,7 +268,7 @@ export class ImportManager { }, (error) => { reject(error); - } + }, ); } }); @@ -302,9 +302,9 @@ export class ImportManager { name, menuNodeName, scale, - initiallyVisible + initiallyVisible, ); - } + }, ); } @@ -324,7 +324,7 @@ export class ImportManager { name: string, menuNodeName: string, scale: number, - initiallyVisible: boolean + initiallyVisible: boolean, ): Promise { const loader = new GLTFLoader(); const dracoLoader = new DRACOLoader(); @@ -410,8 +410,11 @@ export class ImportManager { * @param fileName of the geometry file (.gltf,.glb or a zip with such file(s)) * @returns Promise for loading the geometry. */ - private parseGLTFGeometry(fileName: string): Promise { - return this.zipHandlingWrapper(fileName, parseGLTFGeometryFromArrayBuffer); + public parseGLTFGeometry(fileName: string): Promise { + return this.zipHandlingWrapper( + fileName, + this.parseGLTFGeometryFromArrayBuffer, + ); } /** Parses and loads a geometry in GLTF (.gltf) format. diff --git a/packages/phoenix-event-display/src/managers/three-manager/index.ts b/packages/phoenix-event-display/src/managers/three-manager/index.ts index f2f0f198..4b377893 100644 --- a/packages/phoenix-event-display/src/managers/three-manager/index.ts +++ b/packages/phoenix-event-display/src/managers/three-manager/index.ts @@ -836,7 +836,7 @@ export class ThreeManager { */ public async parseGLTFGeometry(file: File): Promise { const allGeometriesUIParameters = - await this.importManager.parseGLTFGeometry(file); + await this.importManager.parseGLTFGeometry(file.name); for (const { object } of allGeometriesUIParameters) { this.sceneManager.getGeometries().add(object);