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

ASM #16911 - Updated to fix Ending Hydrologic data when time is after 18Z.

Browse source 
Change-Id: Ia3022f07f1ebc54543b6e210d77d95b1458b434b

Former-commit-id: 9e13d77410 [formerly 2757754c9e] [formerly 9c0e08a03c [formerly 571f7dde74c6cbf14553edc2fe27a5031e42d6be]]
Former-commit-id: 9c0e08a03c
Former-commit-id: 854070cdfb
This commit is contained in:
steve.naples 2014-12-13 01:55:19 +00:00
parent 171ae9e2af
commit fd77d4db50
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
View file

@ -157,7 +157,7 @@ public class ChooseDataPeriodDialog extends CaveJFACEDialog {
displayMgr = MPEDisplayManager.getInstance(pane); displayMgr = MPEDisplayManager.getInstance(pane);
dataMgr = MPEDataManager.getInstance(); dataMgr = MPEDataManager.getInstance();
dateMap = dataMgr.getDateMap(true); dateMap = dataMgr.getDateMap(false);
qcEnable = MPEDisplayManager.isMpeQcOptionEnabled(); qcEnable = MPEDisplayManager.isMpeQcOptionEnabled();
cal = Calendar.getInstance(TimeZone.getTimeZone("GMT")); cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
hydroCal = Calendar.getInstance(TimeZone.getTimeZone("GMT")); hydroCal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
@ -168,15 +168,13 @@ public class ChooseDataPeriodDialog extends CaveJFACEDialog {
prevHydDate = displayMgr.getCurrentEditDate(); prevHydDate = displayMgr.getCurrentEditDate();
hydroCal.setTime(prevHydDate); hydroCal.setTime(prevHydDate);
hydroCal.set(Calendar.MINUTE, 0);
if ( cal.get(Calendar.HOUR_OF_DAY) >= 18 ){ if ( cal.get(Calendar.HOUR_OF_DAY) >= 18 ){
hydroCal.add(Calendar.DATE, 1); hydroCal.add(Calendar.DATE, 1);
} }
}else{ }else{
if ( cal.get(Calendar.HOUR_OF_DAY) >= 18 ){
hydroCal.set(Calendar.MINUTE, 0); hydroCal.setTime(prevHydDate);
hydroCal.add(Calendar.DATE, 1);
}
} }
} }

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

@ -210,8 +210,8 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
Shell parent = this.getParent(); Shell parent = this.getParent();
Display display = parent.getDisplay(); Display display = parent.getDisplay();
MPEDisplayManager displayMgr = MPEDisplayManager.getCurrent(); MPEDisplayManager displayMgr = MPEDisplayManager.getCurrent();
Date prevDate = displayMgr.getCurrentEditDate(); Date prevDate = ChooseDataPeriodDialog.getCurrentHydroEditDate();
Date currDate = ChooseDataPeriodDialog.prevDate; Date currDate = ChooseDataPeriodDialog.prevHydDate;
String QcArea = ChooseDataPeriodDialog.prevArea; String QcArea = ChooseDataPeriodDialog.prevArea;
AppsDefaults appDefaults = AppsDefaults.getInstance(); AppsDefaults appDefaults = AppsDefaults.getInstance();
DisplayFieldData df = displayMgr.getDisplayFieldType(); DisplayFieldData df = displayMgr.getDisplayFieldType();

2
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
View file

@ -1045,7 +1045,7 @@ public class DailyQcUtils {
*/ */
Calendar currentTime = Calendar Calendar currentTime = Calendar
.getInstance(TimeZone.getTimeZone("GMT")); .getInstance(TimeZone.getTimeZone("GMT"));
btime.set(Calendar.DAY_OF_MONTH, hydro_curDay); // btime.set(Calendar.DAY_OF_MONTH, hydro_curDay);
emonth = btime.get(Calendar.MONTH); emonth = btime.get(Calendar.MONTH);
Calendar otime = Calendar.getInstance(TimeZone.getTimeZone("GMT")); Calendar otime = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
otime.setTime(btime.getTime()); otime.setTime(btime.getTime());

4
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/ReadQPFGrids.java
View file

@ -112,7 +112,7 @@ public class ReadQPFGrids {
} else { } else {
iflag = 0; iflag = 0;
} }
for (i = 0; i < gmaxi; i++) { for (i = 0; i < (dqc.getHrap_grid().maxi); i++) {
if (iflag == 0) { if (iflag == 0) {
kbuf = in.readLine().trim(); kbuf = in.readLine().trim();
@ -130,7 +130,7 @@ public class ReadQPFGrids {
// if (ghrapi > minhrapi && ghrapi <= maxhrapi) { // if (ghrapi > minhrapi && ghrapi <= maxhrapi) {
for (j = 0; j < gmaxj; j++) { for (j = 0; j < (dqc.getHrap_grid().maxj); j++) {
// ghrapj = gminj + j; // ghrapj = gminj + j;
// //