From f3dfa16b3a032a13d76f25dfff9fbc326d6555ec Mon Sep 17 00:00:00 2001 From: Slav Korolev Date: Wed, 24 Oct 2012 08:48:13 -0400 Subject: [PATCH] Issue #1280. Changes for non-blocking TrendPlotDlg. Fixed format. Change-Id: I26af77a545c1ecd76dc6a15111e73d580992d77d Former-commit-id: 52601577db93fec8559d7c694b9867b5dd6422b1 [formerly 52601577db93fec8559d7c694b9867b5dd6422b1 [formerly d97fb49f2574dc320366475e02a5784be33bbaaf]] Former-commit-id: 8c1719f248ad17985ed66941a4facff7d1bd32d1 Former-commit-id: 0e7baf252ad81ca57216d77dcc180898df2e23bb --- .../uf/viz/monitor/trendplot/TrendPlotDlg.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/trendplot/TrendPlotDlg.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/trendplot/TrendPlotDlg.java index dadf37911d..32d48c00a1 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/trendplot/TrendPlotDlg.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/trendplot/TrendPlotDlg.java @@ -47,6 +47,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog; * ------------ ---------- ----------- -------------------------- * 2009-12-02 vkorolev Initial creation. * 2010-01-21 4268 vkorolev Fixed Trend Plot + * 2012-10-15 1229 vkorolev Changes for non-blocking TrendPlotDlg * * * @author vkorolev @@ -65,9 +66,12 @@ public class TrendPlotDlg extends CaveSWTDialog { public Date curdate; + public String var; + public TrendPlotDlg(Shell parent, String selectedZone, String station, ArrayList product, String dataName) { - super(parent, SWT.DIALOG_TRIM | SWT.RESIZE); + super(parent, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.DO_NOT_BLOCK + | CAVE.INDEPENDENT_SHELL); setText(getTrendPlotName(product) + " Trend Plot for " + station + "#" + dataName); @@ -89,13 +93,13 @@ public class TrendPlotDlg extends CaveSWTDialog { @Override protected void initializeComponents(Shell shell) { - setReturnValue(false); + setReturnValue(product); // Initialize all layouts Iterator prodVar = product.iterator(); while (prodVar.hasNext()) { - String varname = prodVar.next(); - new TrendPlotCanvas(shell, selectedZone, station, varname, - dataName, obData); + String var = prodVar.next(); + new TrendPlotCanvas(shell, selectedZone, station, var, dataName, + obData); } addCloseBtn(); }