Skip to content

Fixes to composite snapshot #3565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
georgweiss merged 3 commits into from
Sep 30, 2025
Merged

Fixes to composite snapshot #3565

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76bc6e4
Bug fix: snapshot value edits not saved
georgweiss Sep 25, 2025
22b4246
Mark snapshot as dirty if snapshot values are changed
georgweiss Sep 25, 2025
586d34b
Disallow edits of snapshot values in composite snapshot view
georgweiss Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,7 @@ public void saveSnapshot(ActionEvent actionEvent) {
List<SnapshotItem> snapshotItems = snapshot.getSnapshotData().getSnapshotItems();
SnapshotData snapshotData = new SnapshotData();
snapshotData.setSnapshotItems(snapshotItems);
snapshotData.setUniqueId(snapshot.getSnapshotNode().getUniqueId());
this.snapshot.setSnapshotData(snapshotData);
Node snapshotNode =
Node.builder()
Expand Down Expand Up @@ -819,6 +820,7 @@ private List<SnapshotItem> configurationToSnapshotItems(List<ConfigPv> configPvs


private void updateLoadedSnapshot(TableEntry rowValue, VType newValue) {
snapshotDataDirty.set(true);
snapshot.getSnapshotData().getSnapshotItems().stream()
.filter(item -> item.getConfigPv().equals(rowValue.getConfigPv()))
.findFirst()
Expand Down Expand Up @@ -892,6 +894,7 @@ private void showLoggingError(String cause) {
*/
public void loadSnapshot(Node snapshotNode) {
disabledUi.set(true);
storedValueColumn.editableProperty().set(snapshotNode.getNodeType().equals(NodeType.SNAPSHOT));
JobManager.schedule("Load snapshot items", monitor -> {
try {
this.snapshot = getSnapshotFromService(snapshotNode);
Expand Down