traceList = getTraceList();
- Menu m = new Menu(parentComp.getShell(), SWT.POP_UP);
-
- for (int i = 0; i < traceList.size(); i++) {
- TraceData td = traceList.get(i);
- String s = null;
- if (td.isForecast()) {
- s = getFcstPEDTSE(td);
- } else {
- s = getPEDTSE(td);
- }
- MenuItem mi = new MenuItem(m, SWT.CHECK);
- if (td.getLineData()!=null && td.getLineData().length>0) {
- if (td.isTraceOn())
- mi.setSelection(true);
- else
- mi.setSelection(false);
- } else {
- mi.setSelection(false);
- s = s.concat("" + "NO DATA");
- }
- mi.setText(s);
- mi.setData(td);
- mi.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event event) {
- handleSelection(event);
- }
- });
- }
- // We need to make the menu visible
- m.setVisible(true);
+ ttsd = ToggleTimeSeriesDlg.getInstance(getShell(),getTraceList(),this);
+ ttsd.open();
}
- private void handleSelection(Event event) {
- MenuItem item = (MenuItem) event.widget;
+ protected void handleSelection(Event event) {
+ Button item = (Button) event.widget;
TraceData trace = (TraceData) item.getData();
trace.setTraceOn(!trace.isTraceOn());
if (trace.isTraceOn()) {
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
index 941bc4704a..7dced34a23 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
@@ -88,7 +88,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* 04 Mar 2011 7644 lbousaid fixed Zoom in feature
* 30 May 2012 14967 wkwock fix insert deleted data to rejecteddata table
* 23 Jul 2012 15195 mpduff Fix dates for displaying groups
- * 06 Dec 2012 15066 wkwock Fix "ctrl+r" not work in group mode
+ * 06 Dec 2012 15066 wkwock Fix "ctrl+r" not work in group mode
+ * 22 Jan 2013 14903 lbousaidi Fix display error after save to DB.
*
*
*
@@ -875,18 +876,7 @@ public class TimeSeriesDisplayDlg extends CaveSWTDialog {
insertList.clear();
editList.clear();
deleteList.clear();
-
- for (TimeSeriesDisplayCanvas canvas : canvasList) {
- if (canvas.getTraceArray() != null) {
- for (TraceData td : canvas.getTraceArray()) {
- /* Reset the selection */
- td.setSelected(false);
- }
- }
- canvas.setGetAgain(true);
- canvas.redraw();
- canvas.update();
- }
+ displayCanvas.redraw();
}
}
});
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
index 5295306dc0..25a9749fc8 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
@@ -117,7 +117,8 @@ import com.raytheon.viz.hydrocommon.util.StnClassSyncUtil;
* 08 Aug 2012 657 mpduff Fix error when selecting a TS while no selection has been made
* in the Station List.
* 27 Sep 2012 15302 wkwock TimeSeries start mode should depends on token timeseries_mode
- * despite start up in CAVE or standalone.
+ * despite start up in CAVE or standalone.
+ * 30 Jan 2013 15264 wkwock Fix the missing group_definition.cfg file crash
*
*
* @author lvenable
@@ -604,15 +605,15 @@ public class TimeSeriesDlg extends CaveHydroSWTDialog {
this.standaloneMode = true;
// Ensure That The Group Configuration File Exists.
- if (!groupConfigFile.exists()) {
+ if (groupConfigFile==null || !groupConfigFile.exists()) {
// if it does not, check localization for the file
IPathManager pm = PathManagerFactory.getPathManager();
groupConfigFile = pm.getStaticFile(HydroConstants.GROUP_DEFINITION);
- if (!groupConfigFile.exists()) {
+ if (groupConfigFile==null || !groupConfigFile.exists()) {
statusHandler.handle(Priority.PROBLEM,
"Unable to locate group configuration file - "
- + groupConfigFile.getAbsolutePath());
+ + HydroConstants.GROUP_DEFINITION);
this.groupConfigFilePath = null;
} else {
this.groupConfigFilePath = groupConfigFile.getAbsolutePath();
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
index 41555fb514..966907d543 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
@@ -11,6 +11,10 @@ import org.eclipse.core.commands.ExecutionException;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
+import com.raytheon.uf.common.localization.IPathManager;
+import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.viz.hydrocommon.HydroConstants;
+
/**
* Action for Time Series Configuration Plug-in
*
@@ -19,6 +23,7 @@ import org.eclipse.ui.PlatformUI;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 24, 2011 7797 bkowal Initial creation.
+ * Jan 30, 2013 15264 wkwock Get the correct group_definition.cfg file.
*
*
*
@@ -28,10 +33,6 @@ import org.eclipse.ui.PlatformUI;
public class TimeSeriesconfigAction extends AbstractHandler {
private TimeSeriesDlg timeSeriesDialog;
- private static final String ENV_WHFS_CONFIG_DIR = "whfs_config_dir";
-
- private static final String GROUP_DEFINITION_FILE_NAME = "group_definition.cfg";
-
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
@@ -52,13 +53,8 @@ public class TimeSeriesconfigAction extends AbstractHandler {
}
protected static File locateGroupDefinitionFile() {
- String configDir = System
- .getenv(TimeSeriesconfigAction.ENV_WHFS_CONFIG_DIR);
- if (!configDir.endsWith("/")) {
- configDir = configDir + "/";
- }
- File file = new File(configDir
- + TimeSeriesconfigAction.GROUP_DEFINITION_FILE_NAME);
+ IPathManager pm = PathManagerFactory.getPathManager();
+ File file = pm.getStaticFile(HydroConstants.GROUP_DEFINITION);
return file;
}
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/ToggleTimeSeriesDlg.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/ToggleTimeSeriesDlg.java
new file mode 100644
index 0000000000..d602cffeba
--- /dev/null
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/ToggleTimeSeriesDlg.java
@@ -0,0 +1,117 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.viz.hydro.timeseries;
+
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.RowLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+
+import com.raytheon.viz.hydro.CaveHydroSWTDialog;
+import com.raytheon.viz.hydro.timeseries.util.TraceData;
+
+/**
+ * This class is the popup menu when right/middle click on the Time Series Display.
+ * There should be only one toggle time series dialog at a time.
+ *
+ *
+ * SOFTWARE HISTORY
+ * Date Ticket# Engineer Description
+ * ---------- ------- ----------- --------------------------
+ * 1/16/2013 15695 wkwock Initial
+ * @author wkwock
+ * @version 1.0
+ *
+ */
+public class ToggleTimeSeriesDlg extends CaveHydroSWTDialog {
+ private static final String DLG_TITLE="Toggle Time Series";
+ private List traceList=null;
+ private TimeSeriesDisplayCanvas tsDisCanvas=null;
+ private static ToggleTimeSeriesDlg oneTTSD=null; //singleton
+
+ public static ToggleTimeSeriesDlg getInstance(Shell parentShell,List traceLst, TimeSeriesDisplayCanvas tsdc) {
+ if (oneTTSD!=null){
+ oneTTSD.close();
+ oneTTSD.disposed();
+ }
+ oneTTSD = new ToggleTimeSeriesDlg(parentShell, traceLst, tsdc) ;
+ return oneTTSD;
+ }
+
+ private ToggleTimeSeriesDlg(Shell parentShell,List traceLst, TimeSeriesDisplayCanvas tsdc) {
+ super(parentShell);
+ this.setText(DLG_TITLE);
+
+ this.traceList=traceLst;
+ this.tsDisCanvas=tsdc;
+ }
+
+ @Override
+ protected void initializeComponents(Shell shell) {
+ Composite beginningTimeComp = new Composite(shell, SWT.NONE);
+ RowLayout topLabelCompRl = new RowLayout();
+ beginningTimeComp.setLayout(topLabelCompRl);
+
+ Button[] checkBtns = new Button[traceList.size()];
+
+ for (int i = 0; i < traceList.size(); i++) {
+ TraceData td = traceList.get(i);
+ checkBtns[i] = new Button(shell, SWT.CHECK);
+ String s = null;
+ if (td.isForecast()) {
+ s = this.tsDisCanvas.getFcstPEDTSE(td);
+ } else {
+ s = this.tsDisCanvas.getPEDTSE(td);
+ }
+ if (td.getLineData()!=null && td.getLineData().length>0) {
+ if (td.isTraceOn())
+ checkBtns[i].setSelection(true);
+ else
+ checkBtns[i].setSelection(false);
+ } else {
+ checkBtns[i].setSelection(false);
+ s = s.concat("" + "NO DATA");
+ }
+
+ checkBtns[i].setText(s);
+ checkBtns[i].setLocation(50*i,250);
+ checkBtns[i].pack();
+ checkBtns[i].setData(td);
+
+
+ checkBtns[i].addListener(SWT.Selection, new Listener() {
+ public void handleEvent(Event event) {
+ handleSelection(event);
+ }
+ });
+ }
+ // We need to make the menu visible
+ beginningTimeComp.setVisible(true);
+ }
+
+ private void handleSelection(Event event) {
+ this.tsDisCanvas.handleSelection(event);
+ }
+}
diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/contacts/ContactsDlg.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/contacts/ContactsDlg.java
index 7173339a03..b2a7c5d5c0 100644
--- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/contacts/ContactsDlg.java
+++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/contacts/ContactsDlg.java
@@ -54,6 +54,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 10, 2008 lvenable Initial creation
+ * Feb 13, 2013 15794 wkwock Make Sequence number goes up to 99
*
*
*
@@ -260,7 +261,7 @@ public class ContactsDlg extends CaveSWTDialog {
seqNumSpnr.setPageIncrement(1);
seqNumSpnr.setSelection(1);
seqNumSpnr.setMinimum(1);
- seqNumSpnr.setMaximum(9);
+ seqNumSpnr.setMaximum(99);
seqNumSpnr.setLayoutData(gd);
gd = new GridData(275, SWT.DEFAULT);
diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/ratingcurve/RatingCurveDlg.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/ratingcurve/RatingCurveDlg.java
index ced3ca0f58..91956af3f9 100644
--- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/ratingcurve/RatingCurveDlg.java
+++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/ratingcurve/RatingCurveDlg.java
@@ -52,6 +52,7 @@ import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import com.raytheon.uf.common.ohd.AppsDefaults;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.viz.hydrocommon.data.RiverDataPoint;
@@ -73,6 +74,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* 21 Feb 2010 4167 mpduff Added TimeZone to SimpleDateFormat.
* 29 Apr 2010 4993 mpduff Fixed date format in error message.
* 26 Jul 2012 14711/963 mpduff Fix problems adding/removing shift points
+ * 22 Jan 2013 15682 lbousaidi fix openfile problem and changed the path to
+ * whfs_import_dir for "Import Curve" button.
*
*
* @author lvenable
@@ -517,16 +520,19 @@ public class RatingCurveDlg extends CaveSWTDialog {
curveImportBtn.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
+ final String tokenizedDir = "whfs_import_dir";
+ String importRating= AppsDefaults.getInstance().getToken(tokenizedDir);
FileDialog fd = new FileDialog(shell, SWT.OPEN);
- fd.setText("Open");
- fd.setFilterPath("$HOME");
+ fd.setFilterPath(importRating);
String[] filterExt = { "*." + extension };
fd.setFilterExtensions(filterExt);
-
- String file = fd.open();
- if (file != null) {
- importCurveData(importRatingCurve(fd.open()));
- }
+ String filename = fd.open();
+ if (filename == null) {
+ return;
+ } else {
+ importCurveData(importRatingCurve(filename));
+ }
+
}
});
diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/E19Report.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/E19Report.java
index 6114c0a8c2..dca800a32b 100644
--- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/E19Report.java
+++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/textreport/E19Report.java
@@ -47,6 +47,7 @@ import com.raytheon.viz.hydrocommon.whfslib.GeoUtil;
* Sep 18, 2009 2260 mpduff Initial creation
* Apr 25, 2012 14499 wkwock Refine format, query, etc
* Oct 14, 2012 15454 wkwock Fix can not generate e19 if damage filed is empty
+ * Jan 23, 2013 15443 lbousaidi added NP form feed foe all the pages.
*
*
*
@@ -268,7 +269,7 @@ public class E19Report extends TextReport {
StringBuilder buffer = new StringBuilder();
TextReportData data = TextReportDataManager.getInstance().getDataForReports(lid, 0);
-
+ buffer.append("\f");
buffer.append(TextReportConstants.E19_HDR_MAPPAGE);
buffer.append("\n\n");
@@ -296,6 +297,7 @@ public class E19Report extends TextReport {
int numCols = 74;
int leftMargin = 24;
+ buffer.append("\f");
buffer.append(TextReportConstants.E19_HDR_BENCHMARKS);
buffer.append("\n\n");
@@ -428,7 +430,7 @@ public class E19Report extends TextReport {
String[] crit2 = null;
TextReportData data = TextReportDataManager.getInstance().getDataForReports(lid, 2);
-
+ buffer.append("\f");
buffer.append(TextReportConstants.E19_HDR_GAGES + "\n\n");
buffer.append(" DCP TELEM\n\n");
@@ -589,6 +591,7 @@ public class E19Report extends TextReport {
*/
private String E19History() {
StringBuilder buffer = new StringBuilder();
+ buffer.append("\f");
buffer.append(TextReportConstants.E19_HDR_HISTORY + "\n\n");
int count1 = countNewlines(buffer.toString());
@@ -767,7 +770,7 @@ public class E19Report extends TextReport {
for (int i = 0; i < leftMargin; i++) {
indent = indent.concat(" ");
}
-
+ buffer.append("\f");
buffer.append(TextReportConstants.E19_HDR_CRESTS + "\n\n");
if (data.getRiverstat() != null) {
@@ -917,7 +920,7 @@ public class E19Report extends TextReport {
String tmp2 = " ";
String tmp3 = " ";
String tmp4 = " ";
-
+ buffer.append("\f");
buffer.append(TextReportConstants.E19_HDR_LOWWATER + "\n\n");
int count1 = countNewlines(buffer.toString());
@@ -1034,7 +1037,7 @@ public class E19Report extends TextReport {
for (int i = 0; i < leftMargin; i++) {
indent = indent.concat(" ");
}
-
+ buffer.append("\f");
buffer.append(TextReportConstants.E19_HDR_CONDITIONS + "\n\n");
TextReportData data = TextReportDataManager.getInstance().getDataForReports(lid, 0);
@@ -1178,7 +1181,7 @@ public class E19Report extends TextReport {
for (int i = 0; i < leftMargin; i++) {
indent = indent.concat(" ");
}
-
+ buffer.append("\f");
buffer.append(TextReportConstants.E19_HDR_DAMAGE + "\n\n");
TextReportData data = TextReportDataManager.getInstance().getCrestData(lid);
@@ -1291,7 +1294,7 @@ public class E19Report extends TextReport {
for (int i = 0; i < leftMargin; i++) {
indent = indent.concat(" ");
}
-
+ buffer.append("\f");
buffer.append(TextReportConstants.E19_HDR_STAFFGAGE + "\n\n");
TextReportData data = TextReportDataManager.getInstance().getStaffGageData(lid);
@@ -1518,7 +1521,7 @@ public class E19Report extends TextReport {
String tmp1 = " ";
String tmp2 = " ";
String tmp3 = " ";
-
+ buffer.append("\f");
buffer.append(TextReportConstants.E19_HDR_CONTACTS + "\n\n");
TextReportData data = TextReportDataManager.getInstance().getDataForReports(lid, 6);
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
index 06b41f6e97..e3db0225d9 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
@@ -307,7 +307,10 @@ import com.raytheon.viz.ui.dialogs.SWTMessageBox;
* 28Nov2012 14842 M.Gamazaychikov Re-wrote processPopup method
* 13Dec2012 1353 rferrel Change to make edit cancel message not
* dispaly the red had kill job message.
- * 10JAN2012 15704 M.Gamazaychikov Added setting userKeyPressed to false in verifyText method
+ * 31Dec2012 15651 M.Gamazaychikov Added an argument to re-factored PrintDisplay.print
+ * 10JAN2012 15704 M.Gamazaychikov Added setting userKeyPressed to false in verifyText method.
+ * 31JAN2013 14247 D. Friedman Make spell check dialog child of editor window.
+ * 31JAN2013 15580 D. Friedman Prevent errors when window is disposed.
*
*
* @author lvenable
@@ -4191,7 +4194,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
*/
private void printAllText() {
FontData fontData = textEditor.getFont().getFontData()[0];
- PrintDisplay.print(textEditor.getText(), fontData, statusHandler);
+ PrintDisplay.print(textEditor.getText(), fontData, charWrapCol, statusHandler);
}
/**
@@ -4214,7 +4217,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
String tmpText = textEditor.getText();
Point point = textEditor.getSelection();
FontData fontData = textEditor.getFont().getFontData()[0];
- PrintDisplay.print(textEditor.getSelectionText(), fontData,
+ PrintDisplay.print(textEditor.getSelectionText(), fontData, charWrapCol,
statusHandler);
textEditor.setText(tmpText);
textEditor.setSelection(point);
@@ -5831,7 +5834,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
* Displays the spell checker dialog to initiate spell checking.
*/
private void checkSpelling() {
- SpellCheckDlg spellCheckDlg = new SpellCheckDlg(getParent(),
+ SpellCheckDlg spellCheckDlg = new SpellCheckDlg(shell,
textEditor, StatusConstants.CATEGORY_WORKSTATION,
StatusConstants.SUBCATEGORY_CONNECTIVITY);
spellCheckDlg.open();
@@ -6837,6 +6840,9 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
@Override
protected void disposed() {
+ textEditor.setFont(shell.getFont());
+ headerTF.setFont(shell.getFont());
+
if (smlFont != null) {
smlFont.dispose();
}
diff --git a/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java b/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
index 66136ccdcc..f6c37b5452 100644
--- a/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
+++ b/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
@@ -90,6 +90,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* 26Sep2012 1196 lvenable Dialog refactor to not block.
* 02Oct2012 1229 rferrel Option to allow blocking when top dialog.
* 13Dec2012 1353 rferrel Fix bug introduced in the Show all dialogs.
+ * 30Jan2013 DR 14736 D. Friedman Display local time.
*
*
*
@@ -217,7 +218,9 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
private void initializeComponents() {
sdfUTC.setTimeZone(TimeZone.getTimeZone("UTC"));
- sdfLocal.setTimeZone(Calendar.getInstance().getTimeZone());
+ String localTZName = System.getenv("FXA_LOCAL_TZ");
+ sdfLocal.setTimeZone(localTZName != null ?
+ TimeZone.getTimeZone(localTZName) : TimeZone.getDefault());
createMenus();
new Label(shell, SWT.NONE).setText("host: "
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
index 11ff433ab4..df2bd9f5f9 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
@@ -88,7 +88,7 @@ import com.raytheon.viz.core.slice.request.VerticalPointRequest.TimeDirection;
import com.raytheon.viz.skewt.SkewtDisplay;
import com.raytheon.viz.skewt.rscdata.SkewTResourceData;
import com.raytheon.viz.ui.EditorUtil;
-import com.raytheon.viz.ui.BundleProductLoader;
+import com.raytheon.viz.ui.MenuLoader;
import com.raytheon.viz.ui.UiUtil;
import com.raytheon.viz.ui.editor.AbstractEditor;
import com.raytheon.viz.ui.editor.IMultiPaneEditor;
@@ -114,7 +114,8 @@ import com.vividsolutions.jts.geom.LineString;
* Jun 8, 2009 #2161 lvenable Initial creation
* Mar 27, 2012 #14506 Qinglu Lin For cross section plot along a line of
* latitude, swap xStart and xEnd.
- *
+ * Jan 25, 2013 #15529 kshresth Fixed cross section "Unhandled event loop exception"
+ * when loading contours and Image combo
*
*
* @author lvenable
@@ -900,6 +901,8 @@ public class ProductTableComp extends Composite {
CrossSectionDescriptor csDesc = csDisplay.getDescriptor();
csDesc.setRenderableDisplay(csDisplay);
+ selectNewTableItem();
+
IDataCatalogEntry catalogEntry = getSelectedData().get(0)
.getCatalogEntry();
VBMenuBarItemsMgr.SpaceTimeMenu currentSpaceTime = dialogSettings
@@ -1078,7 +1081,7 @@ public class ProductTableComp extends Composite {
Bundle b = new Bundle();
b.setDisplays(new AbstractRenderableDisplay[] { display });
- Job j = new BundleProductLoader(editor, b);
+ Job j = new MenuLoader(b, editor);
j.schedule();
}
}
diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
index 0b45ae91a4..f4d00bf1e2 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
@@ -61,6 +61,8 @@ import com.vividsolutions.jts.geom.Polygon;
* May 7, 2010 mschenke Initial creation
* Jan 29, 2013 15723 Qinglu Lin Called warngenLayer.initRemovedGids() in move() and in run() of
* AddVertexAction, DeleteVertextAction and MoveElementAction inner classes.
+ * Jan 30, 2013 15439 Qinglu Lin Code were added to prevent nullPointException from occurring
+ * when c2 is null for "case SINGLE_POINT" in move().
*
*
*
@@ -374,17 +376,19 @@ public class WarngenUIManager extends InputAdapter {
break;
}
case SINGLE_POINT: {
- PolygonUtil.truncate(c2, 2);
- if (warngenLayer.isModifiedVertexNeedsToBeUpdated()) {
- int i = StormTrackUIManager.getCoordinateIndex(warngenLayer,
- state.getWarningPolygon().getCoordinates(), c2);
- if (i != -1) {
- this.movePointIndex = i;
+ if (c2 != null) {
+ PolygonUtil.truncate(c2, 2);
+ if (warngenLayer.isModifiedVertexNeedsToBeUpdated()) {
+ int i = StormTrackUIManager.getCoordinateIndex(warngenLayer,
+ state.getWarningPolygon().getCoordinates(), c2);
+ if (i != -1) {
+ this.movePointIndex = i;
+ }
+ warngenLayer.setModifiedVertexNeedsToBeUpdated(false);
}
- warngenLayer.setModifiedVertexNeedsToBeUpdated(false);
+ movePointIndex = warngenLayer.translatePolygonVertex(
+ this.movePointIndex, c2, false);
}
- movePointIndex = warngenLayer.translatePolygonVertex(
- this.movePointIndex, c2, false);
break;
}
}
diff --git a/cots/com.sun.xml.bind/com.sun.xml.bind.ecl b/cots/com.sun.xml.bind/com.sun.xml.bind.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cots/edu.uci.ics.crawler4j/edu.uci.ics.crawler4j.ecl b/cots/edu.uci.ics.crawler4j/edu.uci.ics.crawler4j.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cots/it.geosolutions/it.geosolutions.ecl b/cots/it.geosolutions/it.geosolutions.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cots/net.dods/net.dods.ecl b/cots/net.dods/net.dods.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cots/net.opengis/net.opengis.ecl b/cots/net.opengis/net.opengis.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cots/ogc.tools.gml/ogc.tools.gml.ecl b/cots/ogc.tools.gml/ogc.tools.gml.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cots/org.apache.commons.cxf/org.apache.commons.cxf.ecl b/cots/org.apache.commons.cxf/org.apache.commons.cxf.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cots/org.apache.ws.security/org.apache.ws.security.ecl b/cots/org.apache.ws.security/org.apache.ws.security.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cots/org.codehaus.jackson/org.codehaus.jackson.ecl b/cots/org.codehaus.jackson/org.codehaus.jackson.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/build.edex/esb/conf/spring/cron.properties b/edexOsgi/build.edex/esb/conf/spring/cron.properties
index 8bed28809e..3cc6b840d8 100644
--- a/edexOsgi/build.edex/esb/conf/spring/cron.properties
+++ b/edexOsgi/build.edex/esb/conf/spring/cron.properties
@@ -22,6 +22,8 @@ purge.cron=0+0/1+*+*+*+?
purge.outgoing.cron=0+30+*+*+*+?
# Interval at which the logs are purged
purge.logs.cron=0+30+0+*+*+?
+# Interval at which the service backup logs are purged
+purge.svcbu.logs.cron=0+30+0+*+*+?
# Master switch to enable and disable purging
purge.enabled=true
diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.vm
index 7642b1dcc5..e6854cefeb 100644
--- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.vm
+++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarning.vm
@@ -11,6 +11,7 @@
## VERSION AWIPS II 1.5 -- MAR 2 2012 OB12.2.1-4 ##
## BY QINGLU LIN 7-31-2012 DR 15217 use roundAndPad ##
## BY QINGLU LIN 8-14-2012 DR 14493 use TMLtime ##
+## BY QINGLU LIN 2-04-2013 DR 15198 Added to ${area.name} for NEW. ##
################################################################
## Added Volcano Information in version 1.3 for sites where
## Volcanoes affect their marine zones. If sites wish to hide
@@ -69,7 +70,7 @@ SPECIAL MARINE WARNING FOR...
#end
#foreach (${area} in ${areas})
##
-${area.name}...
+${area.name}...
#end
##
##
diff --git a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.vm b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.vm
index 0779831aa9..fbf60a1877 100644
--- a/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.vm
+++ b/edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/specialMarineWarningFollowup.vm
@@ -11,6 +11,7 @@
## VERSION AWIPS II 1.5 -- MAR 2 2012 OB12.2.1-4 ##
## BY MGAMAZAYCHIKOV -- JUL 20 2012 DR15006 ##
## BY QINGLU LIN 7-31-2012 DR 15217 use roundAndPad ##
+## BY QINGLU LIN 2-04-2013 DR 15198 Added to ${area.name} for CON/CAN/(CON/CAN)/COR/EXP ##
#####################################################
## Added Volcano Information in version 1.3 for sites where
## Volcanoes affect their marine zones. If sites wish to hide
@@ -87,7 +88,7 @@ THIS IS A TEST MESSAGE.##
THE AFFECTED AREAS WERE...
#foreach (${area} in ${areas})
-${area.name}...
+${area.name}...
#end
######################################################################
@@ -361,7 +362,7 @@ THIS IS A TEST MESSAGE.##
FOR THE FOLLOWING AREAS...
#foreach (${area} in ${areas})
-${area.name}...
+${area.name}...
#end
## Storm current location description
@@ -515,7 +516,7 @@ THIS IS A TEST MESSAGE.##
THE AFFECTED AREAS WERE...
#foreach (${area} in ${cancelareas})
-${area.name}...
+${area.name}...
#end
######################################################################
@@ -777,7 +778,7 @@ THIS IS A TEST MESSAGE.##
FOR THE FOLLOWING AREAS...
#foreach (${area} in ${areas})
-${area.name}...
+${area.name}...
#end
#if(${productClass}=="T")
@@ -1190,7 +1191,7 @@ THIS IS A TEST MESSAGE.##
FOR THE FOLLOWING AREAS...
#foreach (${area} in ${areas})
-${area.name}...
+${area.name}...
#end
#if(${productClass}=="T")
@@ -1330,7 +1331,7 @@ WILL EXPIRE AT ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtime
THE AFFECTED AREAS WERE...
#foreach (${area} in ${areas})
-${area.name}...
+${area.name}...
#end
######################################################################
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
index 1520e2c58d..8c43e770c5 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
@@ -350,6 +350,14 @@
+
+
+
+
+
+
@@ -489,6 +497,8 @@
uri="clusteredquartz://gfe/exportDigitalData/?cron=${gfe.cron}" />
+
@@ -528,6 +538,22 @@
+
+
+
+
+
+
+
+
+
+ java.lang.Throwable
+
+
+
+
+
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/CleanupSvcBuLogRequestHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/CleanupSvcBuLogRequestHandler.java
new file mode 100644
index 0000000000..83eb591cae
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/CleanupSvcBuLogRequestHandler.java
@@ -0,0 +1,78 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.edex.plugin.gfe.server.handler.svcbu;
+
+import java.util.Date;
+import java.util.Random;
+import java.util.Timer;
+
+import com.raytheon.edex.plugin.gfe.svcbackup.ServiceBackupNotificationManager;
+import com.raytheon.edex.plugin.gfe.svcbackup.SvcbuCleanupLogsTask;
+import com.raytheon.edex.plugin.gfe.svcbackup.SvcBackupUtil;
+import com.raytheon.uf.common.dataplugin.gfe.request.CleanupSvcBuLogRequest;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
+import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+
+/**
+ * TODO Add Description
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Jan 3, 2013 jdynina Initial creation
+ *
+ *
+ *
+ * @author jdynina
+ * @version 1.0
+ */
+
+public class CleanupSvcBuLogRequestHandler implements
+ IRequestHandler {
+
+ private static Timer svcbuLogCleanTimer = new Timer(true);
+
+ @Override
+ public Object handleRequest(CleanupSvcBuLogRequest request) {
+
+ ServerResponse sr = new ServerResponse();
+
+ try {
+ ServiceBackupNotificationManager
+ .sendMessageNotification("Running service backup log cleanup script");
+ SvcBackupUtil.execute("cleanup_svcbu_logs");
+ } catch (Exception e) {
+ sr.addMessage("Error executing service backup log cleanup script! "
+ + e.getLocalizedMessage());
+ }
+ return sr;
+ }
+
+ public void svcbuLogCleanupCron() throws Exception {
+ Random rand = new Random(System.currentTimeMillis());
+ Date executionDate = new Date(System.currentTimeMillis()
+ + Math.abs(rand.nextInt() % 45) * 60 * 1000);
+ svcbuLogCleanTimer.schedule(new SvcbuCleanupLogsTask(executionDate),
+ executionDate);
+ }
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcbuCleanupLogsTask.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcbuCleanupLogsTask.java
new file mode 100644
index 0000000000..3a5175e57c
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcbuCleanupLogsTask.java
@@ -0,0 +1,72 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.edex.plugin.gfe.svcbackup;
+
+import java.util.Date;
+import java.util.TimerTask;
+
+import com.raytheon.edex.plugin.gfe.server.handler.svcbu.CleanupSvcBuLogRequestHandler;
+import com.raytheon.uf.common.dataplugin.gfe.request.CleanupSvcBuLogRequest;
+
+/**
+ * TODO Add Description
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Jan 3, 2013 jdynina Initial creation
+ *
+ *
+ *
+ * @author jdynina
+ * @version 1.0
+ */
+
+public class SvcbuCleanupLogsTask extends TimerTask {
+
+ public SvcbuCleanupLogsTask(Date executionTime) {
+ ServiceBackupNotificationManager
+ .sendMessageNotification("Service backup log cleanup cron scheduled for execution at: "
+ + executionTime);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.util.TimerTask#run()
+ */
+ @Override
+ public void run() {
+ ServiceBackupNotificationManager
+ .sendMessageNotification("Cleanup service configuration logs cron started.");
+ try {
+ new CleanupSvcBuLogRequestHandler()
+ .handleRequest(new CleanupSvcBuLogRequest());
+ } catch (Exception e) {
+ ServiceBackupNotificationManager
+ .sendErrorMessageNotification(
+ "Cleanup service backup logs cron failed to execute.",
+ e);
+ }
+ }
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
index 46ce767df6..3a2aafc21e 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
@@ -72,7 +72,7 @@ from com.raytheon.uf.edex.database.cluster import ClusterTask
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 07/06/09 1995 bphillip Initial Creation.
-#
+# 01/17/13 15588 jdynina Fixed Publish history removal
#
#
@@ -82,9 +82,8 @@ BATCH_DELAY = 0.0
ISC_USER="isc"
-
class WECache(object):
- def __init__(self, we, tr=None):
+ def __init__(self, we, tr=None):
self._grids = []
self._hist = []
self._we = we
@@ -156,12 +155,17 @@ class WECache(object):
index = bisect.bisect_left(map(lambda x : x[0], self._inv), tr[0])
self._inv.insert(index, tr)
history = ArrayList()
+
for h in hist:
- #strip out grid history to allow for publishing correctly
- #when merging Fcst/Official out of A1
- hh = GridDataHistory(h)
- hh.setPublishTime(None)
- history.add(hh)
+ dbName = self._we.getParmid().getDbId().toString()
+ if dbName.find('Fcst') != -1:
+ #strip out publish time to allow for publishing correctly
+ #when merging Fcst out of A1
+ hh = GridDataHistory(h)
+ hh.setPublishTime(None)
+ history.add(hh)
+ else:
+ history.add(GridDataHistory(h))
if gridType == 'SCALAR':
self._we.setItemScalar(timeRange, grid.astype(numpy.float32), history)
elif gridType == 'VECTOR':
@@ -321,7 +325,6 @@ class IscMosaic:
"-n and -a altMask switches not compatible")
raise Exception, "Bad command line"
-
self.__inFiles = JUtil.pyValToJavaObj(self.__inFiles)
self.__processTimePeriod = (startTime, endTime)
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HPCqpfNDFD.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HPCqpfNDFD.xml
index de3d7e5b3e..721a8610ed 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HPCqpfNDFD.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HPCqpfNDFD.xml
@@ -33,7 +33,7 @@
- tp
+ tpHPCndfd
6 hr Total Precip
mm
millimeter
diff --git a/edexOsgi/com.raytheon.uf.common.dataaccess/com.raytheon.uf.common.dataaccess.ecl b/edexOsgi/com.raytheon.uf.common.dataaccess/com.raytheon.uf.common.dataaccess.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.bandwidth/com.raytheon.uf.common.datadelivery.bandwidth.ecl b/edexOsgi/com.raytheon.uf.common.datadelivery.bandwidth/com.raytheon.uf.common.datadelivery.bandwidth.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.event/com.raytheon.uf.common.datadelivery.event.ecl b/edexOsgi/com.raytheon.uf.common.datadelivery.event/com.raytheon.uf.common.datadelivery.event.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.registry/com.raytheon.uf.common.datadelivery.registry.ecl b/edexOsgi/com.raytheon.uf.common.datadelivery.registry/com.raytheon.uf.common.datadelivery.registry.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.request/com.raytheon.uf.common.datadelivery.request.ecl b/edexOsgi/com.raytheon.uf.common.datadelivery.request/com.raytheon.uf.common.datadelivery.request.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/com.raytheon.uf.common.datadelivery.retrieval.ecl b/edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/com.raytheon.uf.common.datadelivery.retrieval.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/CleanupSvcBuLogRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/CleanupSvcBuLogRequest.java
new file mode 100644
index 0000000000..bed02559a4
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/CleanupSvcBuLogRequest.java
@@ -0,0 +1,48 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.common.dataplugin.gfe.request;
+
+import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
+
+/**
+ * TODO Add Description
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Jan 3, 2013 jdynina Initial creation
+ *
+ *
+ *
+ * @author jdynina
+ * @version 1.0
+ */
+
+@DynamicSerialize
+public class CleanupSvcBuLogRequest extends AbstractGfeRequest {
+
+ public CleanupSvcBuLogRequest() {
+
+ }
+
+}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/com.raytheon.uf.common.dataplugin.grid.ecl b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/com.raytheon.uf.common.dataplugin.grid.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.event/com.raytheon.uf.common.event.ecl b/edexOsgi/com.raytheon.uf.common.event/com.raytheon.uf.common.event.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.gridcoverage/com.raytheon.uf.common.gridcoverage.ecl b/edexOsgi/com.raytheon.uf.common.gridcoverage/com.raytheon.uf.common.gridcoverage.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.image/com.raytheon.uf.common.image.ecl b/edexOsgi/com.raytheon.uf.common.image/com.raytheon.uf.common.image.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.json/com.raytheon.uf.common.json.ecl b/edexOsgi/com.raytheon.uf.common.json/com.raytheon.uf.common.json.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.parameter/com.raytheon.uf.common.parameter.ecl b/edexOsgi/com.raytheon.uf.common.parameter/com.raytheon.uf.common.parameter.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/com.raytheon.uf.common.registry.ebxml.ecl b/edexOsgi/com.raytheon.uf.common.registry.ebxml/com.raytheon.uf.common.registry.ebxml.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.registry.event/com.raytheon.uf.common.registry.event.ecl b/edexOsgi/com.raytheon.uf.common.registry.event/com.raytheon.uf.common.registry.event.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/com.raytheon.uf.common.registry.schemas.ebxml.ecl b/edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/com.raytheon.uf.common.registry.schemas.ebxml.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.registry.schemas.iso19115/com.raytheon.uf.common.registry.schemas.iso19115.ecl b/edexOsgi/com.raytheon.uf.common.registry.schemas.iso19115/com.raytheon.uf.common.registry.schemas.iso19115.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.spatial/com.raytheon.uf.common.spatial.ecl b/edexOsgi/com.raytheon.uf.common.spatial/com.raytheon.uf.common.spatial.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.stats/com.raytheon.uf.common.stats.ecl b/edexOsgi/com.raytheon.uf.common.stats/com.raytheon.uf.common.stats.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.units/com.raytheon.uf.common.units.ecl b/edexOsgi/com.raytheon.uf.common.units/com.raytheon.uf.common.units.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.common.useradmin/com.raytheon.uf.common.useradmin.ecl b/edexOsgi/com.raytheon.uf.common.useradmin/com.raytheon.uf.common.useradmin.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/com.raytheon.uf.edex.datadelivery.bandwidth.ecl b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/com.raytheon.uf.edex.datadelivery.bandwidth.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/com.raytheon.uf.edex.datadelivery.event.ecl b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/com.raytheon.uf.edex.datadelivery.event.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.feature/com.raytheon.uf.edex.datadelivery.feature.ecl b/edexOsgi/com.raytheon.uf.edex.datadelivery.feature/com.raytheon.uf.edex.datadelivery.feature.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/com.raytheon.uf.edex.datadelivery.harvester.ecl b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/com.raytheon.uf.edex.datadelivery.harvester.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.registry/com.raytheon.uf.edex.datadelivery.registry.ecl b/edexOsgi/com.raytheon.uf.edex.datadelivery.registry/com.raytheon.uf.edex.datadelivery.registry.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/com.raytheon.uf.edex.datadelivery.retrieval.ecl b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/com.raytheon.uf.edex.datadelivery.retrieval.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/com.raytheon.uf.edex.datadelivery.service.ecl b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/com.raytheon.uf.edex.datadelivery.service.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.ebxml/com.raytheon.uf.edex.ebxml.ecl b/edexOsgi/com.raytheon.uf.edex.ebxml/com.raytheon.uf.edex.ebxml.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.event.feature/com.raytheon.uf.edex.event.feature.ecl b/edexOsgi/com.raytheon.uf.edex.event.feature/com.raytheon.uf.edex.event.feature.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.event/com.raytheon.uf.edex.event.ecl b/edexOsgi/com.raytheon.uf.edex.event/com.raytheon.uf.edex.event.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.grid.staticdata/com.raytheon.uf.edex.grid.staticdata.ecl b/edexOsgi/com.raytheon.uf.edex.grid.staticdata/com.raytheon.uf.edex.grid.staticdata.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.gridcoverage/com.raytheon.uf.edex.gridcoverage.ecl b/edexOsgi/com.raytheon.uf.edex.gridcoverage/com.raytheon.uf.edex.gridcoverage.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.menus/com.raytheon.uf.edex.menus.ecl b/edexOsgi/com.raytheon.uf.edex.menus/com.raytheon.uf.edex.menus.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl b/edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.parameter/com.raytheon.uf.edex.parameter.ecl b/edexOsgi/com.raytheon.uf.edex.parameter/com.raytheon.uf.edex.parameter.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl b/edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/com.raytheon.uf.edex.plugin.grid.ecl b/edexOsgi/com.raytheon.uf.edex.plugin.grid/com.raytheon.uf.edex.plugin.grid.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/com.raytheon.uf.edex.plugin.obs.ogc.ecl b/edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/com.raytheon.uf.edex.plugin.obs.ogc.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/com.raytheon.uf.edex.registry.ebxml.ecl b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/com.raytheon.uf.edex.registry.ebxml.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.feature/com.raytheon.uf.edex.registry.feature.ecl b/edexOsgi/com.raytheon.uf.edex.registry.feature/com.raytheon.uf.edex.registry.feature.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/com.raytheon.uf.edex.stats.ecl b/edexOsgi/com.raytheon.uf.edex.stats/com.raytheon.uf.edex.stats.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.useradmin/com.raytheon.uf.edex.useradmin.ecl b/edexOsgi/com.raytheon.uf.edex.useradmin/com.raytheon.uf.edex.useradmin.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.wcs/com.raytheon.uf.edex.wcs.ecl b/edexOsgi/com.raytheon.uf.edex.wcs/com.raytheon.uf.edex.wcs.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.wfs/com.raytheon.uf.edex.wfs.ecl b/edexOsgi/com.raytheon.uf.edex.wfs/com.raytheon.uf.edex.wfs.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.edex.wms/com.raytheon.uf.edex.wms.ecl b/edexOsgi/com.raytheon.uf.edex.wms/com.raytheon.uf.edex.wms.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/cleanup_svcbu_logs b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/cleanup_svcbu_logs
new file mode 100644
index 0000000000..4f7e5d7d43
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/cleanup_svcbu_logs
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ ${#AWIPS_HOME} = 0 ]
+then
+ path_to_script=`readlink -f $0`
+ export AWIPS_HOME=$(dirname $(dirname $(dirname $(dirname $path_to_script))))
+fi
+
+. ${AWIPS_HOME}/GFESuite/ServiceBackup/configuration/svcbu.env
+
+find ${IFPS_LOG}/* -mtime +7 -exec rm -fr {} \; 2>/dev/null
+
+
diff --git a/nativeLib/nativeLib.ecl b/nativeLib/nativeLib.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java b/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
index 223aa19e53..6846736319 100644
--- a/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
+++ b/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
@@ -97,6 +97,7 @@ public class NsharpResourceHandler {
private int dtYOrig = NsharpConstants.DATA_TIMELINE_Y_ORIG;
private int dtWidth = NsharpConstants.DATA_TIMELINE_WIDTH;
private String paneConfigurationName;
+ private int numTimeLinePerPage=1;
/* Hodograph Modes - definition is based on definitions in globals_xw.h of BigNsharp */
private static final int HODO_NORMAL = 0;
//private static int HODO_EFFECTIVE= 1; not used in BigNsharp source code
@@ -324,8 +325,6 @@ public class NsharpResourceHandler {
break;
}
}
- int numTimeLinePerPage = (cnYOrig-dtNextPageEnd)/charHeight;
- curStnIdPage = totalStnIdPage/numTimeLinePerPage + 1;
setCurSndProfileProp();
setCurrentSoundingLayerInfo();
resetData();
@@ -353,8 +352,6 @@ public class NsharpResourceHandler {
break;
}
}
- int numTimeLinePerPage = (cnYOrig-dtNextPageEnd)/charHeight;
- curTimeLinePage = currentTimeLineStateListIndex/numTimeLinePerPage + 1;
setCurSndProfileProp();
setCurrentSoundingLayerInfo();
resetData();
@@ -1579,21 +1576,7 @@ public class NsharpResourceHandler {
}
//set total time line group and stn id list page number
- int numTimeLinePerPage = (cnYOrig-dtNextPageEnd)/charHeight;
- //fix bug, when numTimeLinePerPage ==0 case
- if(numTimeLinePerPage <= 0) {
- numTimeLinePerPage = 1;
- totalTimeLinePage = timeLineStateList.size();
- curTimeLinePage = currentTimeLineStateListIndex;
- totalStnIdPage = stnStateList.size();
- curStnIdPage= currentStnStateListIndex;
- }
- else{
- totalTimeLinePage = timeLineStateList.size()/numTimeLinePerPage + 1;
- curTimeLinePage = currentTimeLineStateListIndex/numTimeLinePerPage + 1;
- totalStnIdPage = stnStateList.size()/numTimeLinePerPage + 1;
- curStnIdPage= currentStnStateListIndex/numTimeLinePerPage + 1;
- }
+ calculateTimeStnBoxData();
/* Chin: TBD: do we need these code?
@@ -1607,7 +1590,9 @@ public class NsharpResourceHandler {
}*/
//set data time to descriptor
//this is necessary for looping
- if (( skewtPaneRsc.getDescriptor().getFramesInfo().getFrameCount() == 0)&& !getTimeMatcher) {
+ // starting 13.2.1, this line is changed by Raytheon
+ if (( skewtPaneRsc.getDescriptor().getFramesInfo().getFrameCount() == 0)&& !getTimeMatcher) {
+ //was this line before 13.2.1 if (( skewtPaneRsc.getDescriptor().getTimeMatcher() == null || skewtPaneRsc.getDescriptor().getTimeMatcher().getTimeMatchBasis() == null)&& !getTimeMatcher) {
//DataTime[] dataTimes = new DataTime[dataTimelineList.size()];
//Chin Note: we just have to do this once and set dataTimes size bigger than 1.
//Nsharp handles changing frame itself. It just need system to send change frame notice.
@@ -1650,7 +1635,6 @@ public class NsharpResourceHandler {
public void handleUserClickOnStationId(Coordinate c) {
- int numStnIdPerPage = (cnYOrig-dtNextPageEnd)/charHeight;
//first to find if it is for change to next page, or change sorting
//System.out.println("numTimeLinePerPage="+numTimeLinePerPage+"gap="+(cnYOrig-dtNextPageEnd));
int index =((int)(c.y - dtYOrig))/ charHeight;
@@ -1672,7 +1656,7 @@ public class NsharpResourceHandler {
}
// recalculate index for time line
index =((int)(c.y - dtNextPageEnd))/ charHeight +
- (curStnIdPage-1)* numStnIdPerPage ;
+ (curStnIdPage-1)* numTimeLinePerPage ;
if( index < this.stnStateList.size() ){
switch(stnStateList.get(index).getStnState()){
@@ -1696,7 +1680,6 @@ public class NsharpResourceHandler {
}
public void handleUserClickOnTimeLine(Coordinate c) {
- int numTimeLinePerPage = (cnYOrig-dtNextPageEnd)/charHeight;
//first to find if it is for change to next/prev page
//System.out.println("numTimeLinePerPage="+numTimeLinePerPage+"gap="+(cnYOrig-dtNextPageEnd));
int index =((int)(c.y - dtYOrig))/ charHeight;
@@ -1833,7 +1816,6 @@ public class NsharpResourceHandler {
break;
}
- int numTimeLinePerPage = (cnYOrig-dtNextPageEnd)/charHeight;
curTimeLinePage = currentTimeLineStateListIndex/numTimeLinePerPage + 1;
setCurSndProfileProp();
setCurrentSoundingLayerInfo();
@@ -1935,8 +1917,7 @@ public class NsharpResourceHandler {
}
previousTimeLineStateListIndex = currentTimeLineStateListIndex;
currentTimeLineStateListIndex = targetIndex;
- int numTimeLinePerPage = (cnYOrig-dtNextPageEnd)/charHeight;
- curTimeLinePage = currentTimeLineStateListIndex/numTimeLinePerPage + 1;
+ curTimeLinePage = currentTimeLineStateListIndex/numTimeLinePerPage + 1;
setCurSndProfileProp();
setCurrentSoundingLayerInfo();
resetData();
@@ -2000,7 +1981,6 @@ public class NsharpResourceHandler {
break;
}
}
- int numTimeLinePerPage = (cnYOrig-dtNextPageEnd)/charHeight;
curStnIdPage = currentStnStateListIndex/numTimeLinePerPage + 1;
setCurSndProfileProp();
setCurrentSoundingLayerInfo();
@@ -2744,7 +2724,8 @@ public class NsharpResourceHandler {
if(insetPaneRsc!=null)
insetPaneRsc.createInsetWireFrameShapes();
if(skewtPaneRsc!=null)
- skewtPaneRsc.handleResize();
+ //CHIN:::fix edit zoom issue skewtPaneRsc.handleResize();
+ skewtPaneRsc.createRscWireFrameShapes();
}
}
catch(Exception e) {
@@ -2813,7 +2794,8 @@ public class NsharpResourceHandler {
nsharpNative.populateSndgData(soundingLys);
//get storm motion wind data after populate sounding from NsharpLib
skewtPaneRsc.setSoundingLys(soundingLys);
- skewtPaneRsc.handleResize();
+ //CHIN:::fix edit zoom issue skewtPaneRsc.handleResize();
+ skewtPaneRsc.createRscWireFrameShapes();
if(hodoPaneRsc!=null){
hodoPaneRsc.setSoundingLys(soundingLys);
hodoPaneRsc.createRscHodoWindShapeAll();
@@ -2851,11 +2833,9 @@ public class NsharpResourceHandler {
nsharpNative.populateSndgData(soundingLys);
//get storm motion wind data after populate sounding from NsharpLib
skewtPaneRsc.setSoundingLys(soundingLys);
- skewtPaneRsc.handleResize();
- //skewtPaneRsc.createRscPressTempCurveShapeAll();
- //skewtPaneRsc.createRscwetBulbTraceShape();
- //skewtPaneRsc.createRscVTempTraceShape();
- //skewtPaneRsc.createParcelShapes(parcelList);
+ //CHIN:::fix edit zoom issue skewtPaneRsc.handleResize();
+ skewtPaneRsc.createRscWireFrameShapes();
+
if(hodoPaneRsc!=null){
hodoPaneRsc.setSoundingLys(soundingLys);
hodoPaneRsc.createRscHodoWindShapeAll();
@@ -2911,7 +2891,8 @@ public class NsharpResourceHandler {
}
if(skewtPaneRsc!=null){
skewtPaneRsc.setSoundingLys(soundingLys);
- skewtPaneRsc.handleResize();
+ //CHIN:::fix edit zoom issue skewtPaneRsc.handleResize();
+ skewtPaneRsc.createRscWireFrameShapes();
}
if(hodoPaneRsc!=null){
hodoPaneRsc.setSoundingLys(soundingLys);
@@ -2951,7 +2932,8 @@ public class NsharpResourceHandler {
}
if(skewtPaneRsc!=null){
skewtPaneRsc.setSoundingLys(soundingLys);
- skewtPaneRsc.handleResize();
+ //CHIN:::fix edit zoom issue skewtPaneRsc.handleResize();
+ skewtPaneRsc.createRscWireFrameShapes();
}
if(hodoPaneRsc!=null){
hodoPaneRsc.setSoundingLys(soundingLys);
@@ -3205,18 +3187,7 @@ public class NsharpResourceHandler {
this.dtWidth = dtWidth;
this.cnYOrig = cnYOrig;
this.dtNextPageEnd = dtNextPage_end;
- int numTimeLinePerPage = (cnYOrig-dtNextPageEnd)/charHeight;
- if(numTimeLinePerPage<=0)
- numTimeLinePerPage=1;
- //System.out.println("numTimeLinePerPage="+numTimeLinePerPage);
- totalTimeLinePage = timeLineStateList.size()/numTimeLinePerPage ;
- if(timeLineStateList.size()%numTimeLinePerPage != 0)
- totalTimeLinePage= totalTimeLinePage+1;
- curTimeLinePage = currentTimeLineStateListIndex/numTimeLinePerPage+1;
- totalStnIdPage = stnStateList.size()/numTimeLinePerPage;
- if(stnStateList.size()%numTimeLinePerPage != 0)
- totalStnIdPage++;
- curStnIdPage= currentStnStateListIndex/numTimeLinePerPage + 1; //NEW CODE
+ calculateTimeStnBoxData();
}
/*public void setCharHeight(int charHeight) {
@@ -3233,5 +3204,20 @@ public class NsharpResourceHandler {
return paneConfigurationName;
}
+ private void calculateTimeStnBoxData(){
+ //set total time line group and stn id list page number
+ numTimeLinePerPage = (cnYOrig-dtNextPageEnd)/charHeight;
+ if(numTimeLinePerPage<=0)
+ numTimeLinePerPage=1;
+ //System.out.println("numTimeLinePerPage="+numTimeLinePerPage);
+ totalTimeLinePage = timeLineStateList.size()/numTimeLinePerPage ;
+ if(timeLineStateList.size()%numTimeLinePerPage != 0)
+ totalTimeLinePage= totalTimeLinePage+1;
+ curTimeLinePage = currentTimeLineStateListIndex/numTimeLinePerPage+1;
+ totalStnIdPage = stnStateList.size()/numTimeLinePerPage;
+ if(stnStateList.size()%numTimeLinePerPage != 0)
+ totalStnIdPage++;
+ curStnIdPage= currentStnStateListIndex/numTimeLinePerPage + 1;
+ }
}
diff --git a/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java b/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
index 9fd5ca4795..9ffb087f50 100644
--- a/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
+++ b/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
@@ -83,12 +83,15 @@ public class NsharpTimeStnPaneResource extends NsharpAbstractPaneResource{
}
private void drawNsharpColorNotation(IGraphicsTarget target, Rectangle rect) throws VizException {
+
PixelExtent extent = new PixelExtent(rect);
RGB color;
target.setupClippingPlane(extent);
target.drawRect(extent,NsharpConstants.backgroundColor, 1.0f, 1.0f);
//plot notations:
-
+ if(dtHeight >= paneHeight)
+ return;
+ //draw time line page title etc. only when pane box height is larger than timeline box height
double x = cnXOrig+5*xRatio;
double y = cnYOrig+1.5*charHeight;
//double xGap = paneWidth/3*xRatio;
@@ -135,50 +138,60 @@ public class NsharpTimeStnPaneResource extends NsharpAbstractPaneResource{
PixelExtent extent = new PixelExtent(rect);
target.setupClippingPlane(extent);
target.drawRect(extent,NsharpConstants.backgroundColor, 1.0f, 1.0f);
- double x = dtXOrig;
- double y = dtYOrig-1.5*charHeight*yRatio;
- String s = timeLineStateList.size() + " time lines, page " + curTimeLinePage+"/"+totalTimeLinePage;
- target.drawString(font10, s, x,
- y, 0.0,
- IGraphicsTarget.TextStyle.NORMAL,
- NsharpConstants.color_green,
- HorizontalAlignment.LEFT,
- VerticalAlignment.TOP, null);
- y = dtYOrig;
- target.drawLine(dtXOrig, y, 0.0,dtXEnd , y, 0.0,NsharpConstants.color_white,1, LineStyle.SOLID);
- //System.out.println("drawNsharpDataTimelines picked stn info: "+ pickedStnInfoStr);
+ double x;
+ double y;
+ String s;
+ if(dtHeight < paneHeight){
+ //draw time line page title etc. only when pane box height is larger than timeline box height
+ x = dtXOrig;
+ y = dtYOrig-1.5*charHeight*yRatio;
+ s = timeLineStateList.size() + " time lines, page " + curTimeLinePage+"/"+totalTimeLinePage;
+ target.drawString(font10, s, x,
+ y, 0.0,
+ IGraphicsTarget.TextStyle.NORMAL,
+ NsharpConstants.color_green,
+ HorizontalAlignment.LEFT,
+ VerticalAlignment.TOP, null);
+ y = dtYOrig;
+ target.drawLine(dtXOrig, y, 0.0,dtXEnd , y, 0.0,NsharpConstants.color_white,1, LineStyle.SOLID);
+ //System.out.println("drawNsharpDataTimelines picked stn info: "+ pickedStnInfoStr);
- x = dtXOrig +dtWidth/2;
- // line divide nextPage and prevPage strings
- target.drawLine(x, y, 0.0,
- x , y+1.2*charHeight*yRatio, 0.0,
- NsharpConstants.color_white,1, LineStyle.SOLID);
+ x = dtXOrig +dtWidth/2;
+ // line divide nextPage and prevPage strings
+ target.drawLine(x, y, 0.0,
+ x , y+1.2*charHeight*yRatio, 0.0,
+ NsharpConstants.color_white,1, LineStyle.SOLID);
- x = dtXOrig + 5;
- y = y+1.2*charHeight*yRatio;
- s = "nextPage";
- target.drawString(font10, s, x,
- y, 0.0,
- IGraphicsTarget.TextStyle.NORMAL,
- NsharpConstants.color_yellow,
- HorizontalAlignment.LEFT,
- VerticalAlignment.BOTTOM, null);
- x= dtXOrig + dtWidth/2 + 5;
- s = "prevPage";
- target.drawString(font10, s, x,
- y, 0.0,
- IGraphicsTarget.TextStyle.NORMAL,
- NsharpConstants.color_yellow,
- HorizontalAlignment.LEFT,
- VerticalAlignment.BOTTOM, null);
-
- //line below nextPage string
- target.drawLine(dtXOrig, y, 0.0,
- dtXEnd , y, 0.0,
- NsharpConstants.color_white,1, LineStyle.SOLID);
+ x = dtXOrig + 5;
+ y = y+1.2*charHeight*yRatio;
+ s = "nextPage";
+ target.drawString(font10, s, x,
+ y, 0.0,
+ IGraphicsTarget.TextStyle.NORMAL,
+ NsharpConstants.color_yellow,
+ HorizontalAlignment.LEFT,
+ VerticalAlignment.BOTTOM, null);
+ x= dtXOrig + dtWidth/2 + 5;
+ s = "prevPage";
+ target.drawString(font10, s, x,
+ y, 0.0,
+ IGraphicsTarget.TextStyle.NORMAL,
+ NsharpConstants.color_yellow,
+ HorizontalAlignment.LEFT,
+ VerticalAlignment.BOTTOM, null);
+ //line below nextPage string
+ target.drawLine(dtXOrig, y, 0.0,
+ dtXEnd , y, 0.0,
+ NsharpConstants.color_white,1, LineStyle.SOLID);
+ }
int numTimeLineToShowPerPage = (cnYOrig-dtNextPageEnd)/charHeight;
+ if(numTimeLineToShowPerPage <1){
+ numTimeLineToShowPerPage = dtHeight/charHeight;
+ if(numTimeLineToShowPerPage <1)
+ numTimeLineToShowPerPage=1;
+ }
int startIndex = (curTimeLinePage-1) * numTimeLineToShowPerPage;
if(timeLineStateList!= null){
@@ -257,50 +270,60 @@ public class NsharpTimeStnPaneResource extends NsharpAbstractPaneResource{
PixelExtent extent = new PixelExtent(rect);
target.setupClippingPlane(extent);
target.drawRect(extent,NsharpConstants.backgroundColor, 1.0f, 1.0f);
- double x = stnXOrig;
- double y = stnYOrig -1.5*charHeight*yRatio;
- String s = stnStateList.size() + " stations, page " + curStnIdPage+"/"+totalStnIdPage;
- target.drawString(font10, s, x,
- y, 0.0,
- IGraphicsTarget.TextStyle.NORMAL,
- NsharpConstants.color_green,
- HorizontalAlignment.LEFT,
- VerticalAlignment.TOP, null);
- y = dtYOrig;
- target.drawLine(stnXOrig, y, 0.0,stnXEnd , y, 0.0,NsharpConstants.color_white,1, LineStyle.SOLID);
- //System.out.println("drawNsharpDataTimelines picked stn info: "+ pickedStnInfoStr);
- x = stnXOrig +dtWidth/2;
- // line divide nextPage and prevPage strings
- target.drawLine(x, y, 0.0,
- x , y+1.2*charHeight*yRatio, 0.0,
- NsharpConstants.color_white,1, LineStyle.SOLID);
+ double x;
+ double y;
+ String s;
+ if(dtHeight < paneHeight){
+ //draw time line page title etc. only when pane box height is larger than timeline box height
+ x = stnXOrig;
+ y = stnYOrig -1.5*charHeight*yRatio;
+ s = stnStateList.size() + " stations, page " + curStnIdPage+"/"+totalStnIdPage;
+ target.drawString(font10, s, x,
+ y, 0.0,
+ IGraphicsTarget.TextStyle.NORMAL,
+ NsharpConstants.color_green,
+ HorizontalAlignment.LEFT,
+ VerticalAlignment.TOP, null);
+ y = dtYOrig;
+ target.drawLine(stnXOrig, y, 0.0,stnXEnd , y, 0.0,NsharpConstants.color_white,1, LineStyle.SOLID);
+ //System.out.println("drawNsharpDataTimelines picked stn info: "+ pickedStnInfoStr);
+ x = stnXOrig +dtWidth/2;
+ // line divide nextPage and prevPage strings
+ target.drawLine(x, y, 0.0,
+ x , y+1.2*charHeight*yRatio, 0.0,
+ NsharpConstants.color_white,1, LineStyle.SOLID);
+
+ x = stnXOrig + 5;
+ y = y+1.2*charHeight*yRatio;
+ s = "nextPage";
+ target.drawString(font10, s, x,
+ y, 0.0,
+ IGraphicsTarget.TextStyle.NORMAL,
+ NsharpConstants.color_yellow,
+ HorizontalAlignment.LEFT,
+ VerticalAlignment.BOTTOM, null);
+
+ x= stnXOrig + dtWidth/2 + 5;
+ s = "prevPage";
+ target.drawString(font10, s, x,
+ y, 0.0,
+ IGraphicsTarget.TextStyle.NORMAL,
+ NsharpConstants.color_yellow,
+ HorizontalAlignment.LEFT,
+ VerticalAlignment.BOTTOM, null);
+
+ //line below neextPage string
+ target.drawLine(stnXOrig, y, 0.0,
+ stnXEnd , y, 0.0,
+ NsharpConstants.color_white,1, LineStyle.SOLID);
+ }
- x = stnXOrig + 5;
- y = y+1.2*charHeight*yRatio;
- s = "nextPage";
- target.drawString(font10, s, x,
- y, 0.0,
- IGraphicsTarget.TextStyle.NORMAL,
- NsharpConstants.color_yellow,
- HorizontalAlignment.LEFT,
- VerticalAlignment.BOTTOM, null);
-
- x= stnXOrig + dtWidth/2 + 5;
- s = "prevPage";
- target.drawString(font10, s, x,
- y, 0.0,
- IGraphicsTarget.TextStyle.NORMAL,
- NsharpConstants.color_yellow,
- HorizontalAlignment.LEFT,
- VerticalAlignment.BOTTOM, null);
-
- //line below neextPage string
- target.drawLine(stnXOrig, y, 0.0,
- stnXEnd , y, 0.0,
- NsharpConstants.color_white,1, LineStyle.SOLID);
-
-
int numStnToShow = (cnYOrig-dtNextPageEnd)/charHeight;
+ if(numStnToShow <1){
+ numStnToShow = dtHeight/charHeight;
+ if(numStnToShow <1)
+ numStnToShow=1;
+ }
int startIndex = (rscHandler.getCurStnIdPage()-1) * numStnToShow;
int compIndex= 1;
int colorIndex;
@@ -453,16 +476,26 @@ public class NsharpTimeStnPaneResource extends NsharpAbstractPaneResource{
float prevWidth = paneWidth;
paneHeight = (int) ext.getHeight();
paneWidth = (int) (ext.getWidth());
- xRatio = xRatio* paneWidth/prevWidth;
- yRatio = yRatio* paneHeight/prevHeight;
- //charHeight = (int)(NsharpConstants.CHAR_HEIGHT_*yRatio);
+ //xRatio = xRatio* paneWidth/prevWidth;
+ //DEBUGGING yRatio = yRatio* paneHeight/prevHeight;
+ xRatio = 1;
+ yRatio = 1;
+ //if pane height is less than 10 char height, then just plot time line. not plot "messages/title/notations" etc..
+ if(paneHeight > (int)(10* charHeight*yRatio)){
+ dtYOrig = (int) ext.getMinY()+(int)(2* charHeight*yRatio);
+ cnHeight = (int)(3* charHeight*yRatio);
+ dtHeight = paneHeight-(int)(5* charHeight*yRatio);
+ dtNextPageEnd = dtYOrig+ (int) (2*charHeight*yRatio);
+ }
+ else {
+ dtYOrig = (int) (ext.getMinY());
+ cnHeight = 0;
+ dtHeight = paneHeight;
+ dtNextPageEnd = dtYOrig;
+ }
dtXOrig = (int) (ext.getMinX());
- dtYOrig = (int) ext.getMinY()+(int)(2* charHeight*yRatio);
dtWidth = paneWidth/2;
dtXEnd = dtXOrig + dtWidth;
- cnHeight = (int)(3* charHeight*yRatio);
- dtHeight = paneHeight-dtYOrig-cnHeight;
- dtNextPageEnd = dtYOrig+ (int) (2*charHeight*yRatio);
stnXOrig = dtXEnd;
stnYOrig = dtYOrig;
stnWidth = dtWidth;
diff --git a/pythonPackages/qpid/bin/monitor_qpid_host.sh b/pythonPackages/qpid/bin/monitor_qpid_host.sh
index 6c8d3c2c59..c0a79d3a78 100644
--- a/pythonPackages/qpid/bin/monitor_qpid_host.sh
+++ b/pythonPackages/qpid/bin/monitor_qpid_host.sh
@@ -108,6 +108,22 @@ function captureQpidStat() {
numQpidConnections=$( qpid-stat -c | wc -l )
(( numQpidConnections-=3 ))
echo -e "Total Number of QPID Connections: ${numQpidConnections}" >> ${logDirectory}/${nowTimeDate}-qpid-stat.out
+ if [[ ${numQpidConnections} -ge 450 && ${numQpidConnections} -le 485 ]] ; then
+ echo -e "\tNOTE: Sending Major ITO to NCF because number of connections is between 450 and 485" >> ${logDirectory}/${nowTimeDate}-qpid-stat.out
+ if [[ -f /opt/OV/bin/OpC/opcmsg ]] ; then
+ opt/OV/bin/OpC/opcmsg application=QPIDD object=QPIDD msg_text="Number Of Connections To QPID is between 450-485: Please check system health" severity=Major msg_grp=AWIPS
+ else
+ echo -e "\tERROR - can not find /opt/OV/bin/OpC/opcmsg on $( hostname )" >> ${logDirectory}/${nowTimeDate}-qpid-stat.out
+ fi
+ elif [[ ${numQpidConnections} -gt 485 ]] ; then
+ echo -e "\tNOTE: Sending CRITIAL ITO to NCF because number of connections is > 485" >> ${logDirectory}/${nowTimeDate}-qpid-stat.out
+ if [[ -f /opt/OV/bin/OpC/opcmsg ]] ; then
+ /opt/OV/bin/OpC/opcmsg application=QPIDD object=QPIDD msg_text="Number Of Connections To QPID is > 485 -- Take IMMEDIATE action to prevent system failure" severity=Critical msg_grp=AWIPS
+ else
+ echo -e "\tERROR - can not find /opt/OV/bin/OpC/opcmsg on $( hostname )" >> ${logDirectory}/${nowTimeDate}-qpid-stat.out
+ fi
+ fi
+
echo >> ${logDirectory}/${nowTimeDate}-qpid-stat.out
for cmdArg in "-b" "-c" "-s" "-e" "-q -Smsg"
diff --git a/rpms/build/i386/build.sh b/rpms/build/i386/build.sh
index 50eeaba41d..7d336b1264 100644
--- a/rpms/build/i386/build.sh
+++ b/rpms/build/i386/build.sh
@@ -150,6 +150,7 @@ if [ "${1}" = "-delta" ]; then
buildRPM "awips2-gfesuite-server"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-ufpy"
+ buildRPM "awips2-python-qpid"
buildRPM "awips2-adapt-native"
buildRPM "awips2-aviation-shared"
diff --git a/tests/tests.ecl b/tests/tests.ecl
new file mode 100644
index 0000000000..e69de29bb2