From e99c34178c43f8d212fe4c48d497e4794a14bdd8 Mon Sep 17 00:00:00 2001 From: Will Rogers Date: Fri, 10 Aug 2018 14:38:01 +0100 Subject: [PATCH 1/3] Databrowser waveforms: don't show legend or y axis name. --- .../src/org/csstudio/trends/databrowser2/Messages.java | 1 - .../src/org/csstudio/trends/databrowser2/messages.properties | 1 - .../trends/databrowser2/waveformview/WaveformView.java | 5 ++++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/Messages.java b/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/Messages.java index 8cdbf53011e..e3fb2ce7821 100644 --- a/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/Messages.java +++ b/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/Messages.java @@ -287,7 +287,6 @@ public class Messages extends NLS public static String ValueAxes; public static String ValueAxisName; public static String ValueColumn; - public static String WaveformAmplitude; public static String WaveformIndex; public static String WaveformIndexCol; public static String WaveformIndexColTT; diff --git a/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/messages.properties b/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/messages.properties index fc64d8cd0ce..691d930a39b 100644 --- a/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/messages.properties +++ b/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/messages.properties @@ -266,7 +266,6 @@ UseTraceNames=Trace Names? ValueAxes=Value Axes ValueAxisName=Axis Name ValueColumn=Value -WaveformAmplitude=Amplitude WaveformIndex=Waveform Index WaveformIndexCol=Index WaveformIndexColTT=Waveform Index diff --git a/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/waveformview/WaveformView.java b/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/waveformview/WaveformView.java index f2a03471caf..a66dac24535 100644 --- a/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/waveformview/WaveformView.java +++ b/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/waveformview/WaveformView.java @@ -227,7 +227,10 @@ public void widgetSelected(final SelectionEvent e) // ===================== plot = new RTValuePlot(parent); plot.getXAxis().setName(Messages.WaveformIndex); - plot.getYAxes().get(0).setName(Messages.WaveformAmplitude); + plot.getYAxes().get(0).setAutoscale(true); + plot.getYAxes().get(0).useAxisName(false); + plot.showLegend(false); + plot.requestUpdate(); plot.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, layout.numColumns, 1)); // <<<<<< Slider >>>>>> From b408711aad68fb8f0699b932699cf45f1f4bdaa8 Mon Sep 17 00:00:00 2001 From: Will Rogers Date: Fri, 10 Aug 2018 15:02:23 +0100 Subject: [PATCH 2/3] Databrowser: use checkboxes in context menus. --- .../src/org/csstudio/swt/rtplot/Messages.java | 2 -- .../src/org/csstudio/swt/rtplot/RTPlot.java | 8 ++++---- .../swt/rtplot/internal/ToggleLegendAction.java | 11 ++++++----- .../swt/rtplot/internal/ToggleToolbarAction.java | 14 ++++++++------ .../org/csstudio/swt/rtplot/messages.properties | 2 -- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/Messages.java b/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/Messages.java index 646aa6bc647..39f27d41f9e 100644 --- a/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/Messages.java +++ b/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/Messages.java @@ -28,7 +28,6 @@ public class Messages extends NLS public static String EditAnnotation_Text; public static String EditAnnotation_Trace; public static String EditAnnotation_Info; - public static String Legend_Hide; public static String Legend_Show; public static String NameUnitsFmt; public static String Pan; @@ -48,7 +47,6 @@ public class Messages extends NLS public static String Scroll_OnOff; public static String Snapshot; public static String Toolbar_Close; - public static String Toolbar_Hide; public static String Toolbar_Show; public static String TraceType_Area; public static String TraceType_AreaDirect; diff --git a/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/RTPlot.java b/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/RTPlot.java index 6e03908296c..8d0ed8b8937 100644 --- a/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/RTPlot.java +++ b/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/RTPlot.java @@ -59,8 +59,8 @@ protected RTPlot(final Composite parent, final Class type) plot = new Plot(this, type); toolbar = new ToolbarHandler(this); - toggle_toolbar = new ToggleToolbarAction(this, true); - toggle_legend = new ToggleLegendAction(this, true); + toggle_toolbar = new ToggleToolbarAction(this); + toggle_legend = new ToggleLegendAction(this); snapshot = new SnapshotAction(this); toolbar.addContextMenu(toggle_toolbar); @@ -174,7 +174,7 @@ public void showLegend(final boolean show) if (isLegendVisible() == show) return; plot.showLegend(show); - toggle_legend.updateText(); + toggle_legend.update(); } /** @return true if toolbar is visible */ @@ -198,7 +198,7 @@ public void showToolbar(final boolean show) fd.right = new FormAttachment(100); fd.bottom = new FormAttachment(100); plot.setLayoutData(fd); - toggle_toolbar.updateText(); + toggle_toolbar.update(); layout(); plot.fireToolbarChange(show); } diff --git a/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/internal/ToggleLegendAction.java b/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/internal/ToggleLegendAction.java index b244c6f4497..27b1310d8ec 100644 --- a/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/internal/ToggleLegendAction.java +++ b/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/internal/ToggleLegendAction.java @@ -17,16 +17,17 @@ public class ToggleLegendAction extends Action { final private RTPlot plot; - public ToggleLegendAction(final RTPlot plot, final boolean is_visible) + public ToggleLegendAction(final RTPlot plot) { - super(is_visible ? Messages.Legend_Hide : Messages.Legend_Show, - Activator.getIcon("legend")); + super(Messages.Legend_Show, Action.AS_CHECK_BOX); + this.setImageDescriptor(Activator.getIcon("legend")); + this.setChecked(plot.isLegendVisible()); this.plot = plot; } - public void updateText() + public void update() { - setText(plot.isLegendVisible() ? Messages.Legend_Hide : Messages.Legend_Show); + setChecked(plot.isLegendVisible()); } @Override diff --git a/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/internal/ToggleToolbarAction.java b/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/internal/ToggleToolbarAction.java index 33a19c37264..b070c276a5c 100644 --- a/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/internal/ToggleToolbarAction.java +++ b/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/internal/ToggleToolbarAction.java @@ -20,16 +20,17 @@ public class ToggleToolbarAction extends Action { final private RTPlot plot; - public ToggleToolbarAction(final RTPlot plot, final boolean is_visible) + public ToggleToolbarAction(final RTPlot plot) { - super(is_visible ? Messages.Toolbar_Hide : Messages.Toolbar_Show, - Activator.getIcon("toolbar")); + super(Messages.Toolbar_Show, Action.AS_CHECK_BOX); + this.setImageDescriptor(Activator.getIcon("toolbar")); + this.setChecked(plot.isToolbarVisible()); this.plot = plot; } - public void updateText() + public void update() { - setText(plot.isToolbarVisible() ? Messages.Toolbar_Hide : Messages.Toolbar_Show); + setChecked(plot.isToolbarVisible()); } @Override @@ -37,4 +38,5 @@ public void run() { plot.showToolbar(! plot.isToolbarVisible()); } -} + +} \ No newline at end of file diff --git a/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/messages.properties b/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/messages.properties index c49bca6c716..8261ab0659d 100644 --- a/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/messages.properties +++ b/applications/appunorganized/appunorganized-plugins/org.csstudio.swt.rtplot/src/org/csstudio/swt/rtplot/messages.properties @@ -11,7 +11,6 @@ EditAnnotation=Edit Annotation EditAnnotation_Text=Content EditAnnotation_Trace=Trace EditAnnotation_Info=Double-click annotation to edit its text. Un-check one or more annotations to remove. -Legend_Hide=Hide Legend Legend_Show=Show Legend NameUnitsFmt={0} [{1}] Pan=Pan @@ -31,7 +30,6 @@ Scroll_On_TT=Enable scrolling Scroll_OnOff=Enable/Disable scrolling Snapshot=Save Snapshot to File... Toolbar_Close=Close Toolbar -Toolbar_Hide=Hide Toolbar Toolbar_Show=Show Toolbar TraceType_Area=Area TraceType_AreaDirect=Area (direct) From 0265744d9b55fe5fc7b2702c65ac16638f9571d3 Mon Sep 17 00:00:00 2001 From: Will Rogers Date: Fri, 10 Aug 2018 15:24:30 +0100 Subject: [PATCH 3/3] Databrowser waveforms: allow saving image. --- .../csstudio/trends/databrowser2/waveformview/WaveformView.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/waveformview/WaveformView.java b/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/waveformview/WaveformView.java index a66dac24535..757d5b7c9d9 100644 --- a/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/waveformview/WaveformView.java +++ b/applications/databrowser/databrowser-plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/waveformview/WaveformView.java @@ -274,6 +274,8 @@ public void menuAboutToShow(IMenuManager manager) { mm.add(plot.getLegendAction()); mm.add(new Separator()); mm.add(new ToggleYAxisAction(plot, true)); + mm.add(new Separator()); + mm.add(plot.getSnapshotAction()); } });