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

Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1

Browse source 
Former-commit-id: 80f677e1e3 [formerly 1c0d6624a3] [formerly e1c88f287a] [formerly 57a361073d [formerly e1c88f287a [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]]
Former-commit-id: 57a361073d
Former-commit-id: 56e8b90c211d77cd58bb224d0ec60bd67aba968d [formerly 4476b9d19e]
Former-commit-id: 47feda6450
This commit is contained in:
Brian.Dyke 2014-09-17 15:50:13 -04:00
commit bf6931a113
16 changed files with 66 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUSEastern.xml
View file

@ -150,7 +150,7 @@
<substitute key="stationId" value="72248"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml"
menuText="Tallahasee, FL (KTAE)" id="raobTallahasee_FL"
menuText="Tallahassee, FL (KTAE)" id="raobTallahassee_FL"
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="72214"/>
</contribute>
@ -179,4 +179,4 @@
editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
<substitute key="stationId" value="74001"/>
</contribute>
</menuTemplate>
</menuTemplate>

2
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/preferences/SyncLocalizationEditor.java
View file

@ -178,7 +178,7 @@ public class SyncLocalizationEditor extends BooleanFieldEditor {
MessageBox msgBox = new MessageBox(button.getShell(), SWT.YES
| SWT.NO | SWT.CANCEL | SWT.ICON_WARNING);
msgBox.setText("Do you want to synchronize?");
msgBox.setMessage("If there are files missing locally, your CAVE might not work correctly. It is recommended that you synchronize all localization files with edex before enabling this option. Synchronizing will take lots of time and bandwidth.\n\n Would you like to syncronize now?");
msgBox.setMessage("If there are files missing locally, your CAVE might not work correctly. It is recommended that you synchronize all localization files with edex before enabling this option. Synchronizing will take lots of time and bandwidth.\n\n Would you like to synchronize now?");
int result = msgBox.open();
if (result == SWT.CANCEL) {
getChangeControl(button.getParent()).setSelection(false);

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

@ -22,7 +22,7 @@
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarMosaic.xml"
menuText="Hybrid Scan Refl" id="RadarHybridScanRefl">
<substitute key="product" value="33" />
<substitute key="product" value="32,33" />
<substitute key="elevation" value="0.0" />
<substitute key="name" value="Hybrid Scan Refl" />
</contribute>
@ -114,4 +114,4 @@
<contribute xsi:type="subinclude" fileName="menus/radar/dialRadars.xml" />
</contribute>
<contribute xsi:type="subinclude" fileName="menus/radar/baseRadarApplications.xml" />
</menuTemplate>
</menuTemplate>

4
cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarBestResZV.xml
View file

@ -19,7 +19,7 @@
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="titleItem" titleText="------ Best Res Z+V ------"
<contribute xsi:type="titleItem" titleText="------ Best Res Z+V combo------"
id="BestResZV" />
<contribute xsi:type="bundleItem"
file="bundles/DefaultRadarBlendedBestRes.xml" menuText="0.5 Z+V"
@ -295,4 +295,4 @@
<substitute key="elevation" value="19.5--19.5" />
</contribute>
</contribute>
</menuTemplate>
</menuTemplate>

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

@ -19,7 +19,7 @@
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="titleItem" titleText="------ Best Res Z+V ------"
<contribute xsi:type="titleItem" titleText="------ Best Res Z+V combo ------"
id="BestResZV" />
<contribute xsi:type="bundleItem"
file="bundles/DefaultRadarBlendedBestRes.xml" menuText="0.0 Z+V"

2
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/scripting/dialogs/ScriptEditorDialog.java
View file

@ -553,7 +553,7 @@ public class ScriptEditorDialog extends CaveSWTDialog implements IScriptEditor {
item.addSelectionListener(listener);
item = new MenuItem(subMenu, SWT.PUSH);
item.setText("Line\tF7");
item.setText("Line\tF8");
item.setAccelerator(SWT.F8);
item.setData(EditMenuSelection.DEL_LINE);
item.addSelectionListener(listener);

2
cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml
View file

@ -35,7 +35,7 @@
<include installTo="menu:volume?before=VolumeBundles"
fileName="menus/volume/ModelFamilies.xml">
</include>
<include subMenu="4-PanelFamilies" installTo="menu:volume?before=ComparisonFamilies"
<include subMenu="4-Panel Families" installTo="menu:volume?before=ComparisonFamilies"
fileName="menus/volume/baseFourPanelFamilies.xml">
</include>
<include installTo="menu:volume?after=ComparisonFamilies"

33
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
View file

@ -71,7 +71,38 @@
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="975MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="1025MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="1050MB" indentText="false"/>
</contribute>
</contribute>
<contribute xsi:type="toolbarSubMenu" menuText="100mb Layers">
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="300MB-200MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="400-300MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="500-400MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="600-500MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="700-600MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="800-700MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="900-800MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="1000-900MB" indentText="false"/>
</contribute>
<contribute xsi:type="toolbarSubMenu" menuText="50mb Layers">
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="1000-950MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="950-900MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="900-850MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="850-800MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="800-750MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="750-700MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="700-650MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="650-600MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="600-550MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="550-500MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="500-450MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="450-400MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="400-350MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="350-300MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="300-250MB" indentText="false"/>
<contribute xsi:type="menuItem" textLookup="LevelMapping" key="250-200MB" indentText="false"/>
</contribute>
</contribute>
<!--

1
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml
View file

@ -1206,6 +1206,7 @@
</Level>
<Level displayName="FrzLvl" key="FrzLvl" group="S">
<DatabaseLevel levelName="FRZ" levelOneValue="0" />
<DatabaseLevel levelName="TEMP" levelOneValue="0" unit="C" />
</Level>
<Level displayName="HghstTropFrz" key="Htfl" group="S">
<DatabaseLevel levelName="HTFL" levelOneValue="0" />

10
cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml
View file

@ -27,7 +27,7 @@
<constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,TO.W,TO.W,EW.W" constraintType="IN" />
<constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,TO.W,SV.W,EW.W,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -198,7 +198,7 @@
<constraint constraintValue="FFW,FFS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="FF.W" constraintType="EQUALS" />
<constraint constraintValue="FF.W,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -232,7 +232,7 @@
<constraint constraintValue="FLW,FLS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="FA.W" constraintType="EQUALS" />
<constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -266,7 +266,7 @@
<constraint constraintValue="FLY,FLS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="FA.Y" constraintType="EQUALS" />
<constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -280,4 +280,4 @@
</descriptor>
</displays>
</displayList>
</bundle>
</bundle>

10
cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml
View file

@ -28,7 +28,7 @@
<constraint constraintValue="FFW,FLW,FLY,FFS,FLS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="FF.W,FA.W,FA.Y" constraintType="IN" />
<constraint constraintValue="FF.W,FA.W,FA.Y,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -62,7 +62,7 @@
<constraint constraintValue="FFW,FFS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="FF.W" constraintType="EQUALS" />
<constraint constraintValue="FF.W,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -96,7 +96,7 @@
<constraint constraintValue="FLW,FLS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="FA.W" constraintType="EQUALS" />
<constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -130,7 +130,7 @@
<constraint constraintValue="FLY,FLS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="FA.Y" constraintType="EQUALS" />
<constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -144,4 +144,4 @@
</descriptor>
</displays>
</displayList>
</bundle>
</bundle>

10
cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml
View file

@ -27,7 +27,7 @@
<constraint constraintValue="FFW,FLW,FLY,FFS,FLS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="FF.W,FA.W,FA.Y" constraintType="IN" />
<constraint constraintValue="FF.W,FA.W,FA.Y,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -61,7 +61,7 @@
<constraint constraintValue="FFW,FFS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="FF.W" constraintType="EQUALS" />
<constraint constraintValue="FF.W,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -95,7 +95,7 @@
<constraint constraintValue="FLW,FLS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="FA.W" constraintType="EQUALS" />
<constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -129,7 +129,7 @@
<constraint constraintValue="FLY,FLS" constraintType="IN" />
</mapping>
<mapping key="phensig">
<constraint constraintValue="FA.Y" constraintType="EQUALS" />
<constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
</mapping>
<mapping key="pluginName">
<constraint constraintValue="warning" constraintType="EQUALS" />
@ -143,4 +143,4 @@
</descriptor>
</displays>
</displayList>
</bundle>
</bundle>

3
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
View file

@ -23,7 +23,7 @@
</model>
<model>
<name>MPE-Mosaic</name>
<name>MPE-Local</name>
<center>9</center>
<subcenter>0</subcenter>
<grid>304</grid>
@ -52,6 +52,7 @@
</process>
</model>
<!-- END SUBCENTER 0 -->
<!-- SUBCENTER 105: San Juan PR WFO -->

6
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
View file

@ -2242,7 +2242,7 @@
</styleRule>
<!--
* NBE, cCin
J/kg | 1 | 0 | 1 | 450 | |,x | 29 | 0 | 100
J/kg | 1 | 0 | -1000 | -1 | |,x | 29 | 0 | 100
-->
<styleRule>
<paramLevelMatches>
@ -2253,8 +2253,8 @@
<!-- filterLow="true" -->
<displayUnits>J/kg</displayUnits>
<range scale="LINEAR">
<minValue>1</minValue>
<maxValue>450</maxValue>
<minValue>-1000</minValue>
<maxValue>-1</maxValue>
</range>
<defaultColormap>Grid/gridded data</defaultColormap>
<colorbarLabeling>

3
edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/styleRules/radarImageryStyleRules.xml
View file

@ -416,6 +416,7 @@
<entry displayValue='20' pixelValue='200' />
<entry displayValue='40' pixelValue='227' />
<entry displayValue='60' pixelValue='245' />
<entry displayValue='80' pixelValue='254' label="" />
</dataMapping>
</imageStyle>
</styleRule>
@ -672,4 +673,4 @@
</imageStyle>
</styleRule>
</styleRuleset>
</styleRuleset>

2
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
View file

@ -82,7 +82,7 @@
<Field level="150MB" abbreviation="MMP"/>
</Method>
<Method levels="250MB" name="Divide">
<ConstantField value="1.0"/>
<ConstantField value="100.0"/>
<Field level="200MB" abbreviation="MMP"/>
</Method>
<Method levels="Layer" name="Test">