feat(event-display): delete label on empty value and change add label…

… icon
HSF · Feb 8, 2021 · 3756330 · 3756330
1 parent 79e6d7c
commit 3756330
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 9 deletions.
diff --git a/packages/phoenix-event-display/src/event-display.ts b/packages/phoenix-event-display/src/event-display.ts
@@ -636,6 +636,13 @@ export class EventDisplay {
    */
   public addLabelToObject(label: string, collection: string, indexInCollection: number, uuid: string) {
     const labelId = this.configuration.eventDataLoader.addLabelToEventObject(label, collection, indexInCollection);
+
+    // Remove the label if the string is empty
+    if (!label) {
+      this.ui.removeLabel(labelId);
+      return;
+    }
+
     this.ui.addLabel(labelId);
     this.graphicsLibrary.addLabelToObject(label, uuid, labelId);
   }

diff --git a/packages/phoenix-event-display/src/ui/index.ts b/packages/phoenix-event-display/src/ui/index.ts
@@ -598,18 +598,34 @@ export class UIManager {
         labelNode.addConfig('button', {
           label: 'Remove',
           onClick: () => {
-            labelNode.remove();
-            this.three.getSceneManager().removeLabel(labelId);
-            const objectKeys = labelId.split(' > ');
-            // this.labelsObject[EventDataType][Collection][Index]
-            const labelsObject = this.configuration.eventDataLoader?.getLabelsObject();
-            delete labelsObject?.[objectKeys[0]]?.[objectKeys[1]]?.[objectKeys[2]];
+            this.removeLabel(labelId, labelNode);
           }
         });
       }
     }
   }
 
+  /**
+   * Remove label from UI, scene and event data loader if it exists.
+   * @param labelId A unique label ID string.
+   * @param labelNode Phoenix menu node of the label if any.
+   */
+  public removeLabel(labelId: string, labelNode?: PhoenixMenuNode) {
+    if (!labelNode) {
+      labelNode = this.labelsFolderPM?.children.find((singleLabelNode) => singleLabelNode.name === labelId);
+    }
+
+    if (labelNode) {
+      this.three.getSceneManager().removeLabel(labelId);
+      const objectKeys = labelId.split(' > ');
+      // labelsObject[EventDataType][Collection][Index]
+      const labelsObject = this.configuration.eventDataLoader?.getLabelsObject();
+      delete labelsObject?.[objectKeys[0]]?.[objectKeys[1]]?.[objectKeys[2]];
+
+      labelNode.remove();
+    }
+  }
+
   /**
    * Rotate the clipping on detector geometry.
    * @param angle Angle of rotation of the clipping.

diff --git a/packages/phoenix-ng/projects/phoenix-app/src/assets/icons/update.svg b/packages/phoenix-ng/projects/phoenix-app/src/assets/icons/update.svg
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
@@ -49,9 +49,9 @@
                   <input class="form-control form-control-sm" type="text" [id]="'label' + i" />
                 </div>
                 <div class="col-2 p-0 pl-2 text-center icon-wrapper">
-                  <div class="object-select" matTooltip="Add label to object" (click)="addLabel(i, object.uuid)">
+                  <div class="object-select" matTooltip="Add / update / remove object label" (click)="addLabel(i, object.uuid)">
                     <svg>
-                      <use href="assets/icons/add-icon.svg#add-icon"></use>
+                      <use href="assets/icons/update.svg#update"></use>
                     </svg>
                   </div>
                 </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,8 @@ export class CollectionsInfoOverlayComponent implements OnInit {
 
   addLabel(index: number, uuid: string) {
     const labelValue = this.elementRef.nativeElement.querySelector(`#label${index}`).value;
-    if (labelValue && this.selectedCollection) {
+    if (this.selectedCollection) {
+      // Empty labelValue will remove the label object
       this.eventDisplay.addLabelToObject(labelValue, this.selectedCollection, index, uuid);
     }
   }