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

sat and radar menu organization

Browse source 
Former-commit-id: 8f8b9dd16ea8ae10522f0f5092dcc20a9676444f [formerly 0943c3edd5]
Former-commit-id: 698c0b5166
This commit is contained in:
AWIPS User 2015-07-22 10:31:01 -06:00
parent dbe9b8f1d8
commit affd4212ed
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
View file

@ -15,7 +15,7 @@
id="RadarMenuTwdrRadarsSubMenu"> id="RadarMenuTwdrRadarsSubMenu">
<contribute xsi:type="subinclude" fileName="menus/radar/tdwrRadars.xml" /> <contribute xsi:type="subinclude" fileName="menus/radar/tdwrRadars.xml" />
</contribute> </contribute>
<contribute xsi:type="titleItem" titleText="------ Unidata Composites ------" <contribute xsi:type="titleItem" titleText="------ FNEXRAD Composites ------"
id="RadarMosaic" /> id="RadarMosaic" />
<!-- Unidata Composite --> <!-- Unidata Composite -->
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml"

6
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/RadarMenuUtil.java
View file

@ -235,11 +235,11 @@ public class RadarMenuUtil extends AbstractMenuUtil implements
} }
Arrays.sort(menuTemplateFile.contributions); Arrays.sort(menuTemplateFile.contributions);
// only want 12 radars in the dial radar menu, otherwise put it in // only want 18 radars in the dial radar menu, otherwise put it in
// submenus // submenus
if (menuTemplateFile.contributions.length > 12) { if (menuTemplateFile.contributions.length > 18) {
double numMenus = Math double numMenus = Math
.ceil(((double) menuTemplateFile.contributions.length) / 12); .ceil(((double) menuTemplateFile.contributions.length) / 18);
int perMenu = (int) (menuTemplateFile.contributions.length int perMenu = (int) (menuTemplateFile.contributions.length
/ numMenus + 1); / numMenus + 1);
statusHandler.info("For " + menuTemplateFile.contributions.length statusHandler.info("For " + menuTemplateFile.contributions.length

2
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java
View file

@ -505,7 +505,7 @@ public class McidasSatelliteDecoder {
private String getAreaName(int areaNumber) { private String getAreaName(int areaNumber) {
// GOES-West UNIWISC McIDAS AREA files // GOES-West UNIWISC McIDAS AREA files
if ( (1161 <= areaNumber && areaNumber <= 1254) || if ( (1161 <= areaNumber && areaNumber <= 1254) ||
(1801 <= areaNumber && areaNumber <= 1851) ){ (1801 <= areaNumber && areaNumber <= 1854) ){
areaNumber = 1161; areaNumber = 1161;
// GOES-East UNIWISC McIDAS AREA files // GOES-East UNIWISC McIDAS AREA files
} else if (1261 <= areaNumber && areaNumber <= 1524) { } else if (1261 <= areaNumber && areaNumber <= 1524) {