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

Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1

Browse source 
Former-commit-id: b663b67fc65c8ae820555bb135004322c9997a48
This commit is contained in:
Shawn.Hooper 2015-10-21 14:16:01 -04:00
commit 1a4d8b0087
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveBestEstimate.java
View file

@ -74,6 +74,7 @@ import com.raytheon.viz.mpe.ui.dialogs.polygon.PolygonEditManager;
* Apr29, 2014 16308 lbousaidi transmit RFC Bias when an hour
* MPE is saved via the GUI.
* Mar 10, 2015 14554 snaples Added check to remove Best Estimate polygons after saving.
* Oct 19, 2015 18090 lbousaidi Added date format when the token st3_date_form token is set to Ymd.
* </pre>
*
* @author mschenke
@ -106,6 +107,8 @@ public class SaveBestEstimate {
if ((date_form == null) || date_form.isEmpty()
|| date_form.equals("mdY")) {
ST3_FORMAT_STRING = MPEDateFormatter.MMddyyyyHH;
} else if (date_form.equals("Ymd")){
ST3_FORMAT_STRING = MPEDateFormatter.yyyyMMddHH;
}
/*----------------------------------------------------------*/
/* create date in desired format for use in xmrg filename */

21
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/GageTableDataManager.java
View file

@ -42,6 +42,7 @@ import com.raytheon.uf.viz.core.catalog.DirectDbQuery;
import com.raytheon.uf.viz.core.catalog.DirectDbQuery.QueryLanguage;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.viz.hydrocommon.HydroConstants;
import com.raytheon.viz.mpe.MPEDateFormatter;
import com.raytheon.viz.mpe.core.MPEDataManager;
import com.raytheon.viz.mpe.core.MPEDataManager.MPEGageData;
import com.raytheon.viz.mpe.ui.DisplayFieldData;
@ -63,6 +64,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* for Radar Sites dialog.
* Mar 05, 2014 17114 lbousaidi display PC data in gage table.
* Sep 04, 2014 16699 cgobs Fixed 14.3.1 issue with reading MPE field data.
* Oct 19, 2015 18090 lbousaidi fixed best estimate qpe display.
* </pre>
*
* @author mpduff
@ -1135,12 +1137,29 @@ public class GageTableDataManager {
.getInstance();
MPEDisplayManager displayManager = MPEDisplayManager.getCurrent();
double returnValue = -999.0;
String ST3_FORMAT_STRING = MPEDateFormatter.yyyyMMddHH;
String date_form = appsDefaults.getToken("st3_date_form");// non need just change format of sdf
if ((date_form == null) || date_form.isEmpty()
|| date_form.equals("mdY")) {
ST3_FORMAT_STRING = MPEDateFormatter.MMddyyyyHH;
} else if (date_form.equals("Ymd")){
ST3_FORMAT_STRING = MPEDateFormatter.yyyyMMddHH;
}
try {
String dirname = appsDefaults.getToken(dataType.getDirToken());
String fname = FileUtil.join(dirname,
String fname= null;
if (dataType.getFileNamePrefix().contains("XMRG")) {
String cdate = MPEDateFormatter.format(displayManager.getCurrentEditDate(), ST3_FORMAT_STRING);
fname= FileUtil.join(dirname,
dataType.getFileNamePrefix().toLowerCase() + cdate + "z");
//System.out.println(" in gageTable Datamanager.java fname= "+fname );
}else {
fname = FileUtil.join(dirname,
dataType.getFileNamePrefix() + sdf.format(displayManager.getCurrentEditDate()) + "z");
}
Rectangle extent = dataManager.getHRAPExtent();
short[][] data = gageTableDataManager.getXmrgData(fname, prodType,