Fix for some compilation issues

HSF · May 3, 2024 · f7fc41f · f7fc41f
1 parent 6effabb
commit f7fc41f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/packages/phoenix-event-display/src/event-display.ts b/packages/phoenix-event-display/src/event-display.ts
@@ -333,16 +333,16 @@ export class EventDisplay {
    * @returns Promise for loading the geometry.
    */
   public async parseGLTFGeometry(file: File): Promise<void> {
-    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);
     for (const { object, menuNodeName } of allGeometriesUIParameters) {
       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
@@ -222,8 +222,8 @@ export class ImportManager {
     callback: (
       fileContent: ArrayBuffer,
       path: string,
-      name: string
-    ) => Promise<GeometryUIParameters[]>
+      name: string,
+    ) => Promise<GeometryUIParameters[]>,
   ): Promise<GeometryUIParameters[]> {
     if (typeof file != 'string') {
       file = file.name;
@@ -235,15 +235,15 @@ export class ImportManager {
           if (file.split('.').pop() == 'zip') {
             try {
               JSZip.loadAsync(data).then((archive) => {
-                const promises: Promise[] = [];
+                const promises: Promise<GeometryUIParameters[]>[] = [];
                 for (const filePath in archive.files) {
                   promises.push(
                     archive
                       .file(filePath)
                       .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<GeometryUIParameters[]> {
     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<GeometryUIParameters[]> {
-    return this.zipHandlingWrapper(fileName, parseGLTFGeometryFromArrayBuffer);
+  public parseGLTFGeometry(fileName: string): Promise<GeometryUIParameters[]> {
+    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
@@ -836,7 +836,7 @@ export class ThreeManager {
    */
   public async parseGLTFGeometry(file: File): Promise<GeometryUIParameters[]> {
     const allGeometriesUIParameters =
-      await this.importManager.parseGLTFGeometry(file);
+      await this.importManager.parseGLTFGeometry(file.name);
 
     for (const { object } of allGeometriesUIParameters) {
       this.sceneManager.getGeometries().add(object);