ASM #16911 - Fixed issue where Hydrologic date did not advance to next day after 18Z.
Change-Id: Ie26af265d8a233e4fdf6e9dbc1e4ff6934aae4e4 Former-commit-id: b2c9cd15e1f02c8272c1d9a9d50e877470b05eb3
This commit is contained in:
parent
c4b665ad24
commit
45c3852132
2 changed files with 7 additions and 6 deletions
|
@ -157,7 +157,7 @@ public class ChooseDataPeriodDialog extends CaveJFACEDialog {
|
|||
|
||||
displayMgr = MPEDisplayManager.getInstance(pane);
|
||||
dataMgr = MPEDataManager.getInstance();
|
||||
dateMap = dataMgr.getDateMap(false);
|
||||
dateMap = dataMgr.getDateMap(true);
|
||||
qcEnable = MPEDisplayManager.isMpeQcOptionEnabled();
|
||||
cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
|
||||
hydroCal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
|
||||
|
@ -165,17 +165,18 @@ public class ChooseDataPeriodDialog extends CaveJFACEDialog {
|
|||
cal.setTime(prevDate);
|
||||
|
||||
if( prevHydDate == null ){
|
||||
// prevHydDate = prevDate;
|
||||
prevHydDate = displayMgr.getCurrentEditDate();
|
||||
|
||||
hydroCal.setTime(prevHydDate);
|
||||
|
||||
hydroCal.set(Calendar.MINUTE, 0);
|
||||
if ( cal.get(Calendar.HOUR_OF_DAY) >= 18 ){
|
||||
hydroCal.add(Calendar.DATE, 1);
|
||||
}
|
||||
}else{
|
||||
|
||||
hydroCal.setTime(prevHydDate);
|
||||
if ( cal.get(Calendar.HOUR_OF_DAY) >= 18 ){
|
||||
hydroCal.set(Calendar.MINUTE, 0);
|
||||
hydroCal.add(Calendar.DATE, 1);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1045,7 +1045,7 @@ public class DailyQcUtils {
|
|||
*/
|
||||
Calendar currentTime = Calendar
|
||||
.getInstance(TimeZone.getTimeZone("GMT"));
|
||||
|
||||
btime.set(Calendar.DAY_OF_MONTH, hydro_curDay);
|
||||
emonth = btime.get(Calendar.MONTH);
|
||||
Calendar otime = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
|
||||
otime.setTime(btime.getTime());
|
||||
|
|
Loading…
Add table
Reference in a new issue