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

Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Browse source 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 6dd4acc2c2 [formerly 03e663afae6eb0998892e2921566652f42196e1f]
Former-commit-id: 5606e3cfa0
This commit is contained in:
Fay.Liang 2015-04-16 23:06:25 -04:00
commit f28633c1d4
3 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerify.py
View file

@ -56,7 +56,8 @@
# ------------ ---------- ----------- --------------------------
# 12/02/2014 RM #625 ryu Changed checkGroup() as suggested to display models
# in multi-columns when a single column is insufficient.
#
# 04/16/2015 17390 ryu Replacing string.atoi with int for string/integer to integer conversion
# (ListBox.curselection() now returns ints instead of strings.)
# ----------------------------------------------------------------------------
#
MenuItems = ["Verify"]
@ -6629,7 +6630,7 @@ class Verif(BVDialog):
outlist=[]
itemnums=self.ForecasterListbox.curselection()
try:
itemnums=map(string.atoi,itemnums)
itemnums=map(int,itemnums)
except ValueError: pass
for itemnum in itemnums:
outlist.append(self.forecasterNumbers[itemnum])
@ -6805,7 +6806,7 @@ class Verif(BVDialog):
def getFromdayListbox(self):
itemnums=self.FromdayListbox.curselection()
try:
itemnums=map(string.atoi,itemnums)
itemnums=map(int,itemnums)
except ValueError: pass
itemnum=itemnums[0]
outdate=self.gridDays[itemnum]
@ -6818,7 +6819,7 @@ class Verif(BVDialog):
outlist=[]
itemnums=self.DaylistListbox.curselection()
try:
itemnums=map(string.atoi,itemnums)
itemnums=map(int,itemnums)
except ValueError: pass
for itemnum in itemnums:
outlist.append(self.gridDays[itemnum])
@ -7792,7 +7793,7 @@ class Verif(BVDialog):
outlist=[]
itemnums=listbox.curselection()
try:
itemnums=map(string.atoi,itemnums)
itemnums=map(int,itemnums)
except ValueError: pass
for itemnum in itemnums:
outlist.append(listbox.get(itemnum))

22
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
View file

@ -38,7 +38,8 @@ from java.io import File
# ------------ ---------- ----------- --------------------------
# 05/29/08 njensen Initial Creation.
# 12/10/14 #14946 ryu Add getTimeZones() function.
#
# 04/16/15 #14946 ryu Fix getTimeZones to return the office TZ if timezone
# is not set for any zone in a segment.
#
#
@ -440,19 +441,18 @@ def getTimeZones(zones, officeTZ):
timezones = []
if zones is not None:
for zone in JUtil.javaStringListToPylist(zones):
area_dict = AreaDictionary.AreaDictionary.get(zone)
if area_dict is None:
continue
tzs = area_dict.get("ugcTimeZone")
if tzs is not None:
if type(tzs) is str:
tzs = [tzs]
for tz in tzs:
if tz not in timezones:
timezones.append(tz)
zdict = AreaDictionary.AreaDictionary.get(zone, {})
tzs = zdict.get("ugcTimeZone", [])
if type(tzs) is str:
tzs = [tzs]
for tz in tzs:
if tz not in timezones:
timezones.append(tz)
if officeTZ in timezones and officeTZ != timezones[0]:
timezones.remove(officeTZ)
timezones.insert(0, officeTZ)
if len(timezones) == 0:
timezones.append(officeTZ)
return JUtil.pylistToJavaStringList(timezones)
def reloadModule(moduleName):

7
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
View file

@ -50,7 +50,8 @@
# 03/30/2015 #17206 yteng Changed some parameters that are not rate parameters
# 04/03/2015 #4367 dgilling Change WindGust's time constraints back to TC1
# for Fcst/Official.
#
# 04/15/2015 #17383 yteng Change localTC to fix error that time constraints
# being off
########################################################################
#----------------------------------------------------------------------------
@ -981,8 +982,8 @@ def localTC(start,repeat,duration,dst):
timezone = SITES[GFESUITE_SITEID][3]
import dateutil.tz, datetime
tz = dateutil.tz.gettz(timezone)
dt = datetime.datetime.utcnow()
delta = tz.utcoffset(dt) + tz.dst(dt)
local = datetime.datetime.now(tz)
delta = tz.utcoffset(local) - tz.dst(local)
offset = delta.days*86400 + delta.seconds
start = start - offset
if dst == 1: