From 2c2645a99d17c32aa570876376cab30454a2cfe1 Mon Sep 17 00:00:00 2001 From: Edward Moyse Date: Tue, 14 May 2024 11:27:21 +0200 Subject: [PATCH 1/2] Revert "Be consistent about interface of parseGLTFGeometry" This reverts commit 28ce7750093dffa6d1f372df614d37f5d3ad660c. --- .../src/managers/three-manager/import-manager.ts | 4 ++-- .../phoenix-event-display/src/managers/three-manager/index.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 519663e8..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 @@ -410,9 +410,9 @@ export class ImportManager { * @param fileName of the geometry file (.gltf,.glb or a zip with such file(s)) * @returns Promise for loading the geometry. */ - public parseGLTFGeometry(file: File): Promise { + public parseGLTFGeometry(fileName: string): Promise { return this.zipHandlingWrapper( - file.name, + fileName, this.parseGLTFGeometryFromArrayBuffer, ); } 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); From e19b602b41bc79c618712d445b7527384d87b44b Mon Sep 17 00:00:00 2001 From: Edward Moyse Date: Tue, 14 May 2024 11:39:00 +0200 Subject: [PATCH 2/2] Print warning message to console. --- .../src/managers/three-manager/import-manager.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 7a7677d0..1c3c8e96 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 @@ -256,9 +256,7 @@ export class ImportManager { }); }); } catch (error) { - // this.eventDisplay - // .getInfoLogger() - // .add('Could not read zip file', 'Error'); + console.warn('Could not read zip file', 'Error'); reject(error); } } else {