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

12.10.1-7 baseline

Browse source 
Former-commit-id: 7b37cfca85 [formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886]
Former-commit-id: b754630136
This commit is contained in:
Steve Harris 2012-09-25 10:21:10 -05:00
parent 81d91a8289
commit 2ee78eaf6d
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py
View file

@ -224,8 +224,14 @@ class Procedure (SmartScript.SmartScript):
hazardKey = selectedHazard
defaultHazKey = ""
if len(defaultSegment) > 0 and defaultHazard is not None:
defaultHazKey = defaultHazard + ":" + defaultSegment
if defaultHazard is not None:
index = string.find(defaultHazard, " ")
if index != -1:
defaultHazard = defaultHazard[0:index]
defaultHazKey = defaultHazard
if len(defaultSegment) > 0:
defaultHazKey += ":" + defaultSegment
weName = self._hazUtils._makeTempWEName(hazardKey)

5
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java
View file

@ -166,6 +166,8 @@ public class SatelliteMenuUtil extends AbstractMenuUtil {
sub.key = "entity";
sub.value = "GOES%";
((CommonIncludeMenuContribution) file.contributions[0]).substitutions[4] = sub;
toXml(fileOCONUS, "menus" + File.separator + "satellite" + File.separator
+ "baseDerivedProductsImagery.xml");
} else {
// decide on east conus or west conus
((CommonIncludeMenuContribution) file.contributions[0]).fileName = new File(
@ -234,9 +236,6 @@ public class SatelliteMenuUtil extends AbstractMenuUtil {
toXml(file, "menus" + File.separator + "satellite" + File.separator
+ "baseComposite.xml");
toXml(fileOCONUS, "menus" + File.separator + "satellite" + File.separator
+ "baseDerivedProductsImagery.xml");
statusHandler.info("Finished creating satellite menus");
}