Merge pull request #687 from HSF/improve-labels

Improve labels
HSF · Sep 21, 2024 · 956d722 · 956d722
2 parents 407445a + 01c3b94
commit 956d722
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/packages/phoenix-event-display/src/helpers/file.ts b/packages/phoenix-event-display/src/helpers/file.ts
@@ -53,6 +53,6 @@ export const loadFile = (
   };
 
   inputFile.oninput = fileSelected;
-  inputFile.onchange = fileSelected;
+  // inputFile.onchange = fileSelected;
   inputFile.click();
 };
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/packages/phoenix-event-display/src/managers/ui-manager/phoenix-menu/phoenix-menu-node.ts b/packages/phoenix-event-display/src/managers/ui-manager/phoenix-menu/phoenix-menu-node.ts
@@ -150,13 +150,12 @@ export class PhoenixMenuNode {
     // Apply configs of different config types - manual
     if (config.type === 'checkbox' && config?.['isChecked']) {
       config.onChange?.(config?.['isChecked']);
-    } else if (
-      config.type === 'color' &&
-      config?.['color'] &&
-      config.group !== undefined
-    ) {
-      // Ignore color by options with `!config.group`, otherwise the collection color is overridden
-      config.onChange?.(config?.['color']);
+    } else if (config.type === 'color' && config?.['color']) {
+      if (config.group !== undefined || this.name === 'Labels') {
+        // Ignore color by options with `!config.group`, otherwise the collection color is overridden
+        // Exception for Labels node, which should always have color applied
+        config.onChange?.(config?.['color']);
+      }
     } else if (config.type === 'slider' && config?.['value']) {
       config.onChange?.(config?.['value']);
     } else if (
@@ -216,8 +215,6 @@ export class PhoenixMenuNode {
           nodeConfig.type === configState['type'] &&
           nodeConfig.label === configState['label'],
       );
-      // configs: PhoenixMenuConfigs[keyof PhoenixMenuConfigs][] = [];
-
       if (nodeConfigs.length > 1) {
         console.error(
           'Multiple configs found with same label and type in phoenix menu node.',

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.
     );
   }