Update label text when loading labels file, and store label text with…

… EDM object to do this
HSF · Sep 21, 2024 · ee69d1b · ee69d1b
1 parent 15d37d8
commit ee69d1b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/packages/phoenix-event-display/src/loaders/phoenix-loader.ts b/packages/phoenix-event-display/src/loaders/phoenix-loader.ts
@@ -736,7 +736,9 @@ export class PhoenixLoader implements EventDataLoader {
           this.labelsObject[eventDataType][collection] || {};
 
         this.labelsObject[eventDataType][collection][indexInCollection] = label;
-
+        const tmp =
+          this.eventData[eventDataType][collection][indexInCollection];
+        tmp.labelText = label;
         return getLabelTitle(eventDataType, collection, indexInCollection);
       }
     }

diff --git a/packages/phoenix-event-display/src/managers/ui-manager/index.ts b/packages/phoenix-event-display/src/managers/ui-manager/index.ts
@@ -566,10 +566,20 @@ export class UIManager {
     const labelsObject = eventDataLoader?.getLabelsObject();
     if (eventDataLoader && labelsObject) {
       loadFile((data) => {
+        console.log('UIManager: loading Labels');
         const labelsObject = JSON.parse(data);
+        // This contains the names of the labels, but not their colours.
         for (const eventDataType of Object.keys(labelsObject)) {
           for (const collection of Object.keys(labelsObject[eventDataType])) {
             const collectionObject = eventDataLoader.getCollection(collection);
+            if (!collectionObject) {
+              console.log(
+                'WARNING - cannot find ',
+                collection,
+                ' in eventDataLoader. Skipping.',
+              );
+              continue;
+            }
             for (const labelIndex of Object.keys(
               labelsObject[eventDataType][collection],
             )) {

diff --git a/...ui-menu/collections-info/collections-info-overlay/collections-info-overlay.component.html b/...ui-menu/collections-info/collections-info-overlay/collections-info-overlay.component.html
@@ -116,6 +116,7 @@
                   <input
                     class="form-control form-control-sm"
                     type="text"
+                    value="{{ object.labelText }}"
                     [id]="'label' + i"
                   />
                 </div>

diff --git a/...s/ui-menu/collections-info/collections-info-overlay/collections-info-overlay.component.ts b/...s/ui-menu/collections-info/collections-info-overlay/collections-info-overlay.component.ts
@@ -51,7 +51,7 @@ export class CollectionsInfoOverlayComponent implements OnInit {
       }));
 
     this.collectionColumns = Object.keys(this.showingCollection[0]).filter(
-      (column) => !['uuid', 'hits', 'isCut'].includes(column), // FIXME - this is an ugly hack. But currently hits from tracks make track collections unusable. Better to have exlusion list passed in.
+      (column) => !['uuid', 'hits', 'isCut', 'labelText'].includes(column), // FIXME - this is an ugly hack. But currently hits from tracks make track collections unusable. Better to have exlusion list passed in.
     );
   }
-Original file line number
+Diff line change
@@ Expand Up @@
           }));
         this.collectionColumns = Object.keys(this.showingCollection[0]).filter(
-          (column) => !['uuid', 'hits', 'isCut'].includes(column), // FIXME - this is an ugly hack. But currently hits from tracks make track collections unusable. Better to have exlusion list passed in.
+          (column) => !['uuid', 'hits', 'isCut', 'labelText'].includes(column), // FIXME - this is an ugly hack. But currently hits from tracks make track collections unusable. Better to have exlusion list passed in.
         );
       }
@@ Expand Down @@