From 45d90e57b1f30f4615e7a473dc010c7d41da10dc Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Mon, 26 Oct 2026 09:16:37 +0000 Subject: [PATCH 01/21] Add search bar --- .../alarm/ui/tree/AlarmTreeView.java | 243 +++++++++++++----- 1 file changed, 176 insertions(+), 67 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index f3d65c9801..04c0c1a44c 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -14,6 +14,7 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; +import java.util.Locale; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; @@ -24,6 +25,7 @@ import java.util.stream.Collectors; import javafx.collections.FXCollections; +import javafx.scene.control.TextField; import org.phoebus.applications.alarm.AlarmSystem; import org.phoebus.applications.alarm.client.AlarmClient; import org.phoebus.applications.alarm.client.AlarmClientLeaf; @@ -140,6 +142,8 @@ public class AlarmTreeView extends BorderPane implements AlarmClientListener items.remove(changing); }); + private final TextField searchBox; + // Javadoc for TreeItem shows example for overriding isLeaf() and getChildren() // to dynamically create TreeItem as TreeView requests information. // @@ -176,7 +180,11 @@ public AlarmTreeView(final AlarmClient model, String itemName) tree_view.setCellFactory(view -> new AlarmTreeViewCell()); tree_view.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); - setTop(createToolbar()); + searchBox = new TextField(); + searchBox.setPromptText("Search by PV"); + searchBox.setPrefWidth(300); + + setTop(createToolbar(searchBox)); setCenter(tree_view); createContextMenu(); @@ -234,7 +242,7 @@ private void startup() }); } - private ToolBar createToolbar() + private ToolBar createToolbar(TextField searchBox) { final Button collapse = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/collapse.png")); @@ -255,7 +263,12 @@ private ToolBar createToolbar() show_disabled.setTooltip(new Tooltip("Expand alarm tree to show disabled PVs")); show_disabled.setOnAction(event -> expandDisabledPVs(tree_view.getRoot())); - return new ToolBar(no_server, changing, ToolbarHelper.createSpring(), collapse, show_alarms, show_disabled); + final Button searchButton = new Button("Search"); + + searchButton.setOnAction(event -> propagateSearchDownTree(tree_view.getRoot())); + searchBox.setOnAction(event -> propagateSearchDownTree(tree_view.getRoot())); // act as if button pressed when enter pressed + + return new ToolBar(searchBox, searchButton, no_server, changing, ToolbarHelper.createSpring(), collapse, show_alarms, show_disabled); } ToolBar getToolbar() @@ -263,6 +276,96 @@ ToolBar getToolbar() return (ToolBar) getTop(); } + /** + * Recursively updates the tree so that it only shows the items matching the search. + * + * This is done bottom-up, by recursing down to the leaf nodes initially to determine + * whether they should be visible, and then returning up the tree to determine whether + * each component should be visible or not, and showing/hiding it accordingly. + */ + private boolean propagateSearchDownTree(final TreeItem> item) + { + for (final AlarmTreeItem child : item.getValue().getChildren()) { + final TreeItem> childItem = path2view.get(child.getPathName()); + + final boolean shouldDisplay = propagateSearchDownTree(childItem); + + if (shouldDisplay) { + final boolean doesNotHaveChildAlready = item.getChildren().stream() + .noneMatch(viewChild -> viewChild.getValue().getPathName().equals(child.getPathName())); + if (doesNotHaveChildAlready) { + // should display and does not have child, so add child + addChildToParent(item, childItem); + } + } else { + item.getChildren().removeIf( + alarmTreeItemTreeItem -> alarmTreeItemTreeItem.getValue() == child + ); + } + } + + return shouldDisplay(item); + } + + /** + * Ensures that an item is shown if it matches the search term, and not shown if it does not. + * + * This is done by determining whether the current node should be visible, and then propagating + * up the tree to ensure all the parent nodes are also only visible if they match the search term. + * This does not consider child nodes; it's intended to be called when a single node is added or + * updated to minimise state updates. + */ + private void propagateSearchUpTree(final TreeItem> item) + { + final AlarmTreeItem modelParent = item.getValue().getParent(); + if (modelParent == null) { + // root + return; + } + + final TreeItem> currentParent = item.getParent(); + final TreeItem> actualParent = path2view.get(modelParent.getPathName()); + + final boolean shouldDisplay = shouldDisplay(item); + if (shouldDisplay && currentParent == null) { + // should display but does not have a parent (so will not be displayed) + addChildToParent(actualParent, item); + logger.severe("showing"); + propagateSearchUpTree(actualParent); + } else if (!shouldDisplay && currentParent != null) { + // should not display but has a parent (so will be displayed) + actualParent.getChildren().remove(item); + logger.severe("hiding"); + propagateSearchUpTree(actualParent); + } + } + + private boolean shouldDisplay(final TreeItem> item) { + return (searchBox.getText().isEmpty() || !item.getChildren().isEmpty()) + || item.getValue() instanceof AlarmClientLeaf && item.getValue().getName().toLowerCase().contains(searchBox.getText().toLowerCase()); + } + + /** + * Adds a child TreeItem to a parent TreeItem, ensuring the order is preserved + * + * @param view_parent + * @param view_item + */ + private static void addChildToParent(TreeItem> view_parent, TreeItem> view_item) + { + // Keep sorted by inserting at appropriate index + final List>> items = view_parent.getChildren(); + final int index = Collections.binarySearch(items, view_item, + (a, b) -> CompareNatural.compareTo(a.getValue().getName(), + b.getValue().getName())); + if (items.isEmpty()) + items.add(view_item); // Adding an item to an index of an empty array throws an exception + else if (index < 0) + items.add(-index - 1, view_item); + else + items.add(index, view_item); + } + private void expandAlarms(final TreeItem> node) { if (node.isLeaf()) @@ -331,7 +434,7 @@ private void indicateChange() setCursor(Cursor.WAIT); final ObservableList items = getToolbar().getItems(); if (! items.contains(changing)) - items.add(1, changing); + items.add(3, changing); } else previous.cancel(false); @@ -398,24 +501,23 @@ public void itemAdded(final AlarmTreeItem item) dumpTree(tree_view.getRoot()); throw new IllegalStateException("Missing parent view item for " + item.getPathName()); } - // Create view item ASAP so that following updates will find it.. + // Create view item ASAP so that following model updates will find it.. final TreeItem> view_item = createViewItem(item); // .. but defer showing it on screen to UI thread final CountDownLatch done = new CountDownLatch(1); Platform.runLater(() -> { - indicateChange(); - // Keep sorted by inserting at appropriate index - final List>> items = view_parent.getChildren(); - final int index = Collections.binarySearch(items, view_item, - (a, b) -> CompareNatural.compareTo(a.getValue().getName(), - b.getValue().getName())); - if (index < 0) - items.add(-index-1, view_item); - else - items.add(index, view_item); - done.countDown(); + try { + // Refresh view parent in case it has changed since itemAdded was called + final TreeItem> current_view_parent = path2view.get(model_parent.getPathName()); + + indicateChange(); + addChildToParent(current_view_parent, view_item); + propagateSearchUpTree(view_item); + } finally { + done.countDown(); + } }); updateStats(); @@ -449,15 +551,20 @@ public void itemRemoved(final AlarmTreeItem item) final CountDownLatch done = new CountDownLatch(1); Platform.runLater(() -> { - indicateChange(); - // Can only locate the parent view item on UI thread, - // because item might just have been created by itemAdded() event - // and won't be on the screen until UI thread runs. - final TreeItem> view_parent = view_item.getParent(); - if (view_parent == null) - throw new IllegalStateException("No parent in view for " + item.getPathName()); - view_parent.getChildren().remove(view_item); - done.countDown(); + try { + indicateChange(); + // Can only locate the parent view item on UI thread, + // because item might just have been created by itemAdded() event + // and won't be on the screen until UI thread runs. + final TreeItem> view_parent = view_item.getParent(); + if (view_parent != null) { + // View parent can be null if the item is hidden; this is fine as long as we remove the item from path2view + view_parent.getChildren().remove(view_item); + propagateSearchUpTree(view_item); + } + } finally { + done.countDown(); + } }); updateStats(); @@ -531,49 +638,51 @@ private void performUpdates() items_to_update.clear(); } - // Remember selection - final ObservableList>> updatedSelectedItems = - FXCollections.observableArrayList(tree_view.getSelectionModel().getSelectedItems()); - - // How to update alarm tree cells when data changed? - // `setValue()` with a truly new value (not 'equal') should suffice, - // but there are two problems: - // Since we're currently using the alarm tree model item as a value, - // the value as seen by the TreeView remains the same. - // We could use a model item wrapper class as the cell value - // and replace it (while still holding the same model item!) - // for the TreeView to see a different wrapper value, but - // as shown in org.phoebus.applications.alarm.TreeItemUpdateDemo, - // replacing a tree cell value fails to trigger refreshes - // for certain hidden items. - // Only replacing the TreeItem gives reliable refreshes. - for (final TreeItem> view_item : view_items) - // Top-level item has no parent, and is not visible, so we keep it - if (view_item.getParent() != null) - { - // Locate item in tree parent - final TreeItem> parent = view_item.getParent(); - final int index = parent.getChildren().indexOf(view_item); - - // Create new TreeItem for that value - final AlarmTreeItem value = view_item.getValue(); - final TreeItem> update = new TreeItem<>(value); - if (updatedSelectedItems.contains(view_item)) { - updatedSelectedItems.remove(view_item); - updatedSelectedItems.add(update); + Platform.runLater(() -> { + // Remember selection + final ObservableList>> updatedSelectedItems = + FXCollections.observableArrayList(tree_view.getSelectionModel().getSelectedItems()); + + // How to update alarm tree cells when data changed? + // `setValue()` with a truly new value (not 'equal') should suffice, + // but there are two problems: + // Since we're currently using the alarm tree model item as a value, + // the value as seen by the TreeView remains the same. + // We could use a model item wrapper class as the cell value + // and replace it (while still holding the same model item!) + // for the TreeView to see a different wrapper value, but + // as shown in org.phoebus.applications.alarm.TreeItemUpdateDemo, + // replacing a tree cell value fails to trigger refreshes + // for certain hidden items. + // Only replacing the TreeItem gives reliable refreshes. + for (final TreeItem> view_item : view_items) + // Top-level item has no parent, and is not visible, so we keep it + if (view_item.getParent() != null) + { + // Locate item in tree parent + final TreeItem> parent = view_item.getParent(); + final int index = parent.getChildren().indexOf(view_item); + + // Create new TreeItem for that value + final AlarmTreeItem value = view_item.getValue(); + final TreeItem> update = new TreeItem<>(value); + if (updatedSelectedItems.contains(view_item)) { + updatedSelectedItems.remove(view_item); + updatedSelectedItems.add(update); + } + // Move child links to new item + final ArrayList>> children = new ArrayList<>(view_item.getChildren()); + view_item.getChildren().clear(); + update.getChildren().addAll(children); + update.setExpanded(view_item.isExpanded()); + + path2view.put(value.getPathName(), update); + parent.getChildren().set(index, update); } - // Move child links to new item - final ArrayList>> children = new ArrayList<>(view_item.getChildren()); - view_item.getChildren().clear(); - update.getChildren().addAll(children); - update.setExpanded(view_item.isExpanded()); - - path2view.put(value.getPathName(), update); - parent.getChildren().set(index, update); - } - // Restore selection - tree_view.getSelectionModel().clearSelection(); - updatedSelectedItems.forEach(item -> tree_view.getSelectionModel().select(item)); + // Restore selection + tree_view.getSelectionModel().clearSelection(); + updatedSelectedItems.forEach(item -> tree_view.getSelectionModel().select(item)); + }); } /** Context menu, details depend on selected items */ From 718f4b5950a4ca5c2e02faeb03a0bf4ebfaef90e Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 27 Oct 2026 10:36:50 +0000 Subject: [PATCH 02/21] Improve robustness of alarm tree updates --- .../alarm/ui/area/AlarmAreaView.java | 17 +- .../alarm/ui/tree/AlarmTreeView.java | 210 ++++++++---------- 2 files changed, 108 insertions(+), 119 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/area/AlarmAreaView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/area/AlarmAreaView.java index 63f5762453..809ad3d2e1 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/area/AlarmAreaView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/area/AlarmAreaView.java @@ -75,8 +75,11 @@ public class AlarmAreaView extends StackPane implements AlarmClientListener */ private final AtomicReference> item_changes = new AtomicReference<>(); - /** Set of items that have updated, with iteration order based on when they updated */ - private final Set items_to_update = new LinkedHashSet<>(); + /** Set of items that have updated, with iteration order based on when they updated + * + * SYNC on access + */ + private final Set item_paths_to_update = new LinkedHashSet<>(); /** Throttle [5Hz] used for updates of existing items */ private final UpdateThrottle update_throttle = new UpdateThrottle(200, TimeUnit.MILLISECONDS, this::updateItems); @@ -165,9 +168,9 @@ public void itemUpdated(final AlarmTreeItem item) if (null == item_name) return; - synchronized (items_to_update) + synchronized (item_paths_to_update) { - items_to_update.add(item_name); + item_paths_to_update.add(item_name); } update_throttle.trigger(); } @@ -178,10 +181,10 @@ private void updateItems() final List changed_items = item_changes.getAndSet(null); final String[] update_array; - synchronized (items_to_update) + synchronized (item_paths_to_update) { - update_array = items_to_update.toArray(new String[items_to_update.size()]); - items_to_update.clear(); + update_array = item_paths_to_update.toArray(new String[item_paths_to_update.size()]); + item_paths_to_update.clear(); } Platform.runLater(() -> { diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index f3d65c9801..3671f35bed 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -12,10 +12,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -80,6 +81,14 @@ * as generic JavaFX Node, only calling public methods * defined on this class. * + *

The model (AlarmClient) and the AlarmTreeView are kept in + * sync by a lockstep between model and view updates. When the + * model is changed, it calls item[removed|added]. The AlarmClient + * then blocks until the method returns (i.e. until the UI has + * been updated) and then can move on to the next update. The + * exception to this is itemUpdated, which adds to a queue of + * items to be updated which is then regularly processed. + * * @author Kay Kasemir */ @SuppressWarnings("nls") @@ -112,13 +121,13 @@ public class AlarmTreeView extends BorderPane implements AlarmClientListener private final CountDownLatch block_item_changes = new CountDownLatch(1); /** Map from alarm tree path to view's TreeItem */ - private final ConcurrentHashMap>> path2view = new ConcurrentHashMap<>(); + private final Map>> path2view = new HashMap<>(); /** Items to update, ordered by time of original update request * - * SYNC on access + * SYNC on access */ - private final Set>> items_to_update = new LinkedHashSet<>(); + private final Set item_paths_to_update = new LinkedHashSet<>(); /** Throttle [5Hz] used for updates of existing items */ private final UpdateThrottle throttle = new UpdateThrottle(200, TimeUnit.MILLISECONDS, this::performUpdates); @@ -161,7 +170,7 @@ public AlarmTreeView(final AlarmClient model) { * @param model Model to represent. Must not be running, yet * @param itemName item name that may be expanded or given focus */ - public AlarmTreeView(final AlarmClient model, String itemName) + public AlarmTreeView(final AlarmClient model, final String itemName) { if (model.isRunning()) throw new IllegalStateException(); @@ -387,37 +396,34 @@ private void blockItemChanges() public void itemAdded(final AlarmTreeItem item) { blockItemChanges(); - // System.out.println(Thread.currentThread() + " Add " + item.getPathName()); - - // Parent must already exist - final AlarmTreeItem model_parent = item.getParent(); - final TreeItem> view_parent = path2view.get(model_parent.getPathName()); - if (view_parent == null) - { - dumpTree(tree_view.getRoot()); - throw new IllegalStateException("Missing parent view item for " + item.getPathName()); - } - // Create view item ASAP so that following updates will find it.. - final TreeItem> view_item = createViewItem(item); - - // .. but defer showing it on screen to UI thread final CountDownLatch done = new CountDownLatch(1); + Platform.runLater(() -> { indicateChange(); + + // Parent must already exist + final AlarmTreeItem model_parent = item.getParent(); + final TreeItem> view_parent = path2view.get(model_parent.getPathName()); + + if (view_parent == null) { + dumpTree(tree_view.getRoot()); + throw new IllegalStateException("Missing parent view item for " + item.getPathName()); + } + final TreeItem> view_item = createViewItem(item); + // Keep sorted by inserting at appropriate index final List>> items = view_parent.getChildren(); final int index = Collections.binarySearch(items, view_item, - (a, b) -> CompareNatural.compareTo(a.getValue().getName(), - b.getValue().getName())); + (a, b) -> CompareNatural.compareTo(a.getValue().getName(), + b.getValue().getName())); if (index < 0) - items.add(-index-1, view_item); + items.add(-index - 1, view_item); else items.add(index, view_item); done.countDown(); }); - updateStats(); // Waiting on the UI thread throttles the model's updates // to a rate that the UI can handle. @@ -438,18 +444,19 @@ public void itemAdded(final AlarmTreeItem item) public void itemRemoved(final AlarmTreeItem item) { blockItemChanges(); - // System.out.println(Thread.currentThread() + " Removed " + item.getPathName()); - // Remove item and all sub-items from model2ui - final TreeItem> view_item = removeViewItems(item); - if (view_item == null) - throw new IllegalStateException("No view item for " + item.getPathName()); - - // Remove the corresponding view final CountDownLatch done = new CountDownLatch(1); Platform.runLater(() -> { indicateChange(); + + // Remove item and all sub-items from model2ui + final TreeItem> view_item = removeViewItems(item); + if (view_item == null) + throw new IllegalStateException("No view item for " + item.getPathName()); + + // Remove the corresponding view + // // Can only locate the parent view item on UI thread, // because item might just have been created by itemAdded() event // and won't be on the screen until UI thread runs. @@ -459,7 +466,6 @@ public void itemRemoved(final AlarmTreeItem item) view_parent.getChildren().remove(view_item); done.countDown(); }); - updateStats(); // Waiting on the UI thread throttles the model's updates // to a rate that the UI can handle. @@ -493,87 +499,85 @@ private TreeItem> removeViewItems(final AlarmTreeItem item) public void itemUpdated(final AlarmTreeItem item) { blockItemChanges(); - // System.out.println(Thread.currentThread() + " Updated " + item.getPathName()); - final TreeItem> view_item = path2view.get(item.getPathName()); - if (view_item == null) - { - System.out.println("Unknown view for " + item.getPathName()); - path2view.keySet().stream().forEach(System.out::println); - throw new IllegalStateException("No view item for " + item.getPathName()); - } // UI update of existing item, i.e. // Platform.runLater(() -> TreeHelper.triggerTreeItemRefresh(view_item)); // is throttled. // If several items update, they're all redrawn in one Platform call, // and rapid updates of the same item are merged into just one final update - synchronized (items_to_update) + // We push the path instead of the view item in case the view item is removed + // between now and the update being handled. + synchronized (item_paths_to_update) { - items_to_update.add(view_item); + item_paths_to_update.add(item.getPathName()); } throttle.trigger(); - updateStats(); } /** Called by throttle to perform accumulated updates */ - @SuppressWarnings("unchecked") private void performUpdates() { - final TreeItem>[] view_items; - synchronized (items_to_update) + + // Drain items to update in one go; we will process it later on the main thread + final String[] view_item_paths; + synchronized (item_paths_to_update) { - // Creating a direct copy, i.e. another new LinkedHashSet<>(items_to_update), - // would be expensive, since we only need a _list_ of what's to update. - // Could use type-safe - // new ArrayList>>(items_to_update) - // but that calls toArray() internally, so doing that directly - view_items = items_to_update.toArray(new TreeItem[items_to_update.size()]); - items_to_update.clear(); + view_item_paths = item_paths_to_update.toArray(new String[item_paths_to_update.size()]); + item_paths_to_update.clear(); } - // Remember selection - final ObservableList>> updatedSelectedItems = - FXCollections.observableArrayList(tree_view.getSelectionModel().getSelectedItems()); - - // How to update alarm tree cells when data changed? - // `setValue()` with a truly new value (not 'equal') should suffice, - // but there are two problems: - // Since we're currently using the alarm tree model item as a value, - // the value as seen by the TreeView remains the same. - // We could use a model item wrapper class as the cell value - // and replace it (while still holding the same model item!) - // for the TreeView to see a different wrapper value, but - // as shown in org.phoebus.applications.alarm.TreeItemUpdateDemo, - // replacing a tree cell value fails to trigger refreshes - // for certain hidden items. - // Only replacing the TreeItem gives reliable refreshes. - for (final TreeItem> view_item : view_items) - // Top-level item has no parent, and is not visible, so we keep it - if (view_item.getParent() != null) - { - // Locate item in tree parent - final TreeItem> parent = view_item.getParent(); - final int index = parent.getChildren().indexOf(view_item); - - // Create new TreeItem for that value - final AlarmTreeItem value = view_item.getValue(); - final TreeItem> update = new TreeItem<>(value); - if (updatedSelectedItems.contains(view_item)) { - updatedSelectedItems.remove(view_item); - updatedSelectedItems.add(update); + Platform.runLater(() -> { + // Remember selection + final ObservableList>> updatedSelectedItems = + FXCollections.observableArrayList(tree_view.getSelectionModel().getSelectedItems()); + + // How to update alarm tree cells when data changed? + // `setValue()` with a truly new value (not 'equal') should suffice, + // but there are two problems: + // Since we're currently using the alarm tree model item as a value, + // the value as seen by the TreeView remains the same. + // We could use a model item wrapper class as the cell value + // and replace it (while still holding the same model item!) + // for the TreeView to see a different wrapper value, but + // as shown in org.phoebus.applications.alarm.TreeItemUpdateDemo, + // replacing a tree cell value fails to trigger refreshes + // for certain hidden items. + // Only replacing the TreeItem gives reliable refreshes. + for (final String view_item_path : view_item_paths) { + final TreeItem> view_item = path2view.get(view_item_path); + if (view_item == null) { + // Possible if the item has been removed since it was added to the update queue + continue; + } + + // Top-level item has no parent, and is not visible, so we keep it + if (view_item.getParent() != null) { + // Locate item in tree parent + final TreeItem> parent = view_item.getParent(); + final int index = parent.getChildren().indexOf(view_item); + + // Create new TreeItem for that value + final AlarmTreeItem value = view_item.getValue(); + final TreeItem> update = new TreeItem<>(value); + if (updatedSelectedItems.contains(view_item)) { + updatedSelectedItems.remove(view_item); + updatedSelectedItems.add(update); + } + // Move child links to new item + final ArrayList>> children = new ArrayList<>(view_item.getChildren()); + view_item.getChildren().clear(); + update.getChildren().addAll(children); + update.setExpanded(view_item.isExpanded()); + + path2view.put(value.getPathName(), update); + parent.getChildren().set(index, update); } - // Move child links to new item - final ArrayList>> children = new ArrayList<>(view_item.getChildren()); - view_item.getChildren().clear(); - update.getChildren().addAll(children); - update.setExpanded(view_item.isExpanded()); - - path2view.put(value.getPathName(), update); - parent.getChildren().set(index, update); } - // Restore selection - tree_view.getSelectionModel().clearSelection(); - updatedSelectedItems.forEach(item -> tree_view.getSelectionModel().select(item)); + + // Restore selection + tree_view.getSelectionModel().clearSelection(); + updatedSelectedItems.forEach(item -> tree_view.getSelectionModel().select(item)); + }); } /** Context menu, details depend on selected items */ @@ -689,25 +693,7 @@ private void addDragSupport() }); } -// private long next_stats = 0; -// private final AtomicInteger update_count = new AtomicInteger(); -// private volatile double updates_per_sec = 0.0; - - private void updateStats() - { -// final long time = System.currentTimeMillis(); -// if (time > next_stats) -// { -// final int updates = update_count.getAndSet(0); -// updates_per_sec = updates_per_sec * 0.9 + updates * 0.1; -// next_stats = time + 1000; -// System.out.format("%.2f updates/sec\n", updates_per_sec); -// } -// else -// update_count.incrementAndGet(); - } - - private void dumpTree(TreeItem> item) + private static void dumpTree(final TreeItem> item) { final ObservableList>> children = item.getChildren(); System.out.printf("item: %s , has %d children.\n", item.getValue().getName(), children.size()); From bee80eb545eb58376da72cb3ff7f442e5a4b294c Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 27 Oct 2026 11:41:25 +0000 Subject: [PATCH 03/21] Fix search bar issues --- .../alarm/ui/tree/AlarmTreeView.java | 68 ++++++++----------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index ef31ff9c56..15281de2d6 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -15,7 +15,6 @@ import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; @@ -274,8 +273,8 @@ private ToolBar createToolbar(TextField searchBox) final Button searchButton = new Button("Search"); - searchButton.setOnAction(event -> propagateSearchDownTree(tree_view.getRoot())); - searchBox.setOnAction(event -> propagateSearchDownTree(tree_view.getRoot())); // act as if button pressed when enter pressed + searchButton.setOnAction(event -> propagateVisibilityDownTree(tree_view.getRoot())); + searchBox.setOnAction(event -> propagateVisibilityDownTree(tree_view.getRoot())); // act as if button pressed when enter pressed return new ToolBar(searchBox, searchButton, no_server, changing, ToolbarHelper.createSpring(), collapse, show_alarms, show_disabled); } @@ -285,49 +284,49 @@ ToolBar getToolbar() return (ToolBar) getTop(); } - /** - * Recursively updates the tree so that it only shows the items matching the search. + /** Recursively updates the tree so that it only shows the items matching the search. * * This is done bottom-up, by recursing down to the leaf nodes initially to determine * whether they should be visible, and then returning up the tree to determine whether * each component should be visible or not, and showing/hiding it accordingly. */ - private boolean propagateSearchDownTree(final TreeItem> item) + private boolean propagateVisibilityDownTree(final TreeItem> item) { - for (final AlarmTreeItem child : item.getValue().getChildren()) { + for (final AlarmTreeItem child : item.getValue().getChildren()) + { final TreeItem> childItem = path2view.get(child.getPathName()); - final boolean shouldDisplay = propagateSearchDownTree(childItem); + final boolean shouldDisplay = propagateVisibilityDownTree(childItem); - if (shouldDisplay) { + if (shouldDisplay) + { final boolean doesNotHaveChildAlready = item.getChildren().stream() .noneMatch(viewChild -> viewChild.getValue().getPathName().equals(child.getPathName())); - if (doesNotHaveChildAlready) { + if (doesNotHaveChildAlready) // should display and does not have child, so add child addChildToParent(item, childItem); - } - } else { + } + else item.getChildren().removeIf( alarmTreeItemTreeItem -> alarmTreeItemTreeItem.getValue() == child ); - } } return shouldDisplay(item); } - /** - * Ensures that an item is shown if it matches the search term, and not shown if it does not. + /** Ensures that an item is shown if it matches the search term, and not shown if it does not. * * This is done by determining whether the current node should be visible, and then propagating * up the tree to ensure all the parent nodes are also only visible if they match the search term. * This does not consider child nodes; it's intended to be called when a single node is added or * updated to minimise state updates. */ - private void propagateSearchUpTree(final TreeItem> item) + private void propagateVisibilityUpTree(final TreeItem> item) { final AlarmTreeItem modelParent = item.getValue().getParent(); - if (modelParent == null) { + if (modelParent == null) + { // root return; } @@ -336,20 +335,22 @@ private void propagateSearchUpTree(final TreeItem> item) final TreeItem> actualParent = path2view.get(modelParent.getPathName()); final boolean shouldDisplay = shouldDisplay(item); - if (shouldDisplay && currentParent == null) { + if (shouldDisplay && currentParent == null) + { // should display but does not have a parent (so will not be displayed) addChildToParent(actualParent, item); - logger.severe("showing"); - propagateSearchUpTree(actualParent); - } else if (!shouldDisplay && currentParent != null) { + propagateVisibilityUpTree(actualParent); + } + else if (!shouldDisplay && currentParent != null) + { // should not display but has a parent (so will be displayed) actualParent.getChildren().remove(item); - logger.severe("hiding"); - propagateSearchUpTree(actualParent); + propagateVisibilityUpTree(actualParent); } } - private boolean shouldDisplay(final TreeItem> item) { + private boolean shouldDisplay(final TreeItem> item) + { return (searchBox.getText().isEmpty() || !item.getChildren().isEmpty()) || item.getValue() instanceof AlarmClientLeaf && item.getValue().getName().toLowerCase().contains(searchBox.getText().toLowerCase()); } @@ -367,9 +368,7 @@ private static void addChildToParent(TreeItem> view_parent, Tre final int index = Collections.binarySearch(items, view_item, (a, b) -> CompareNatural.compareTo(a.getValue().getName(), b.getValue().getName())); - if (items.isEmpty()) - items.add(view_item); // Adding an item to an index of an empty array throws an exception - else if (index < 0) + if (index < 0) items.add(-index - 1, view_item); else items.add(index, view_item); @@ -516,15 +515,7 @@ public void itemAdded(final AlarmTreeItem item) } final TreeItem> view_item = createViewItem(item); - // Keep sorted by inserting at appropriate index - final List>> items = view_parent.getChildren(); - final int index = Collections.binarySearch(items, view_item, - (a, b) -> CompareNatural.compareTo(a.getValue().getName(), - b.getValue().getName())); - if (index < 0) - items.add(-index - 1, view_item); - else - items.add(index, view_item); + propagateVisibilityUpTree(view_item); done.countDown(); }); @@ -564,11 +555,10 @@ public void itemRemoved(final AlarmTreeItem item) // because item might just have been created by itemAdded() event // and won't be on the screen until UI thread runs. final TreeItem> view_parent = view_item.getParent(); - if (view_parent == null) + if (view_parent != null) { - // View parent can be null if the item is hidden; this is fine as long as we remove the item from path2view view_parent.getChildren().remove(view_item); - propagateSearchUpTree(view_item); + propagateVisibilityUpTree(view_parent); } done.countDown(); }); From 327d80269ae1588061ce5c683ecb3cdb6c3b82c7 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 27 Oct 2026 13:49:24 +0000 Subject: [PATCH 04/21] Alarm tree search messages localisation --- .../java/org/phoebus/applications/alarm/ui/Messages.java | 2 ++ .../phoebus/applications/alarm/ui/tree/AlarmTreeView.java | 5 +++-- .../org/phoebus/applications/alarm/ui/messages.properties | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java index 13272352db..e8ebd79875 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java @@ -43,6 +43,8 @@ public class Messages public static String promptTitle; public static String removeComponentFailed; public static String renameItemFailed; + public static String search; + public static String searchByPv; public static String totalPVs; public static String unacknowledgeFailed; public static String withEnableDate; diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 15281de2d6..a8c6a51ab1 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -35,6 +35,7 @@ import org.phoebus.applications.alarm.model.BasicState; import org.phoebus.applications.alarm.ui.AlarmContextMenuHelper; import org.phoebus.applications.alarm.ui.AlarmUI; +import org.phoebus.applications.alarm.ui.Messages; import org.phoebus.applications.alarm.ui.config.ItemConfigDialog; import org.phoebus.framework.selection.Selection; import org.phoebus.framework.selection.SelectionService; @@ -189,7 +190,7 @@ public AlarmTreeView(final AlarmClient model, final String itemName) tree_view.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); searchBox = new TextField(); - searchBox.setPromptText("Search by PV"); + searchBox.setPromptText(Messages.searchByPv); searchBox.setPrefWidth(300); setTop(createToolbar(searchBox)); @@ -271,7 +272,7 @@ private ToolBar createToolbar(TextField searchBox) show_disabled.setTooltip(new Tooltip("Expand alarm tree to show disabled PVs")); show_disabled.setOnAction(event -> expandDisabledPVs(tree_view.getRoot())); - final Button searchButton = new Button("Search"); + final Button searchButton = new Button(Messages.search); searchButton.setOnAction(event -> propagateVisibilityDownTree(tree_view.getRoot())); searchBox.setOnAction(event -> propagateVisibilityDownTree(tree_view.getRoot())); // act as if button pressed when enter pressed diff --git a/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties b/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties index 83b48427d4..e083056f7d 100644 --- a/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties +++ b/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties @@ -81,5 +81,7 @@ tooltipMoveEditDetail=Edit the detail field of table item tooltipMoveTableItemDown=Move table item down tooltipMoveTableItemUp=Move table item up totalPVs=PVs: {0} +search=Search +searchByPv=Search by PV unacknowledgeFailed=Failed to unacknowledge alarm(s) withEnableDate=With Enable Date From 777b1bba2cb3bfd9415ce477cefba07ba26a0ebf Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 27 Oct 2026 14:44:17 +0000 Subject: [PATCH 05/21] Change to clearing text field --- .../org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index a8c6a51ab1..960b68ae30 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -43,6 +43,7 @@ import org.phoebus.ui.application.SaveSnapshotAction; import org.phoebus.ui.dialog.DialogHelper; import org.phoebus.ui.docking.DockPane; +import org.phoebus.ui.javafx.ClearingTextField; import org.phoebus.ui.javafx.ImageCache; import org.phoebus.ui.javafx.PrintAction; import org.phoebus.ui.javafx.Screenshot; @@ -189,7 +190,7 @@ public AlarmTreeView(final AlarmClient model, final String itemName) tree_view.setCellFactory(view -> new AlarmTreeViewCell()); tree_view.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); - searchBox = new TextField(); + searchBox = new ClearingTextField(); searchBox.setPromptText(Messages.searchByPv); searchBox.setPrefWidth(300); From 660198b385d15d4383f8d75e0c65cd23f0e3cd5f Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Thu, 29 Oct 2026 13:44:32 +0000 Subject: [PATCH 06/21] Also automatically refresh when search box cleared --- .../phoebus/applications/alarm/ui/tree/AlarmTreeView.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 960b68ae30..0025cd5954 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -277,6 +277,14 @@ private ToolBar createToolbar(TextField searchBox) searchButton.setOnAction(event -> propagateVisibilityDownTree(tree_view.getRoot())); searchBox.setOnAction(event -> propagateVisibilityDownTree(tree_view.getRoot())); // act as if button pressed when enter pressed + searchBox.textProperty().addListener(_ -> + { + // act as if button pressed when text box cleared + if (searchBox.getText().isEmpty()) + { + propagateVisibilityDownTree(tree_view.getRoot()); + } + }); return new ToolBar(searchBox, searchButton, no_server, changing, ToolbarHelper.createSpring(), collapse, show_alarms, show_disabled); } From b991b1ed5307eff8409520fe4e3a714742348d94 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 10 Nov 2026 17:41:44 +0000 Subject: [PATCH 07/21] Add acknowledged field to SeverityLevel --- .../alarm/model/SeverityLevel.java | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/SeverityLevel.java b/app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/SeverityLevel.java index 926db331ed..d6f609b75e 100644 --- a/app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/SeverityLevel.java +++ b/app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/SeverityLevel.java @@ -59,48 +59,53 @@ public enum SeverityLevel { /** OK/NO_ALARM/normal/good */ - OK(false, 0), + OK(false, false, 0), /** Acknowledged minor issue */ - MINOR_ACK(false, 2), + MINOR_ACK(false, true, 2), /** Acknowledged major issue */ - MAJOR_ACK(false, 4), + MAJOR_ACK(false, true, 4), /** Acknowledged invalid condition */ - INVALID_ACK(false, 6), + INVALID_ACK(false, true, 6), /** Acknowledged undefined condition */ - UNDEFINED_ACK(false, 8), + UNDEFINED_ACK(false, true, 8), /** Minor issue */ - MINOR(true, 1), + MINOR(true, false, 1), /** Major issue */ - MAJOR(true, 3), + MAJOR(true, false, 3), /** Invalid condition, potentially very bad */ - INVALID(true, 5), + INVALID(true, false, 5), /** Unknown states, potentially very bad */ - UNDEFINED(true, 7); + UNDEFINED(true, false, 7); /** Active alarm (not OK, not acknowledged?) */ private final boolean active; + /** Acknowledged alarm */ + private final boolean acknowledged; + /** Priority used for alarm state updates in the alarm server */ private final int alarm_update_priority; /** Initialize severity level * @param active true for active alarm severity, * false for acknowledged or OK state + * @param active true for acknowledged state, + * false for active alarm severity * @param alarm_update_priority Priority used inside the server to * update alarm severity of a PV. */ - private SeverityLevel(final boolean active, - final int alarm_update_priority) + private SeverityLevel(final boolean active, final boolean acknowledged, final int alarm_update_priority) { this.active = active; + this.acknowledged = acknowledged; this.alarm_update_priority = alarm_update_priority; } @@ -112,6 +117,14 @@ public boolean isActive() return active; } + /** @return true if severity indicates an acknowledged state, + * false for active or OK state + */ + public boolean isAcknowledged() + { + return acknowledged; + } + /** @return Priority used inside the server to update alarm severity * of a PV. */ From 4cd228e9e24d18ae9186d71b36a68989d237eafc Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 10 Nov 2026 17:42:07 +0000 Subject: [PATCH 08/21] Add alarm tree filter --- .../alarm/ui/tree/AlarmTreeView.java | 141 +++++++++++++++++- 1 file changed, 136 insertions(+), 5 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 0025cd5954..a8ae79bd25 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -21,11 +21,18 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Predicate; import java.util.logging.Level; import java.util.stream.Collectors; +import javafx.beans.InvalidationListener; import javafx.collections.FXCollections; +import javafx.geometry.Pos; +import javafx.scene.control.CheckBox; +import javafx.scene.control.ContentDisplay; import javafx.scene.control.TextField; +import javafx.scene.layout.GridPane; +import javafx.scene.layout.StackPane; import org.phoebus.applications.alarm.AlarmSystem; import org.phoebus.applications.alarm.client.AlarmClient; import org.phoebus.applications.alarm.client.AlarmClientLeaf; @@ -42,6 +49,7 @@ import org.phoebus.ui.application.ContextMenuService; import org.phoebus.ui.application.SaveSnapshotAction; import org.phoebus.ui.dialog.DialogHelper; +import org.phoebus.ui.dialog.PopOver; import org.phoebus.ui.docking.DockPane; import org.phoebus.ui.javafx.ClearingTextField; import org.phoebus.ui.javafx.ImageCache; @@ -154,6 +162,14 @@ public class AlarmTreeView extends BorderPane implements AlarmClientListener private final TextField searchBox; + private final PopOver filterPopOver; + private final Label filterStatus; + private final StackPane filterStatusStack; + private final Button filterButton; + private final List filterCheckboxes = new ArrayList<>(); + + private Predicate filterPredicate; + // Javadoc for TreeItem shows example for overriding isLeaf() and getChildren() // to dynamically create TreeItem as TreeView requests information. // @@ -194,7 +210,53 @@ public AlarmTreeView(final AlarmClient model, final String itemName) searchBox.setPromptText(Messages.searchByPv); searchBox.setPrefWidth(300); - setTop(createToolbar(searchBox)); + filterStatus = new Label("All"); + filterStatus.setStyle("-fx-text-fill: #999999"); + + filterStatusStack = new StackPane(filterStatus); + filterStatusStack.setAlignment(Pos.CENTER_LEFT); + + filterButton = new Button(); + filterButton.setText("Filter:"); + filterButton.setGraphic(filterStatusStack); + filterButton.setContentDisplay(ContentDisplay.RIGHT); + + GridPane filterPane = new GridPane(); + filterPane.setVgap(5.0); + filterPane.setHgap(20.0); + + addFilterRow( + filterPane, + "Active", + "active only", + "inactive only", + leaf -> leaf.getState().getSeverity().isActive() + ); + addFilterRow( + filterPane, "Acknowledged", + "acknowledged only", + "unacknowledged only", + leaf -> leaf.getState().getSeverity().isAcknowledged() + ); + addFilterRow( + filterPane, "Disabled", + "disabled only", + "enabled only", + leaf -> !leaf.isEnabled() + ); + + filterPopOver = new PopOver(filterPane); + filterPopOver.setAutoHide(true); + + filterButton.setOnAction(_ -> { + if (filterPopOver.isShowing()) { + filterPopOver.hide(); + } else { + filterPopOver.show(filterButton); + } + }); + + setTop(createToolbar()); setCenter(tree_view); createContextMenu(); @@ -252,7 +314,7 @@ private void startup() }); } - private ToolBar createToolbar(TextField searchBox) + private ToolBar createToolbar() { final Button collapse = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/collapse.png")); @@ -286,7 +348,7 @@ private ToolBar createToolbar(TextField searchBox) } }); - return new ToolBar(searchBox, searchButton, no_server, changing, ToolbarHelper.createSpring(), collapse, show_alarms, show_disabled); + return new ToolBar(searchBox, searchButton, filterButton, no_server, changing, ToolbarHelper.createSpring(), collapse, show_alarms, show_disabled); } ToolBar getToolbar() @@ -361,8 +423,11 @@ else if (!shouldDisplay && currentParent != null) private boolean shouldDisplay(final TreeItem> item) { - return (searchBox.getText().isEmpty() || !item.getChildren().isEmpty()) - || item.getValue() instanceof AlarmClientLeaf && item.getValue().getName().toLowerCase().contains(searchBox.getText().toLowerCase()); + final boolean matchesSearch = searchBox.getText().isEmpty() || item.getValue() instanceof final AlarmClientLeaf leaf + && leaf.getName().toLowerCase().contains(searchBox.getText().toLowerCase()); + final boolean matchesFilter = filterPredicate == null || item.getValue() instanceof final AlarmClientLeaf leaf + && filterPredicate.test(leaf); + return !item.getChildren().isEmpty() || (matchesSearch && matchesFilter); } /** @@ -799,6 +864,72 @@ private void addDragSupport() }); } + private void addFilterRow( + final GridPane filterPane, + final String name, + final String selected, + final String unselected, + final Predicate selectedPredicate + ) + { + Label hint = new Label("all"); + hint.setStyle("-fx-text-fill: #999999"); + filterPane.add(hint, 1, filterPane.getRowCount()); + + // this is a hack to force the popover to be as wide as the widest possible guidance + { + Label invisibleSelectedHint = new Label(selected); + invisibleSelectedHint.setVisible(false); + Label invisibleUnselectedHint = new Label(unselected); + invisibleUnselectedHint.setVisible(false); + filterPane.add(invisibleSelectedHint, 1, filterPane.getRowCount() - 1); + filterPane.add(invisibleUnselectedHint, 1, filterPane.getRowCount() - 1); + } + + // same hack for the button itself + { + Label invisibleSelectedHint = new Label(selected); + invisibleSelectedHint.setVisible(false); + Label invisibleUnselectedHint = new Label(unselected); + invisibleUnselectedHint.setVisible(false); + filterStatusStack.getChildren().add(invisibleSelectedHint); + filterStatusStack.getChildren().add(invisibleUnselectedHint); + } + + CheckBox checkBox = new CheckBox(name); + checkBox.setAllowIndeterminate(true); + checkBox.setIndeterminate(true); + checkBox.setOnAction(_ -> { + if (checkBox.isIndeterminate()) { + filterPredicate = null; + filterStatus.setText("all"); + } else { + for (CheckBox other : filterCheckboxes) { + if (other != checkBox) { + other.setIndeterminate(true); + } + } + filterPredicate = checkBox.isSelected() ? selectedPredicate : selectedPredicate.negate(); + filterStatus.setText(checkBox.isSelected() ? selected : unselected); + } + propagateVisibilityDownTree(tree_view.getRoot()); + }); + + InvalidationListener listener = _ -> { + if (checkBox.isIndeterminate()) { + hint.setText("all"); + } else { + hint.setText(checkBox.isSelected() ? selected : unselected); + } + }; + checkBox.indeterminateProperty().addListener(listener); + checkBox.selectedProperty().addListener(listener); + + filterCheckboxes.add(checkBox); + + filterPane.add(checkBox, 0, filterPane.getRowCount() - 1); + } + private static void dumpTree(final TreeItem> item) { final ObservableList>> children = item.getChildren(); From 90a6cc5462a31694ff4068b669723506cd2b87ac Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 11 Nov 2026 09:49:35 +0000 Subject: [PATCH 09/21] Replace old collapse/expand buttons --- .../alarm/ui/tree/AlarmTreeView.java | 116 +++++------------- .../ui/src/main/resources/icons/collapse.png | Bin 180 -> 297 bytes .../ui/src/main/resources/icons/expand.png | Bin 0 -> 278 bytes 3 files changed, 30 insertions(+), 86 deletions(-) create mode 100644 app/alarm/ui/src/main/resources/icons/expand.png diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index a8ae79bd25..53538f2eb5 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -25,14 +25,13 @@ import java.util.logging.Level; import java.util.stream.Collectors; -import javafx.beans.InvalidationListener; import javafx.collections.FXCollections; import javafx.geometry.Pos; import javafx.scene.control.CheckBox; import javafx.scene.control.ContentDisplay; import javafx.scene.control.TextField; -import javafx.scene.layout.GridPane; import javafx.scene.layout.StackPane; +import javafx.scene.layout.VBox; import org.phoebus.applications.alarm.AlarmSystem; import org.phoebus.applications.alarm.client.AlarmClient; import org.phoebus.applications.alarm.client.AlarmClientLeaf; @@ -221,31 +220,30 @@ public AlarmTreeView(final AlarmClient model, final String itemName) filterButton.setGraphic(filterStatusStack); filterButton.setContentDisplay(ContentDisplay.RIGHT); - GridPane filterPane = new GridPane(); - filterPane.setVgap(5.0); - filterPane.setHgap(20.0); + VBox filterBox = new VBox(); + filterBox.setSpacing(5.0); addFilterRow( - filterPane, + filterBox, "Active", "active only", "inactive only", leaf -> leaf.getState().getSeverity().isActive() ); addFilterRow( - filterPane, "Acknowledged", + filterBox, "Acknowledged", "acknowledged only", "unacknowledged only", leaf -> leaf.getState().getSeverity().isAcknowledged() ); addFilterRow( - filterPane, "Disabled", + filterBox, "Disabled", "disabled only", "enabled only", leaf -> !leaf.isEnabled() ); - filterPopOver = new PopOver(filterPane); + filterPopOver = new PopOver(filterBox); filterPopOver.setAutoHide(true); filterButton.setOnAction(_ -> { @@ -299,7 +297,7 @@ private void startup() if (tree_view.getRoot() != null && itemName != null) { for (TreeItem treeItem : tree_view.getRoot().getChildren()) { if (((AlarmTreeItem) treeItem.getValue()).getName().equals(itemName)) { - expandAlarms(treeItem); + expandOrCollapse(treeItem, true); break; } } @@ -316,24 +314,16 @@ private void startup() private ToolBar createToolbar() { + final Button collapse = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/collapse.png")); collapse.setTooltip(new Tooltip("Collapse alarm tree")); - collapse.setOnAction(event -> - { - for (TreeItem> sub : tree_view.getRoot().getChildren()) - sub.setExpanded(false); - }); - - final Button show_alarms = new Button("", - ImageCache.getImageView(AlarmUI.class, "/icons/expand_alarms.png")); - show_alarms.setTooltip(new Tooltip("Expand alarm tree to show active alarms")); - show_alarms.setOnAction(event -> expandAlarms(tree_view.getRoot())); + collapse.setOnAction(event -> expandOrCollapse(tree_view.getRoot(), false)); - final Button show_disabled = new Button("", - ImageCache.getImageView(AlarmUI.class, "/icons/expand_disabled.png")); - show_disabled.setTooltip(new Tooltip("Expand alarm tree to show disabled PVs")); - show_disabled.setOnAction(event -> expandDisabledPVs(tree_view.getRoot())); + final Button expand = new Button("", + ImageCache.getImageView(AlarmUI.class, "/icons/expand.png")); + expand.setTooltip(new Tooltip("Expand alarm tree")); + expand.setOnAction(event -> expandOrCollapse(tree_view.getRoot(), true)); final Button searchButton = new Button(Messages.search); @@ -348,7 +338,7 @@ private ToolBar createToolbar() } }); - return new ToolBar(searchBox, searchButton, filterButton, no_server, changing, ToolbarHelper.createSpring(), collapse, show_alarms, show_disabled); + return new ToolBar(searchBox, searchButton, filterButton, no_server, changing, ToolbarHelper.createSpring(), collapse, expand); } ToolBar getToolbar() @@ -449,42 +439,16 @@ private static void addChildToParent(TreeItem> view_parent, Tre items.add(index, view_item); } - private void expandAlarms(final TreeItem> node) + private void expandOrCollapse(final TreeItem> node, final boolean expand) { - if (node.isLeaf()) - return; - - // Always expand the root, which itself is not visible, - // but this will show all the top-level elements. - // In addition, expand those items which are in active alarm. - final boolean expand = node.getValue().getState().severity.isActive() || - node == tree_view.getRoot(); - node.setExpanded(expand); - for (TreeItem> sub : node.getChildren()) - expandAlarms(sub); - } - - /** @param node Subtree node where to expand disabled PVs - * @return Does subtree contain disabled PVs? - */ - private boolean expandDisabledPVs(final TreeItem> node) - { - if (node != null && (node.getValue() instanceof AlarmClientLeaf)) + // Simpler than doing it recursively from the root, but also ensures that any hidden + // tree items are expanded/collapsed + for (TreeItem> item : path2view.values()) { - AlarmClientLeaf pv = (AlarmClientLeaf) node.getValue(); - if (! pv.isEnabled()) - return true; + if (item != tree_view.getRoot()) { + item.setExpanded(expand); + } } - - // Always expand the root, which itself is not visible, - // but this will show all the top-level elements. - // In addition, expand those items which contain disabled PV. - boolean expand = node == tree_view.getRoot(); - for (TreeItem> sub : node.getChildren()) - if (expandDisabledPVs(sub)) - expand = true; - node.setExpanded(expand); - return expand; } private TreeItem> createViewItem(final AlarmTreeItem model_item) @@ -743,11 +707,15 @@ private void performUpdates() path2view.put(value.getPathName(), update); parent.getChildren().set(index, update); } + + propagateVisibilityUpTree(path2view.get(view_item.getValue().getPathName())); } // Restore selection tree_view.getSelectionModel().clearSelection(); - updatedSelectedItems.forEach(item -> tree_view.getSelectionModel().select(item)); + updatedSelectedItems.stream() + .filter(item -> item.getParent() != null) + .forEach(item -> tree_view.getSelectionModel().select(item)); }); } @@ -865,28 +833,14 @@ private void addDragSupport() } private void addFilterRow( - final GridPane filterPane, + final VBox box, final String name, final String selected, final String unselected, final Predicate selectedPredicate ) { - Label hint = new Label("all"); - hint.setStyle("-fx-text-fill: #999999"); - filterPane.add(hint, 1, filterPane.getRowCount()); - - // this is a hack to force the popover to be as wide as the widest possible guidance - { - Label invisibleSelectedHint = new Label(selected); - invisibleSelectedHint.setVisible(false); - Label invisibleUnselectedHint = new Label(unselected); - invisibleUnselectedHint.setVisible(false); - filterPane.add(invisibleSelectedHint, 1, filterPane.getRowCount() - 1); - filterPane.add(invisibleUnselectedHint, 1, filterPane.getRowCount() - 1); - } - - // same hack for the button itself + // this is a hack to force the hint to be as wide as the widest possible guidance { Label invisibleSelectedHint = new Label(selected); invisibleSelectedHint.setVisible(false); @@ -915,19 +869,9 @@ private void addFilterRow( propagateVisibilityDownTree(tree_view.getRoot()); }); - InvalidationListener listener = _ -> { - if (checkBox.isIndeterminate()) { - hint.setText("all"); - } else { - hint.setText(checkBox.isSelected() ? selected : unselected); - } - }; - checkBox.indeterminateProperty().addListener(listener); - checkBox.selectedProperty().addListener(listener); - filterCheckboxes.add(checkBox); - filterPane.add(checkBox, 0, filterPane.getRowCount() - 1); + box.getChildren().add(checkBox); } private static void dumpTree(final TreeItem> item) diff --git a/app/alarm/ui/src/main/resources/icons/collapse.png b/app/alarm/ui/src/main/resources/icons/collapse.png index 6946307f0f9a15dd2b548e825a30533586e95a8c..73ce30bfeaedf189c6fb2e178b17491d1d293531 100644 GIT binary patch delta 282 zcmV+#0p|ASI>6-Y zaLye=2p8}DLrQr|zS&NalUs73ok^p$b}+`Q^F|e$<0lSEtW9gZMI9;e%_|U3v@)kF z?%gqdpFT=n?>F-O4JN&xhO`QtNI7W^Lt5}UtpW#9P)hAk@>Pp*mS!+MhB}7Re2JgZ g8)BD#7XWwxq7$ZpS^unX@c;k-07*qoM6N<$f_`UjHUIzs delta 164 zcmZ3)!*K8%++* z+*)u}yoNzmtFp;##vGo9d+iqr9sPfnPi~FYF^j^enYjzL-YcG^*kAlk!f8kF(xtNd zSw5TX+gj#*^xkc8F9Y+QjGmi&`xeLlnNoRM{K^~4j(z;RT9f>1xG(YAX8-T?vSr-( Wvr9s7zah|13=E#GelF{r5}E)Zacunn literal 0 HcmV?d00001 From 18b37dbe6c070e807458ea36874bc2beb30c27d1 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 11 Nov 2026 10:31:14 +0000 Subject: [PATCH 10/21] Fix expand/collapse not respecting provided node --- .../alarm/ui/tree/AlarmTreeView.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 53538f2eb5..e2d46af940 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -439,14 +439,16 @@ private static void addChildToParent(TreeItem> view_parent, Tre items.add(index, view_item); } - private void expandOrCollapse(final TreeItem> node, final boolean expand) + private void expandOrCollapse(final TreeItem> component, final boolean expand) { - // Simpler than doing it recursively from the root, but also ensures that any hidden - // tree items are expanded/collapsed - for (TreeItem> item : path2view.values()) - { - if (item != tree_view.getRoot()) { - item.setExpanded(expand); + if (component != tree_view.getRoot()) { + component.setExpanded(expand); + } + + if (!component.isLeaf()) { + for (AlarmTreeItem child : component.getValue().getChildren()) { + // We use path2view.get because component might have hidden children, which we still want to expand/collapse + expandOrCollapse(path2view.get(child.getPathName()), expand); } } } @@ -481,7 +483,7 @@ private void indicateChange() setCursor(Cursor.WAIT); final ObservableList items = getToolbar().getItems(); if (! items.contains(changing)) - items.add(3, changing); + items.add(5, changing); } else previous.cancel(false); From 8014c0c278151c84efe0458b71ab94b005f0e4f3 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 11 Nov 2026 16:06:29 +0000 Subject: [PATCH 11/21] Change alarm filter panel to use inline button pill --- .../alarm/ui/tree/AlarmTreeView.java | 158 +++++++----------- .../src/main/resources/icons/filter_ack.png | Bin 0 -> 667 bytes .../main/resources/icons/filter_active.png | Bin 0 -> 615 bytes .../main/resources/icons/filter_disabled.png | Bin 0 -> 392 bytes .../ui/src/main/resources/icons/filter_ok.png | Bin 0 -> 367 bytes 5 files changed, 62 insertions(+), 96 deletions(-) create mode 100644 app/alarm/ui/src/main/resources/icons/filter_ack.png create mode 100644 app/alarm/ui/src/main/resources/icons/filter_active.png create mode 100644 app/alarm/ui/src/main/resources/icons/filter_disabled.png create mode 100644 app/alarm/ui/src/main/resources/icons/filter_ok.png diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index e2d46af940..c3ed02c6d2 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.EnumSet; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; @@ -26,12 +27,9 @@ import java.util.stream.Collectors; import javafx.collections.FXCollections; -import javafx.geometry.Pos; -import javafx.scene.control.CheckBox; -import javafx.scene.control.ContentDisplay; import javafx.scene.control.TextField; -import javafx.scene.layout.StackPane; -import javafx.scene.layout.VBox; +import javafx.scene.control.ToggleButton; +import javafx.scene.layout.HBox; import org.phoebus.applications.alarm.AlarmSystem; import org.phoebus.applications.alarm.client.AlarmClient; import org.phoebus.applications.alarm.client.AlarmClientLeaf; @@ -39,6 +37,7 @@ import org.phoebus.applications.alarm.client.AlarmClientNode; import org.phoebus.applications.alarm.model.AlarmTreeItem; import org.phoebus.applications.alarm.model.BasicState; +import org.phoebus.applications.alarm.model.SeverityLevel; import org.phoebus.applications.alarm.ui.AlarmContextMenuHelper; import org.phoebus.applications.alarm.ui.AlarmUI; import org.phoebus.applications.alarm.ui.Messages; @@ -48,7 +47,6 @@ import org.phoebus.ui.application.ContextMenuService; import org.phoebus.ui.application.SaveSnapshotAction; import org.phoebus.ui.dialog.DialogHelper; -import org.phoebus.ui.dialog.PopOver; import org.phoebus.ui.docking.DockPane; import org.phoebus.ui.javafx.ClearingTextField; import org.phoebus.ui.javafx.ImageCache; @@ -104,6 +102,21 @@ @SuppressWarnings("nls") public class AlarmTreeView extends BorderPane implements AlarmClientListener { + private enum AlarmFilter + { + DISABLED(leaf -> !leaf.isEnabled()), + OK(leaf -> leaf.isEnabled() && leaf.getState().severity == SeverityLevel.OK), + ACTIVE(leaf -> leaf.getState().severity.isActive()), + ACKNOWLEDGED(leaf -> leaf.getState().severity.isAcknowledged()); + + final Predicate predicate; + + AlarmFilter(final Predicate predicate) + { + this.predicate = predicate; + } + } + private final Label no_server = AlarmUI.createNoServerLabel(); private final TreeView> tree_view = new TreeView<>(); @@ -161,13 +174,9 @@ public class AlarmTreeView extends BorderPane implements AlarmClientListener private final TextField searchBox; - private final PopOver filterPopOver; - private final Label filterStatus; - private final StackPane filterStatusStack; - private final Button filterButton; - private final List filterCheckboxes = new ArrayList<>(); + private final List filterButtons = new ArrayList<>(); - private Predicate filterPredicate; + private final Set activeFilters = EnumSet.noneOf(AlarmFilter.class); // Javadoc for TreeItem shows example for overriding isLeaf() and getChildren() // to dynamically create TreeItem as TreeView requests information. @@ -209,50 +218,10 @@ public AlarmTreeView(final AlarmClient model, final String itemName) searchBox.setPromptText(Messages.searchByPv); searchBox.setPrefWidth(300); - filterStatus = new Label("All"); - filterStatus.setStyle("-fx-text-fill: #999999"); - - filterStatusStack = new StackPane(filterStatus); - filterStatusStack.setAlignment(Pos.CENTER_LEFT); - - filterButton = new Button(); - filterButton.setText("Filter:"); - filterButton.setGraphic(filterStatusStack); - filterButton.setContentDisplay(ContentDisplay.RIGHT); - - VBox filterBox = new VBox(); - filterBox.setSpacing(5.0); - - addFilterRow( - filterBox, - "Active", - "active only", - "inactive only", - leaf -> leaf.getState().getSeverity().isActive() - ); - addFilterRow( - filterBox, "Acknowledged", - "acknowledged only", - "unacknowledged only", - leaf -> leaf.getState().getSeverity().isAcknowledged() - ); - addFilterRow( - filterBox, "Disabled", - "disabled only", - "enabled only", - leaf -> !leaf.isEnabled() - ); - - filterPopOver = new PopOver(filterBox); - filterPopOver.setAutoHide(true); - - filterButton.setOnAction(_ -> { - if (filterPopOver.isShowing()) { - filterPopOver.hide(); - } else { - filterPopOver.show(filterButton); - } - }); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_disabled.png"), AlarmFilter.DISABLED); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ok.png"), AlarmFilter.OK); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_active.png"), AlarmFilter.ACTIVE); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ack.png"), AlarmFilter.ACKNOWLEDGED); setTop(createToolbar()); setCenter(tree_view); @@ -338,7 +307,20 @@ private ToolBar createToolbar() } }); - return new ToolBar(searchBox, searchButton, filterButton, no_server, changing, ToolbarHelper.createSpring(), collapse, expand); + final ToggleButton first = filterButtons.removeFirst(); + first.getStyleClass().add("left-pill"); + final ToggleButton last = filterButtons.removeLast(); + last.getStyleClass().add("right-pill"); + for (final ToggleButton toggleButton : filterButtons) { + toggleButton.getStyleClass().add("center-pill"); + } + + final HBox filterBox = new HBox(); + filterBox.getChildren().add(first); + filterBox.getChildren().addAll(filterButtons); + filterBox.getChildren().add(last); + + return new ToolBar(searchBox, searchButton, filterBox, no_server, changing, ToolbarHelper.createSpring(), collapse, expand); } ToolBar getToolbar() @@ -413,11 +395,22 @@ else if (!shouldDisplay && currentParent != null) private boolean shouldDisplay(final TreeItem> item) { + final boolean hasVisibleChildren = !item.getChildren().isEmpty(); + final boolean matchesSearch = searchBox.getText().isEmpty() || item.getValue() instanceof final AlarmClientLeaf leaf && leaf.getName().toLowerCase().contains(searchBox.getText().toLowerCase()); - final boolean matchesFilter = filterPredicate == null || item.getValue() instanceof final AlarmClientLeaf leaf - && filterPredicate.test(leaf); - return !item.getChildren().isEmpty() || (matchesSearch && matchesFilter); + + boolean matchesAnyFilter = activeFilters.isEmpty(); // no filters selected = show everything + for (final AlarmFilter filter : activeFilters) { + final boolean matchesFilter = item.getValue() instanceof final AlarmClientLeaf leaf && filter.predicate.test(leaf); + matchesAnyFilter = matchesAnyFilter || matchesFilter; + } + + // Always show components with no children... unfortunate tradeoff; otherwise they would never be shown because + // they don't have any leaf to match the filters + final boolean isEmptyComponent = item.getValue() instanceof final AlarmClientNode node && node.getChildren().isEmpty(); + + return hasVisibleChildren || isEmptyComponent || (matchesSearch && matchesAnyFilter); } /** @@ -446,7 +439,7 @@ private void expandOrCollapse(final TreeItem> component, final } if (!component.isLeaf()) { - for (AlarmTreeItem child : component.getValue().getChildren()) { + for (final AlarmTreeItem child : component.getValue().getChildren()) { // We use path2view.get because component might have hidden children, which we still want to expand/collapse expandOrCollapse(path2view.get(child.getPathName()), expand); } @@ -834,46 +827,19 @@ private void addDragSupport() }); } - private void addFilterRow( - final VBox box, - final String name, - final String selected, - final String unselected, - final Predicate selectedPredicate - ) + private void addFilterButton(final Node graphic, final AlarmFilter filter) { - // this is a hack to force the hint to be as wide as the widest possible guidance - { - Label invisibleSelectedHint = new Label(selected); - invisibleSelectedHint.setVisible(false); - Label invisibleUnselectedHint = new Label(unselected); - invisibleUnselectedHint.setVisible(false); - filterStatusStack.getChildren().add(invisibleSelectedHint); - filterStatusStack.getChildren().add(invisibleUnselectedHint); - } - - CheckBox checkBox = new CheckBox(name); - checkBox.setAllowIndeterminate(true); - checkBox.setIndeterminate(true); - checkBox.setOnAction(_ -> { - if (checkBox.isIndeterminate()) { - filterPredicate = null; - filterStatus.setText("all"); + final ToggleButton toggleButton = new ToggleButton(); + toggleButton.setGraphic(graphic); + toggleButton.selectedProperty().addListener(_ -> { + if (toggleButton.isSelected()) { + activeFilters.add(filter); } else { - for (CheckBox other : filterCheckboxes) { - if (other != checkBox) { - other.setIndeterminate(true); - } - } - filterPredicate = checkBox.isSelected() ? selectedPredicate : selectedPredicate.negate(); - filterStatus.setText(checkBox.isSelected() ? selected : unselected); + activeFilters.remove(filter); } propagateVisibilityDownTree(tree_view.getRoot()); }); - - filterCheckboxes.add(checkBox); - - box.getChildren().add(checkBox); + filterButtons.add(toggleButton); } private static void dumpTree(final TreeItem> item) diff --git a/app/alarm/ui/src/main/resources/icons/filter_ack.png b/app/alarm/ui/src/main/resources/icons/filter_ack.png new file mode 100644 index 0000000000000000000000000000000000000000..592184475b5e3ab0e9c2e6ad192729e0e8e956af GIT binary patch literal 667 zcmV;M0%ZM(P)B<`QjIug1L+T{`Yat{m%K0wE3jGq%+3vXWLRPms?t` z*40gwN=40PlcZa(muC|A#)sQ>yS==#v%>^xwVLwzJjt?5s>Si!73=?g`ql3=nM^+E zbUNyGyR@;f!C=g@*^Jb`zP#DHs^5AlIj;SK2l#0B0`>cS&1f{DgM$NVG#aGW>&fTy zQMFnn6;Q{o?ntLA0r>Fld74hAPdqR4f*uc`1p3(m{Y~Gzvi`lc5jFLd^5|oa*&DztV2E$?bMip-_;76gd)!{8X;8 z1T4bgu(HSVcswSpR?7r%9k0Q4jYji+{UTS8&1RwP9x8x#!{@IwlCO}_XoP|615C77 zEF`+&5Y^rm`rm~@p}!^u0s)Y|P{0p&&(Ux=qcH^cj zk#lp({l$K*RwIMKKn{n4&0H)Nr~tXpdA;6_$K(0PT}Y);CoY%k5?)YrgTQ99aTS$H z1xo?}+KNb*%jIv;XmpD`5C<29ISd8?Of#F!luoA^6buGAg&+`J4o%#rZh1g2RVzI|K`U7Qt6ptjxrgQ)R002ovPDHLkV1mTL BIzIpa literal 0 HcmV?d00001 diff --git a/app/alarm/ui/src/main/resources/icons/filter_active.png b/app/alarm/ui/src/main/resources/icons/filter_active.png new file mode 100644 index 0000000000000000000000000000000000000000..7f44751c2dc5c3e7f29903c5015bacc0c89eeec6 GIT binary patch literal 615 zcmV-t0+{`YP)c{%^0b_Rh9-TxY;Npd^(1ik!%T2_r zM+}PWzWZ;q(RVkxA^@l70HuJvJz#WH>~nD46`G%q^Nh%nP9j^*V(K&A4GiG*;2@Al z0NveyX-*#nOI}PMmt(6|!!LIH5$EzUv=A7^ZQb5}L$$WXsV5UutFSpuHXH}Ex(eOX zBQmCpwYB2}tP-lN?SXhjdoa}fePsAEF+pM&HOo_zvVDid!m(bsTo;Eg^pdp;PB<`o8nsbB%+mmx2DU&GpKdYgrtxmUA`EZ`hkU=6Cft%_^C%_nMzaJurznaHCP3xvZeV%g#|?E|CxDo0+ctwilq8A3E<|?A2NMCrfg#3Z$8i{p{47D+ zwmcP$Py@@dOjA7}z}9|VE;BZf&5^dr_5636iX5GJB=oWylZm87T_MZq-? mv4KRD$c52C9(6VM|NakETc>Rg6N(W40000l#c^B$2PrZZOy^F8B|`8jqo%&>RwMpPHzQVbJE z*8DR;5hl!l>;kYL$nUV2foX!#Ae${0u);Ni7$^pSG;^N6!eH33668m)LUhfbfJ6q! z25kBzJ`=1NqyS_S%n)Roq0tEsaCkI=G=UO~n$#HvDK!ZY7Xv)I^@8EnGZRou!1ciy zFx4PKKx|}#U>ZT<$eKZX3Qd*IEDo N002ovPDHLkV1ldJlUD!$ literal 0 HcmV?d00001 From 1e668d09f0922d48acb0f0e30fd5cebbaa4f9c27 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 11 Nov 2026 16:09:07 +0000 Subject: [PATCH 12/21] Add alarm tree filter tooltips --- .../applications/alarm/ui/tree/AlarmTreeView.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index c3ed02c6d2..faed6de6c8 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -218,10 +218,10 @@ public AlarmTreeView(final AlarmClient model, final String itemName) searchBox.setPromptText(Messages.searchByPv); searchBox.setPrefWidth(300); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_disabled.png"), AlarmFilter.DISABLED); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ok.png"), AlarmFilter.OK); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_active.png"), AlarmFilter.ACTIVE); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ack.png"), AlarmFilter.ACKNOWLEDGED); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_disabled.png"), AlarmFilter.DISABLED, "Filter disabled alarms"); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ok.png"), AlarmFilter.OK, "Filter OK alarms"); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_active.png"), AlarmFilter.ACTIVE, "Filter active alarms"); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ack.png"), AlarmFilter.ACKNOWLEDGED, "Filter acknowledged alarms"); setTop(createToolbar()); setCenter(tree_view); @@ -827,10 +827,11 @@ private void addDragSupport() }); } - private void addFilterButton(final Node graphic, final AlarmFilter filter) + private void addFilterButton(final Node graphic, final AlarmFilter filter, final String tooltip) { final ToggleButton toggleButton = new ToggleButton(); toggleButton.setGraphic(graphic); + toggleButton.setTooltip(new Tooltip(tooltip)); toggleButton.selectedProperty().addListener(_ -> { if (toggleButton.isSelected()) { activeFilters.add(filter); From 0b2c0f5bfb95a3a1ae7319deb3fefdcf38870dcf Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 11 Nov 2026 16:14:26 +0000 Subject: [PATCH 13/21] Alarm tree localization --- .../org/phoebus/applications/alarm/ui/Messages.java | 6 ++++++ .../applications/alarm/ui/tree/AlarmTreeView.java | 12 ++++++------ .../applications/alarm/ui/messages.properties | 6 ++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java index fe94645f22..56d9cf6ebe 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java @@ -20,6 +20,7 @@ public class Messages public static String AlarmTable; public static String AlarmTree; public static String Annunciator; + public static String collapseAlarmTree; public static String commands; public static String configure; public static String delayTooltip0; @@ -36,6 +37,11 @@ public class Messages public static String displays; public static String enableAlarmFailed; public static String enableAlarms; + public static String expandAlarmTree; + public static String filterAcknowledgedAlarmsTooltip; + public static String filterActiveAlarmsTooltip; + public static String filterDisabledAlarmsTooltip; + public static String filterOkAlarmsTooltip; public static String guidance; public static String headerAlreadyDisabled; public static String headerAlreadyEnabled; diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index faed6de6c8..8e02df194a 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -218,10 +218,10 @@ public AlarmTreeView(final AlarmClient model, final String itemName) searchBox.setPromptText(Messages.searchByPv); searchBox.setPrefWidth(300); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_disabled.png"), AlarmFilter.DISABLED, "Filter disabled alarms"); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ok.png"), AlarmFilter.OK, "Filter OK alarms"); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_active.png"), AlarmFilter.ACTIVE, "Filter active alarms"); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ack.png"), AlarmFilter.ACKNOWLEDGED, "Filter acknowledged alarms"); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_disabled.png"), AlarmFilter.DISABLED, Messages.filterDisabledAlarmsTooltip); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ok.png"), AlarmFilter.OK, Messages.filterOkAlarmsTooltip); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_active.png"), AlarmFilter.ACTIVE, Messages.filterActiveAlarmsTooltip); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ack.png"), AlarmFilter.ACKNOWLEDGED, Messages.filterAcknowledgedAlarmsTooltip); setTop(createToolbar()); setCenter(tree_view); @@ -286,12 +286,12 @@ private ToolBar createToolbar() final Button collapse = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/collapse.png")); - collapse.setTooltip(new Tooltip("Collapse alarm tree")); + collapse.setTooltip(new Tooltip(Messages.collapseAlarmTree)); collapse.setOnAction(event -> expandOrCollapse(tree_view.getRoot(), false)); final Button expand = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/expand.png")); - expand.setTooltip(new Tooltip("Expand alarm tree")); + expand.setTooltip(new Tooltip(Messages.expandAlarmTree)); expand.setOnAction(event -> expandOrCollapse(tree_view.getRoot(), true)); final Button searchButton = new Button(Messages.search); diff --git a/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties b/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties index d3435a40d5..38d89e8e48 100644 --- a/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties +++ b/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties @@ -31,6 +31,7 @@ annunciateTooltip=Request audible alarm annunciation (using the description)? automatedActions=Automated Actions: behavior=Behavior: behaviorTooltip=Enable alarms? See also 'Enabling Filter' +collapseAlarmTree=Collapse alarm tree commands=Commands: configure=Configure dateTimePickerTooltip=Select a date until which the alarm should be disabled @@ -57,6 +58,11 @@ enablingFilterTooltip=Optional expression for enabling the alarm error=Error enableAlarmFailed=Failed to enable alarm enableAlarms=Enable Alarms +expandAlarmTree=Expand alarm tree +filterAcknowledgedAlarmsTooltip=Filter acknowledged alarms +filterActiveAlarmsTooltip=Filter active alarms +filterDisabledAlarmsTooltip=Filter disabled alarms +filterOkAlarmsTooltip=Filter OK alarms guidance=Guidance: headerAlreadyDisabled=All PVs in the selected section are already disabled headerAlreadyEnabled=All PVs in the selected section are already enabled From 412081fc2e8db75c98cf04fd4e1198fafb070938 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 11 Nov 2026 16:28:05 +0000 Subject: [PATCH 14/21] Guard against null in case --- .../alarm/ui/tree/AlarmTreeView.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 8e02df194a..030732cc4b 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -339,6 +339,9 @@ private boolean propagateVisibilityDownTree(final TreeItem> ite for (final AlarmTreeItem child : item.getValue().getChildren()) { final TreeItem> childItem = path2view.get(child.getPathName()); + if (childItem == null) { + continue; + } final boolean shouldDisplay = propagateVisibilityDownTree(childItem); @@ -377,6 +380,9 @@ private void propagateVisibilityUpTree(final TreeItem> item) final TreeItem> currentParent = item.getParent(); final TreeItem> actualParent = path2view.get(modelParent.getPathName()); + if (actualParent == null) { + return; + } final boolean shouldDisplay = shouldDisplay(item); if (shouldDisplay && currentParent == null) @@ -438,10 +444,14 @@ private void expandOrCollapse(final TreeItem> component, final component.setExpanded(expand); } - if (!component.isLeaf()) { - for (final AlarmTreeItem child : component.getValue().getChildren()) { + final List> children = component.getValue().getChildren(); + if (!children.isEmpty()) { + for (final AlarmTreeItem child : children) { // We use path2view.get because component might have hidden children, which we still want to expand/collapse - expandOrCollapse(path2view.get(child.getPathName()), expand); + final TreeItem> view_item = path2view.get(child.getPathName()); + if (view_item != null) { + expandOrCollapse(view_item, expand); + } } } } From 5021d825ec647ecf387816b2a4833e29c0c4edee Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 11 Nov 2026 16:28:47 +0000 Subject: [PATCH 15/21] Javadoc typo --- .../org/phoebus/applications/alarm/model/SeverityLevel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/SeverityLevel.java b/app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/SeverityLevel.java index d6f609b75e..932f000c79 100644 --- a/app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/SeverityLevel.java +++ b/app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/SeverityLevel.java @@ -97,7 +97,7 @@ public enum SeverityLevel /** Initialize severity level * @param active true for active alarm severity, * false for acknowledged or OK state - * @param active true for acknowledged state, + * @param acknowledged true for acknowledged state, * false for active alarm severity * @param alarm_update_priority Priority used inside the server to * update alarm severity of a PV. From 4cbdd8a3944cb81a407b93cc5495044c110f0806 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 11 Nov 2026 16:34:50 +0000 Subject: [PATCH 16/21] simplify filter pill creation --- .../alarm/ui/tree/AlarmTreeView.java | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 030732cc4b..53ad1c0c8b 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -218,10 +218,10 @@ public AlarmTreeView(final AlarmClient model, final String itemName) searchBox.setPromptText(Messages.searchByPv); searchBox.setPrefWidth(300); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_disabled.png"), AlarmFilter.DISABLED, Messages.filterDisabledAlarmsTooltip); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ok.png"), AlarmFilter.OK, Messages.filterOkAlarmsTooltip); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_active.png"), AlarmFilter.ACTIVE, Messages.filterActiveAlarmsTooltip); - addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ack.png"), AlarmFilter.ACKNOWLEDGED, Messages.filterAcknowledgedAlarmsTooltip); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_disabled.png"), AlarmFilter.DISABLED, Messages.filterDisabledAlarmsTooltip, "left-pill"); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ok.png"), AlarmFilter.OK, Messages.filterOkAlarmsTooltip, "center-pill"); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_active.png"), AlarmFilter.ACTIVE, Messages.filterActiveAlarmsTooltip, "center-pill"); + addFilterButton(ImageCache.getImageView(AlarmUI.class, "/icons/filter_ack.png"), AlarmFilter.ACKNOWLEDGED, Messages.filterAcknowledgedAlarmsTooltip, "right-pill"); setTop(createToolbar()); setCenter(tree_view); @@ -283,7 +283,6 @@ private void startup() private ToolBar createToolbar() { - final Button collapse = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/collapse.png")); collapse.setTooltip(new Tooltip(Messages.collapseAlarmTree)); @@ -307,18 +306,8 @@ private ToolBar createToolbar() } }); - final ToggleButton first = filterButtons.removeFirst(); - first.getStyleClass().add("left-pill"); - final ToggleButton last = filterButtons.removeLast(); - last.getStyleClass().add("right-pill"); - for (final ToggleButton toggleButton : filterButtons) { - toggleButton.getStyleClass().add("center-pill"); - } - final HBox filterBox = new HBox(); - filterBox.getChildren().add(first); filterBox.getChildren().addAll(filterButtons); - filterBox.getChildren().add(last); return new ToolBar(searchBox, searchButton, filterBox, no_server, changing, ToolbarHelper.createSpring(), collapse, expand); } @@ -498,7 +487,7 @@ private void showServerState(final boolean alive) final ObservableList items = getToolbar().getItems(); items.remove(no_server); if (! alive) - // Place left of spring, collapse, expand_alarms, + // Place left of spring, collapse button, expand button, // i.e. right of potential AlarmConfigSelector items.add(items.size()-3, no_server); } @@ -837,11 +826,12 @@ private void addDragSupport() }); } - private void addFilterButton(final Node graphic, final AlarmFilter filter, final String tooltip) + private void addFilterButton(final Node graphic, final AlarmFilter filter, final String tooltip, final String pillClass) { final ToggleButton toggleButton = new ToggleButton(); toggleButton.setGraphic(graphic); toggleButton.setTooltip(new Tooltip(tooltip)); + toggleButton.setStyle(pillClass); toggleButton.selectedProperty().addListener(_ -> { if (toggleButton.isSelected()) { activeFilters.add(filter); From 894b0ff843e64dfea4694580b24e5b60bceb3ca0 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 11 Nov 2026 16:43:30 +0000 Subject: [PATCH 17/21] only shallow expand when itemName set --- .../phoebus/applications/alarm/ui/tree/AlarmTreeView.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 53ad1c0c8b..babc3392bd 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -264,9 +264,11 @@ private void startup() // expand tree item if is matches item name if (tree_view.getRoot() != null && itemName != null) { - for (TreeItem treeItem : tree_view.getRoot().getChildren()) { - if (((AlarmTreeItem) treeItem.getValue()).getName().equals(itemName)) { - expandOrCollapse(treeItem, true); + for (final TreeItem> treeItem : tree_view.getRoot().getChildren()) { + if (treeItem.getValue().getName().equals(itemName)) { + for (final TreeItem> item : treeItem.getChildren()) { + item.setExpanded(true); + } break; } } From aed0aefd1bef31cd004058a88a5571a144e42ea7 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 11 Nov 2026 16:48:45 +0000 Subject: [PATCH 18/21] Fix minor alarm tree filter bugs --- .../phoebus/applications/alarm/ui/tree/AlarmTreeView.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index babc3392bd..f758cd45eb 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -551,6 +551,11 @@ public void itemAdded(final AlarmTreeItem item) final TreeItem> view_item = createViewItem(item); propagateVisibilityUpTree(view_item); + // Special case: 1 - empty component added, 2 - alarm added to that component. If the filter + // does not match the leaf, the component should now be hidden... but propagateVisibilityUpTree + // short circuits, so the parent's visibility is never updated + propagateVisibilityUpTree(view_parent); + done.countDown(); }); @@ -833,7 +838,7 @@ private void addFilterButton(final Node graphic, final AlarmFilter filter, final final ToggleButton toggleButton = new ToggleButton(); toggleButton.setGraphic(graphic); toggleButton.setTooltip(new Tooltip(tooltip)); - toggleButton.setStyle(pillClass); + toggleButton.getStyleClass().add(pillClass); toggleButton.selectedProperty().addListener(_ -> { if (toggleButton.isSelected()) { activeFilters.add(filter); From 3a5486c008734c3adf74ecdd1a6ee02b01992db6 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 11 Nov 2026 16:50:17 +0000 Subject: [PATCH 19/21] fix shallow expand behaviour --- .../org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index f758cd45eb..67cf947e0a 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -266,9 +266,7 @@ private void startup() if (tree_view.getRoot() != null && itemName != null) { for (final TreeItem> treeItem : tree_view.getRoot().getChildren()) { if (treeItem.getValue().getName().equals(itemName)) { - for (final TreeItem> item : treeItem.getChildren()) { - item.setExpanded(true); - } + treeItem.setExpanded(true); break; } } From 0287f02a4adb9abc99d3d3776ed883e24c3b91ff Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 17 Nov 2026 09:18:21 +0000 Subject: [PATCH 20/21] Minor optimisations --- .../alarm/ui/tree/AlarmTreeView.java | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 67cf947e0a..82bd47de08 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -333,7 +333,6 @@ private boolean propagateVisibilityDownTree(final TreeItem> ite } final boolean shouldDisplay = propagateVisibilityDownTree(childItem); - if (shouldDisplay) { final boolean doesNotHaveChildAlready = item.getChildren().stream() @@ -343,9 +342,7 @@ private boolean propagateVisibilityDownTree(final TreeItem> ite addChildToParent(item, childItem); } else - item.getChildren().removeIf( - alarmTreeItemTreeItem -> alarmTreeItemTreeItem.getValue() == child - ); + item.getChildren().remove(childItem); } return shouldDisplay(item); @@ -391,9 +388,23 @@ else if (!shouldDisplay && currentParent != null) private boolean shouldDisplay(final TreeItem> item) { final boolean hasVisibleChildren = !item.getChildren().isEmpty(); + if (hasVisibleChildren) { + return true; + } + + // Always show components with no children... unfortunate tradeoff; otherwise they would never be shown because + // they don't have any leaf to match the filters + final boolean isEmptyComponent = item.getValue() instanceof final AlarmClientNode node && node.getChildren().isEmpty(); + if (isEmptyComponent) { + return true; + } + // At this point, the item must match both the search and the filter to be displayed final boolean matchesSearch = searchBox.getText().isEmpty() || item.getValue() instanceof final AlarmClientLeaf leaf && leaf.getName().toLowerCase().contains(searchBox.getText().toLowerCase()); + if (!matchesSearch) { + return false; + } boolean matchesAnyFilter = activeFilters.isEmpty(); // no filters selected = show everything for (final AlarmFilter filter : activeFilters) { @@ -401,11 +412,7 @@ private boolean shouldDisplay(final TreeItem> item) matchesAnyFilter = matchesAnyFilter || matchesFilter; } - // Always show components with no children... unfortunate tradeoff; otherwise they would never be shown because - // they don't have any leaf to match the filters - final boolean isEmptyComponent = item.getValue() instanceof final AlarmClientNode node && node.getChildren().isEmpty(); - - return hasVisibleChildren || isEmptyComponent || (matchesSearch && matchesAnyFilter); + return matchesAnyFilter; } /** From 7ab19775b50e70332eebafc415d0887cc0cb5af8 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 17 Nov 2026 09:55:50 +0000 Subject: [PATCH 21/21] Change collapse/expand behaviour to selected nodes only --- .../alarm/ui/tree/AlarmTreeView.java | 23 +++++++++++++++++-- .../applications/alarm/ui/messages.properties | 4 ++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 82bd47de08..45dd03ed18 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -286,12 +286,12 @@ private ToolBar createToolbar() final Button collapse = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/collapse.png")); collapse.setTooltip(new Tooltip(Messages.collapseAlarmTree)); - collapse.setOnAction(event -> expandOrCollapse(tree_view.getRoot(), false)); + collapse.setOnAction(event -> expandOrCollapseSelection(false)); final Button expand = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/expand.png")); expand.setTooltip(new Tooltip(Messages.expandAlarmTree)); - expand.setOnAction(event -> expandOrCollapse(tree_view.getRoot(), true)); + expand.setOnAction(event -> expandOrCollapseSelection(true)); final Button searchButton = new Button(Messages.search); @@ -434,6 +434,9 @@ private static void addChildToParent(TreeItem> view_parent, Tre items.add(index, view_item); } + /** Collapses or expands (depending on the value of expand) the + * given component, plus all of its children recursively. + */ private void expandOrCollapse(final TreeItem> component, final boolean expand) { if (component != tree_view.getRoot()) { @@ -452,6 +455,22 @@ private void expandOrCollapse(final TreeItem> component, final } } + /** Reads the selection and collapses or expands (depending on the + * value of expand) the selected components. If leaf nodes are + * selected, their parents are collapsed. + */ + private void expandOrCollapseSelection(final boolean expand) { + // We clone the selection because we might be about to modify it + final List>> selected = tree_view.getSelectionModel().getSelectedItems().stream().toList(); + if (selected.isEmpty()) { + expandOrCollapse(tree_view.getRoot(), expand); + } else { + for (final TreeItem> item : selected) { + expandOrCollapse(item.getValue() instanceof AlarmClientLeaf ? item.getParent() : item, expand); + } + } + } + private TreeItem> createViewItem(final AlarmTreeItem model_item) { // Create view item for model item itself diff --git a/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties b/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties index 38d89e8e48..e89aa7a185 100644 --- a/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties +++ b/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties @@ -31,7 +31,7 @@ annunciateTooltip=Request audible alarm annunciation (using the description)? automatedActions=Automated Actions: behavior=Behavior: behaviorTooltip=Enable alarms? See also 'Enabling Filter' -collapseAlarmTree=Collapse alarm tree +collapseAlarmTree=Collapse selected item commands=Commands: configure=Configure dateTimePickerTooltip=Select a date until which the alarm should be disabled @@ -58,7 +58,7 @@ enablingFilterTooltip=Optional expression for enabling the alarm error=Error enableAlarmFailed=Failed to enable alarm enableAlarms=Enable Alarms -expandAlarmTree=Expand alarm tree +expandAlarmTree=Expand selected item filterAcknowledgedAlarmsTooltip=Filter acknowledged alarms filterActiveAlarmsTooltip=Filter active alarms filterDisabledAlarmsTooltip=Filter disabled alarms