Merge "Issue #1280. Changes for non-blocking TrendPlotDlg. Fixed format." into development

Former-commit-id: 569c49e18e [formerly bbce861df0] [formerly c9df378dc9] [formerly f8b479c6af [formerly c9df378dc9 [formerly 7293ae6d122d5d7c144ba9d2ee0938b87f76f78a]]]
Former-commit-id: f8b479c6af
Former-commit-id: 6aec11745f8d2e6fd5383c18d6cbbc9759aec608 [formerly ca4a2db82f]
Former-commit-id: 2009301f91
This commit is contained in:
Lee Venable 2012-10-24 10:00:07 -05:00 committed by Gerrit Code Review
commit 00a41b0184

View file

@ -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
* </pre>
*
* @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<String> 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<String> 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();
}