xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master_14.2.2' into omaha_14.2.2

Browse source 
Former-commit-id: bce7039508 [formerly c0033681d38af55bff79efbceec119606fcc5c2f]
Former-commit-id: 8a7ea92c2b
This commit is contained in:
Steve Harris 2014-07-22 10:26:33 -05:00
commit 0314663e95
5 changed files with 241 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
View file

@ -248,6 +248,7 @@ public class RadarBiasTableDialog extends Dialog {
applyBtn = new Button(applyBtnComp, SWT.PUSH);
applyBtn.setText("Apply");
applyBtn.setLayoutData(bd);
applyBtn.setEnabled(false);
applyBtn.addSelectionListener(new SelectionAdapter() {
/*
@ -262,7 +263,6 @@ public class RadarBiasTableDialog extends Dialog {
applyBiasUpdate(dt);
MPEDisplayManager mgr = MPEDisplayManager.getCurrent();
mgr.setSavedData(false);
shell.dispose();
}
});
@ -435,6 +435,7 @@ public class RadarBiasTableDialog extends Dialog {
manEdit[ei].setText("YES");
lbiasTxt.setBackground(getParent().getDisplay()
.getSystemColor(SWT.COLOR_WHITE));
biasChgs.put(radIds[ei], ei);
applyBtn.setEnabled(true);
} catch (NumberFormatException e1) {
lbiasTxt.setBackground(getParent().getDisplay()
@ -471,7 +472,6 @@ public class RadarBiasTableDialog extends Dialog {
editbias[ai] = oldbias[ai];
lbTxts[ai].setText(String.format("%-1.2f", editbias[ai]));
biasChgs.put(radIds[ai], ai);
applyBtn.setEnabled(false);
manEdit[ai].setText("NO");
}
}

1
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
View file

@ -2879,7 +2879,6 @@
<name>HPCGuide</name>
<center>7</center>
<subcenter>5</subcenter>
<grid>197</grid>
<process>
<id>183</id>
</process>

30
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/subgrids/HPCGuideClip.xml
View file

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
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.
-->
<subGridDef>
<modelNames>HPCGuide</modelNames>
<referenceGrid>197</referenceGrid>
<nx>1000</nx>
<ny>689</ny>
<!--
<centerLatitude>46.0</centerLatitude>
<centerLongitude>-95.5</centerLongitude>
-->
</subGridDef>

157
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
View file

@ -96,7 +96,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 04/21/2008 387 M. Duff Initial Version.
* 04/21/2008 387 M. Duff Initial Version.
* 06/02/2008 1166 M. Duff Added checks for null data objects.
* 22Jul2008 1277 MW Fegan Use CoreDao in checkIngest().
* 10/16/2008 1548 jelkins Integrated ParameterCode Types and misc fixes
@ -123,6 +123,8 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
* 05/28/2014 3222 mpduff Fix posting time to be processed time so db doesn't show all post times the same
* 06/02/2014 mpduff Fix for caching of range checks.
* 06/26/2014 3321 mpduff Fix ingestSwitchMap checks
* 07/10/2014 3370 mpduff Fix update/insert issue for riverstatus
* 07/14/2014 mpduff Fix data range checks
* </pre>
*
* @author mduff
@ -274,9 +276,6 @@ public class PostShef {
/** Basis time TimeStamp */
private java.sql.Timestamp basisTimeAnsi = new Timestamp(basisBeginTime);
/** River status update flag. update if true */
private boolean riverStatusUpdateFlag = true;
/** river status update query value */
private boolean riverStatusUpdateValueFlag;
@ -295,39 +294,12 @@ public class PostShef {
/** Forecast query results */
private Object[] queryForecastResults;
/** Location range data found flag */
private boolean locRangeFound = false;
/** Default range data found flag */
private boolean defRangeFound = false;
/** Cache of data limits and loc data limits */
private Map<String, ShefRangeData> dataRangeMap = new HashMap<String, ShefRangeData>();
/** Valid date range flag */
private boolean validDateRange = false;
/** Gross range minimum value */
private double grossRangeMin = ShefConstants.SHEF_MISSING_INT;
/** Gross range maximum value */
private double grossRangeMax = ShefConstants.SHEF_MISSING_INT;
/** Reasonable range minimum value */
private double reasonRangeMin = ShefConstants.SHEF_MISSING_INT;
/** Reasonable range maximum value */
private double reasonRangeMax = ShefConstants.SHEF_MISSING_INT;
/** Alert upper limit value */
private double alertUpperLimit = ShefConstants.SHEF_MISSING_INT;
/** Alarm upper limit value */
private double alarmUpperLimit = ShefConstants.SHEF_MISSING_INT;
/** Alert lower limit value */
private double alertLowerLimit = ShefConstants.SHEF_MISSING_INT;
/** Alarm lower limit value */
private double alarmLowerLimit = ShefConstants.SHEF_MISSING_INT;
/**
*
* @param date
@ -1105,23 +1077,12 @@ public class PostShef {
// Reset .E cache vars
tsList.clear();
useLatest = MISSING;
riverStatusUpdateFlag = true;
qualityCheckFlag = true;
useTs = null;
basisTimeValues = null;
previousQueryForecast = null;
locRangeFound = false;
defRangeFound = false;
dataRangeMap.clear();
validDateRange = false;
grossRangeMin = ShefConstants.SHEF_MISSING_INT;
grossRangeMax = ShefConstants.SHEF_MISSING_INT;
reasonRangeMin = ShefConstants.SHEF_MISSING_INT;
reasonRangeMax = ShefConstants.SHEF_MISSING_INT;
alertUpperLimit = ShefConstants.SHEF_MISSING_INT;
alarmUpperLimit = ShefConstants.SHEF_MISSING_INT;
alertLowerLimit = ShefConstants.SHEF_MISSING_INT;
alarmLowerLimit = ShefConstants.SHEF_MISSING_INT;
}
/**
@ -1446,15 +1407,7 @@ public class PostShef {
if ((shefList != null) && (shefList.size() > 0)) {
ShefData maxShefDataValue = findMaxFcst(shefList);
if (shefRecord.getShefType() == ShefType.E) {
if (riverStatusUpdateFlag) {
riverStatusUpdateFlag = false;
riverStatusUpdateValueFlag = updateRiverStatus(lid, pe, ts);
}
} else {
riverStatusUpdateValueFlag = updateRiverStatus(lid, pe, ts);
}
riverStatusUpdateValueFlag = updateRiverStatus(lid, pe, ts);
postTables.postRiverStatus(shefRecord, maxShefDataValue,
riverStatusUpdateValueFlag);
} else {
@ -2157,10 +2110,8 @@ public class PostShef {
try {
if (!ingestSwitchMap.containsKey(key)) {
errorMsg.append("Error getting connection to IHFS Database");
sql = "select lid, pe, dur, ts, extremum, ts_rank, ingest, ofs_input, stg2_input from IngestFilter where lid = '"
+ locId + "'";
errorMsg.setLength(0);
errorMsg.append("Error requesting IngestFilter data: " + sql);
oa = dao.executeSQLQuery(sql);
if (oa.length > 0) {
@ -2196,6 +2147,7 @@ public class PostShef {
ingestSwitchMap.put(key, ingestSwitch);
}
matchFound = ingestSwitchMap.containsKey(key);
ingestSwitch = ingestSwitchMap.get(key);
/*
@ -2444,7 +2396,7 @@ public class PostShef {
if (!matchFound) {
log.warn(locId + " - " + data.getPhysicalElement() + "("
+ data.getDuration() + ")" + data.getTypeSource()
+ data.getExtremum() + " ingest " + "filter not defined");
+ data.getExtremum() + " ingest filter not defined");
stats.incrementWarningMessages();
ingestSwitch = ShefConstants.IngestSwitch.POST_PE_OFF;
}
@ -2647,24 +2599,12 @@ public class PostShef {
return ShefConstants.QC_MANUAL_FAILED;
}
boolean executeQuery = true;
if (!qualityCheckFlag) {
// If qualityCheckFlag is false the the query has already been
// executed
executeQuery = false;
}
if (shefRecord.getShefType() == ShefType.E) {
// if qualityCheckFlag is true then don't need to query
if (qualityCheckFlag) {
qualityCheckFlag = false;
}
}
StringBuilder locLimitSql = new StringBuilder();
StringBuilder defLimitSql = new StringBuilder();
String key = lid + data.getPhysicalElement().getCode()
+ data.getDurationValue();
try {
if (executeQuery) {
if (!dataRangeMap.containsKey(key)) {
String sqlStart = "select monthdaystart, monthdayend, gross_range_min, gross_range_max, reason_range_min, "
+ "reason_range_max, roc_max, alert_upper_limit, alert_roc_limit, alarm_upper_limit, "
+ "alarm_roc_limit, alert_lower_limit, alarm_lower_limit, alert_diff_limit, "
@ -2680,6 +2620,7 @@ public class PostShef {
Object[] oa = dao.executeSQLQuery(locLimitSql.toString());
if (oa.length == 0) {
dataRangeMap.put(key, null);
// default range
defLimitSql = new StringBuilder(sqlStart);
defLimitSql.append("datalimits where pe = '")
@ -2688,7 +2629,13 @@ public class PostShef {
.append(data.getDurationValue());
oa = dao.executeSQLQuery(defLimitSql.toString());
key = data.getPhysicalElement().getCode()
+ data.getDurationValue();
if (oa.length == 0) {
dataRangeMap.put(key, null);
}
}
for (int i = 0; i < oa.length; i++) {
Object[] oa2 = (Object[]) oa[i];
@ -2705,49 +2652,65 @@ public class PostShef {
* if a range is found, then check the value and set the
* flag
*/
grossRangeMin = ShefUtil.getDouble(oa2[2], missing);
grossRangeMax = ShefUtil.getDouble(oa2[3], missing);
reasonRangeMin = ShefUtil.getDouble(oa2[4], missing);
reasonRangeMax = ShefUtil.getDouble(oa2[5], missing);
alertUpperLimit = ShefUtil.getDouble(oa2[7], missing);
alertLowerLimit = ShefUtil.getDouble(oa2[11], missing);
alarmLowerLimit = ShefUtil.getDouble(oa2[12], missing);
alarmUpperLimit = ShefUtil.getDouble(oa2[9], missing);
defRangeFound = true;
ShefRangeData rangeData = new ShefRangeData();
rangeData.setGrossRangeMin(ShefUtil.getDouble(oa2[2],
missing));
rangeData.setGrossRangeMax(ShefUtil.getDouble(oa2[3],
missing));
rangeData.setReasonRangeMin(ShefUtil.getDouble(oa2[4],
missing));
rangeData.setReasonRangeMax(ShefUtil.getDouble(oa2[5],
missing));
rangeData.setAlarmLowerLimit(ShefUtil.getDouble(
oa2[12], missing));
rangeData.setAlarmUpperLimit(ShefUtil.getDouble(oa2[9],
missing));
rangeData.setAlertLowerLimit(ShefUtil.getDouble(
oa2[11], missing));
rangeData.setAlertUpperLimit(ShefUtil.getDouble(oa2[7],
missing));
this.dataRangeMap.put(key, rangeData);
break;
}
}
}
if (locRangeFound || defRangeFound) {
ShefRangeData rangeData = dataRangeMap.get(key);
if (rangeData != null) {
/*
* if a range is found, then check the value and set the flag
*/
if (((grossRangeMin != missing) && (dValue < grossRangeMin))
|| ((grossRangeMax != missing) && (dValue > grossRangeMax))) {
if (((rangeData.getGrossRangeMin() != missing) && (dValue < rangeData
.getGrossRangeMin()))
|| ((rangeData.getGrossRangeMax() != missing) && (dValue > rangeData
.getGrossRangeMax()))) {
qualityCode = ShefQC.setQcCode(
(int) ShefConstants.QC_GROSSRANGE_FAILED,
qualityCode);
if (dataLog) {
log.info(lid + " failed gross range check: " + dValue
+ " out of range " + grossRangeMin + " - "
+ grossRangeMax);
+ " out of range "
+ rangeData.getGrossRangeMin() + " - "
+ rangeData.getGrossRangeMax());
}
/*
* don't do anything if it fails the gross range check
*/
} else {
if (((reasonRangeMin != missing) && (dValue < reasonRangeMin))
|| ((reasonRangeMax != missing) && (dValue > reasonRangeMax))) {
if (((rangeData.getReasonRangeMin() != missing) && (dValue < rangeData
.getReasonRangeMin()))
|| ((rangeData.getReasonRangeMax() != missing) && (dValue > rangeData
.getReasonRangeMax()))) {
qualityCode = ShefQC.setQcCode(
(int) ShefConstants.QC_REASONRANGE_FAILED,
qualityCode);
if (dataLog) {
log.info(lid + " failed reasonable range check: "
+ dValue + " out of range "
+ reasonRangeMin + " - " + reasonRangeMax);
+ rangeData.getReasonRangeMin() + " - "
+ rangeData.getReasonRangeMax());
}
}
@ -2757,17 +2720,17 @@ public class PostShef {
* table.
*/
if (shefAlertAlarm) {
if ((alarmUpperLimit != missing)
&& (dValue >= alarmUpperLimit)) {
if ((rangeData.getAlarmUpperLimit() != missing)
&& (dValue >= rangeData.getAlarmUpperLimit())) {
alertAlarm = ShefConstants.ALARM_UPPER_DETECTED;
} else if ((alertUpperLimit != missing)
&& (dValue >= alertUpperLimit)) {
} else if ((rangeData.getAlertUpperLimit() != missing)
&& (dValue >= rangeData.getAlertUpperLimit())) {
alertAlarm = ShefConstants.ALERT_UPPER_DETECTED;
} else if ((alarmLowerLimit != missing)
&& (dValue <= alarmLowerLimit)) {
} else if ((rangeData.getAlarmLowerLimit() != missing)
&& (dValue <= rangeData.getAlarmLowerLimit())) {
alertAlarm = ShefConstants.ALARM_LOWER_DETECTED;
} else if ((alertLowerLimit != missing)
&& (dValue <= alertLowerLimit)) {
} else if ((rangeData.getAlertLowerLimit() != missing)
&& (dValue <= rangeData.getAlertLowerLimit())) {
alertAlarm = ShefConstants.ALERT_LOWER_DETECTED;
}

179
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/ShefRangeData.java Normal file
View file

@ -0,0 +1,179 @@
/**
* 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.shef.database;
import com.raytheon.uf.common.dataplugin.shef.util.ShefConstants;
/**
* Data object for holding SHEF range limits
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 14, 2014 mpduff Initial creation
*
* </pre>
*
* @author mpduff
* @version 1.0
*/
public class ShefRangeData {
private double grossRangeMin = ShefConstants.SHEF_MISSING_INT;
private double grossRangeMax = ShefConstants.SHEF_MISSING_INT;
private double reasonRangeMin = ShefConstants.SHEF_MISSING_INT;
private double reasonRangeMax = ShefConstants.SHEF_MISSING_INT;
private double alertUpperLimit = ShefConstants.SHEF_MISSING_INT;
private double alarmUpperLimit = ShefConstants.SHEF_MISSING_INT;
private double alertLowerLimit = ShefConstants.SHEF_MISSING_INT;
private double alarmLowerLimit = ShefConstants.SHEF_MISSING_INT;
/**
* @return the grossRangeMin
*/
public double getGrossRangeMin() {
return grossRangeMin;
}
/**
* @param grossRangeMin
* the grossRangeMin to set
*/
public void setGrossRangeMin(double grossRangeMin) {
this.grossRangeMin = grossRangeMin;
}
/**
* @return the grossRangeMax
*/
public double getGrossRangeMax() {
return grossRangeMax;
}
/**
* @param grossRangeMax
* the grossRangeMax to set
*/
public void setGrossRangeMax(double grossRangeMax) {
this.grossRangeMax = grossRangeMax;
}
/**
* @return the reasonRangeMin
*/
public double getReasonRangeMin() {
return reasonRangeMin;
}
/**
* @param reasonRangeMin
* the reasonRangeMin to set
*/
public void setReasonRangeMin(double reasonRangeMin) {
this.reasonRangeMin = reasonRangeMin;
}
/**
* @return the reasonRangeMax
*/
public double getReasonRangeMax() {
return reasonRangeMax;
}
/**
* @param reasonRangeMax
* the reasonRangeMax to set
*/
public void setReasonRangeMax(double reasonRangeMax) {
this.reasonRangeMax = reasonRangeMax;
}
/**
* @return the alertUpperLimit
*/
public double getAlertUpperLimit() {
return alertUpperLimit;
}
/**
* @param alertUpperLimit
* the alertUpperLimit to set
*/
public void setAlertUpperLimit(double alertUpperLimit) {
this.alertUpperLimit = alertUpperLimit;
}
/**
* @return the alarmUpperLimit
*/
public double getAlarmUpperLimit() {
return alarmUpperLimit;
}
/**
* @param alarmUpperLimit
* the alarmUpperLimit to set
*/
public void setAlarmUpperLimit(double alarmUpperLimit) {
this.alarmUpperLimit = alarmUpperLimit;
}
/**
* @return the alertLowerLimit
*/
public double getAlertLowerLimit() {
return alertLowerLimit;
}
/**
* @param alertLowerLimit
* the alertLowerLimit to set
*/
public void setAlertLowerLimit(double alertLowerLimit) {
this.alertLowerLimit = alertLowerLimit;
}
/**
* @return the alarmLowerLimit
*/
public double getAlarmLowerLimit() {
return alarmLowerLimit;
}
/**
* @param alarmLowerLimit
* the alarmLowerLimit to set
*/
public void setAlarmLowerLimit(double alarmLowerLimit) {
this.alarmLowerLimit = alarmLowerLimit;
}
}