Add 'refresh' to context menu of databrowser widget

Author: kasemir

app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/plots/DataBrowserWidget.java

@@ -106,6 +106,7 @@ public boolean configureFromXML(final ModelReader model_reader, final Widget wid
     private volatile WidgetProperty<String> selection_value_pv;
     private volatile WidgetProperty<VType> selection_value;
     private volatile RuntimeEventProperty open_full;
+    private volatile RuntimeEventProperty refresh_plot;
 
     /** Constructor */
     public DataBrowserWidget()
@@ -123,6 +124,7 @@ protected void defineProperties(final List<WidgetProperty<?>> properties)
         properties.add(selection_value_pv = propSelectionValuePV.createProperty(this, ""));
         properties.add(selection_value = propSelectionValue.createProperty(this, null));
         properties.add(open_full = (RuntimeEventProperty) runtimePropOpenFull.createProperty(this, null));
+        properties.add(refresh_plot = (RuntimeEventProperty) runtimePropRefreshPlot.createProperty(this, null));
     }
 
     @Override
@@ -193,4 +195,10 @@ public RuntimeEventProperty runtimePropOpenFull()
     {
         return open_full;
     }
+
+    /** @return 'refresh_plot' property */
+    public RuntimeEventProperty runtimePropRefreshPlot()
+    {
+        return refresh_plot;
+    }
 }

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/plots/DataBrowserRepresentation.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011-2018 Oak Ridge National Laboratory.
+ * Copyright (c) 2011-2022 Oak Ridge National Laboratory.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -81,6 +81,10 @@ public class DataBrowserRepresentation extends RegionBaseRepresentation<Pane, Da
      */
     private volatile Controller controller;
 
+    private final WidgetPropertyListener<Instant> config_dialog_listener = (p, o, n) -> plot.getPlot().showConfigurationDialog();
+    private final WidgetPropertyListener<Instant> open_databrowser_listener = (p, o, n) ->
+        DataBrowserRepresentation.openFullDataBrowser(model, model_widget.getMacrosOrProperties(), model_widget.propShowToolbar().getValue());
+    private final WidgetPropertyListener<Instant> refresh_plot_listener = (p, o, n) -> controller.refresh();
 
     /** Listener to model's selected sample, updates widget.propSelectionValue() */
     private class ModelSampleSelectionListener implements ModelListener
@@ -162,9 +166,9 @@ protected void registerListeners()
 
         if (! toolkit.isEditMode())
         {
-            model_widget.runtimePropConfigure().addPropertyListener((p, o, n) -> plot.getPlot().showConfigurationDialog());
-            model_widget.runtimePropOpenFull().addPropertyListener((p, o, n) ->
-                openFullDataBrowser(model, model_widget.getMacrosOrProperties(), model_widget.propShowToolbar().getValue()));
+            model_widget.runtimePropConfigure().addPropertyListener(config_dialog_listener);
+            model_widget.runtimePropOpenFull().addPropertyListener(open_databrowser_listener);
+            model_widget.runtimePropRefreshPlot().addPropertyListener(refresh_plot_listener);
 
             // Track selected sample?
             // 'selection_value_pv' must be set when runtime starts,
@@ -181,6 +185,14 @@ protected void unregisterListeners()
         model_widget.propHeight().removePropertyListener(sizeChangedListener);
         model_widget.propShowToolbar().removePropertyListener(optsChangedListener);
         model_widget.propFile().removePropertyListener(fileChangedListener);
+
+        if (! toolkit.isEditMode())
+        {
+            model_widget.runtimePropConfigure().removePropertyListener(config_dialog_listener);
+            model_widget.runtimePropOpenFull().removePropertyListener(open_databrowser_listener);
+            model_widget.runtimePropRefreshPlot().removePropertyListener(refresh_plot_listener);
+        }
+
         super.unregisterListeners();
     }
 

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/internal/DataBrowserWidgetRuntime.java

@@ -49,6 +49,20 @@ public void run()
         }
     }
 
+    private class RefreshPlotAction extends RuntimeAction
+    {
+        RefreshPlotAction()
+        {
+            super(Messages.Refresh, "/icons/refresh_remote.png");
+        }
+
+        @Override
+        public void run()
+        {
+            widget.runtimePropRefreshPlot().trigger();
+        }
+    }
+
     private final List<RuntimeAction> runtime_actions = new ArrayList<>(3);
     private volatile PV selection_pv = null;
     private volatile WidgetPropertyListener<VType> listener = null;
@@ -62,6 +76,7 @@ public void initialize(final DataBrowserWidget widget)
         runtime_actions.add(new OpenDataBrowserAction());
         runtime_actions.add(new PrintWidgetAction(widget, Messages.PrintPlot));
         runtime_actions.add(new SaveWidgetSnapshotAction(widget, Messages.SavePlotSnapshot));
+        runtime_actions.add(new RefreshPlotAction());
     }
 
     @Override