Commit graph

204 commits

Author SHA1 Message Date
Roger Ferrel
6e695a12d1 Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
Former-commit-id: fa42c4069a [formerly fa42c4069a [formerly 474e07b299246aee4e6b214226c176c4a10aa866]]
Former-commit-id: 9154ef60bb
Former-commit-id: 63a1b2890b
2014-08-27 15:06:52 -05:00
Brian.Dyke
c0dc594eda Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: e654318431 [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]
Former-commit-id: aa83bf804f
Former-commit-id: f7f16ff9eb
2014-08-27 11:19:19 -04:00
Mark Peters
c069dd338a Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override
Change-Id: Ic4a3a517327944f6c6ef7b20bc1774bca6c39d0e

Former-commit-id: 7b37c4d188 [formerly 7b37c4d188 [formerly 449f167ce1c30a595b4b673fc4d71658500e844d]]
Former-commit-id: 6634a2df01
Former-commit-id: f1d31723c7
2014-08-25 13:50:27 -05:00
Slav Korolev
99a8258e86 Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761

This reverts commit fe4b0de79bdc9f7d9251320f16b6046314117f1f [formerly e5af41fa86] [formerly dd9d117f90 [formerly dd9d117f90 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]].

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: a9bed4c6fd [formerly a9bed4c6fd [formerly aee044437492438381db98cc6fd3a917f6c05659]]
Former-commit-id: a779c786f1
Former-commit-id: 407be3d26f
2014-08-19 10:12:36 -05:00
mjames-upc
f7616b260e more complete NCP RBD/SPF renaming to Bundle/Group
Former-commit-id: b08470144c
2014-08-18 12:47:32 -06:00
Brian.Dyke
19fa7abdc0 VLab Issue #3617 - DCS_266 Ingest & Display HRRR - LevelMappingFile.xml
Former-commit-id: f52f2b1c25 [formerly f52f2b1c25 [formerly 93c1663761e65e870262bc4fdf4028b08e20c85a]]
Former-commit-id: aa6e025b14
Former-commit-id: 02e1b34afb
2014-08-18 14:18:05 -04:00
Ana Rivera
4b42e52ce3 VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a44d5d91db [formerly a44d5d91db [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]]
Former-commit-id: 9bf2df23be
Former-commit-id: eefe73ee51
2014-08-15 11:02:36 -05:00
Ana Rivera
c8556a8a43 VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml

Former-commit-id: a053fd5bad [formerly a053fd5bad [formerly d95450f2eebc6b3d10093bd16736b349a1d0b12b]]
Former-commit-id: 95451b2959
Former-commit-id: 236a089297
2014-08-15 11:01:23 -05:00
Mark Peters
072f47922f Omaha #3483 Split Volume Browser fields menus into multiple reusable components.
Change-Id: Iafc693449e6e73d6223667d69ecec6114e13831a

Former-commit-id: a53ee64723 [formerly a53ee64723 [formerly 2df45cb19e0a176190e2da8b954e67ec156acf5c]]
Former-commit-id: d793e6005f
Former-commit-id: 153c08c9b4
2014-08-14 17:40:26 -05:00
Roger Ferrel
b00dcca9c4 Issue #3439 Changes to add new GFS data to Product and Volume Browser.
Change-Id: I6314cb1a99aada35290a52e03810d4d51b224a9d

Former-commit-id: eef17da8cd [formerly eef17da8cd [formerly 658976d6c9485a3abe4d8a5ba759897407ec1239]]
Former-commit-id: 518ec99c00
Former-commit-id: 9e84fd27a4
2014-08-13 14:40:13 -05:00
Steve Harris
9ce3fc1803 Issue #3507 - Revert "Issue #2875 - Implemented HFR Surface Current Velocity."
This reverts commit 5a3f760b6f51d0561dd605388e6b025ebe70e330 [formerly 7ae3ca0bfc] [formerly 978349e517 [formerly 978349e517 [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]].


Former-commit-id: dd9d117f90 [formerly dd9d117f90 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]
Former-commit-id: e5af41fa86
Former-commit-id: 0739666ae9
2014-08-12 10:19:12 -05:00
Slav Korolev
a3e480a756 Issue #2875 - Implemented HFR Surface Current Velocity.
Former-commit-id: 978349e517 [formerly 978349e517 [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]
Former-commit-id: 7ae3ca0bfc
Former-commit-id: 14cf56ec46
2014-08-12 09:19:22 -04:00
Baoyu Yin
c7cbed56a7 VLab Issue #4395 - AWIPS2_DR_​17383 Volume Browser missing 50mb and 100mb layers; closes #4395
Change-Id: I1fff3834c00c2807f3b3f286f51ba4d5b6e65ca9

Former-commit-id: a480966975 [formerly a480966975 [formerly 053ab9de9f5d9e6a881c8211efa02e5f659818ab]]
Former-commit-id: ab6421ed60
Former-commit-id: 7c74c1e141
2014-08-08 15:18:25 -04:00
Mark Peters
e136d6b85d Omaha #3483 Split Volume Browser fields menus into multiple reusable components.
Change-Id: I708204d02f566c6e2ce8b7867908ea200aa07baa

Former-commit-id: 53586ec52c [formerly 53586ec52c [formerly f44418a1e872dfea47a94325306198b65e5e0214]]
Former-commit-id: f930f1032f
Former-commit-id: 8da4bc58ca
2014-08-06 16:35:32 -05:00
Brian Clements
053cf978a7 Omaha #3410 changed lon/lat fields to floats in sfc and air obs location
Change-Id: I4c8d47b9f9e598e69309f1aa99bc30c022cae7af

Former-commit-id: aa991c9223 [formerly aa991c9223 [formerly cdb0a72fcb2345564f2b944fdecd7869fd498767]]
Former-commit-id: 74a6c3dd20
Former-commit-id: 10ea02b936
2014-07-24 13:45:58 -05:00
Ana Rivera
0eb194e2bb VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55

Former-commit-id: c10b50d0b2 [formerly c10b50d0b2 [formerly 9c3460d34513dd2f54643b87cb8afd122d94ea9c]]
Former-commit-id: 088ebd2ca2
Former-commit-id: 752bc11851
2014-07-21 21:41:17 +00:00
mjames-upc
969312e200 various build updates, feature muting, NCP viz edits, icon updates
Former-commit-id: 04b06dad08
2014-07-16 20:12:19 -06:00
mjames-upc
f3e9af8835 grid name updates for cave and edex
Former-commit-id: 654734a4cd
2014-07-06 18:38:08 -06:00
Roger Ferrel
a7daeebc77 Omaha #3318 Changes to add GEFS to volumen browser.
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e

Former-commit-id: 02d9609862 [formerly 02d9609862 [formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]]
Former-commit-id: 1869745cce
Former-commit-id: 7f50b8fb93
2014-07-02 14:27:28 -05:00
Slav Korolev
a78f0ea765 Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: 1b870e21fc [formerly 1b870e21fc [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]]
Former-commit-id: 1956077e1a
Former-commit-id: 0f5a2c0233
2014-06-30 09:40:32 -04:00
Slav Korolev
99fc9b951a Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
Former-commit-id: b72f146d95 [formerly b72f146d95 [formerly 834358236059cbabd11e89b2d43f7f1c621ce2e5]]
Former-commit-id: f6e8dedfa3
Former-commit-id: 03890f03e3
2014-06-27 12:29:25 -04:00
mjames-upc
296826c0f4 menu removal, edits, additions for sat and rad products. various typo corrections and formatting fixes.
Former-commit-id: 0a5e97c062
2014-06-26 20:01:44 -06:00
Slav Korolev
0a006483ae Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 900d5e8fbe [formerly 900d5e8fbe [formerly 4dc7f664a3e96a43392eee011bd453310d8e12ab]]
Former-commit-id: 79f2c0efc6
Former-commit-id: 3b9ed35eb0
2014-06-26 14:04:34 -04:00
Roger Ferrel
7fef8ed924 Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df

Former-commit-id: bd2d40faee [formerly bd2d40faee [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]]
Former-commit-id: ad6eac6e20
Former-commit-id: 801bdc8fc7
2014-06-26 11:16:09 -05:00
Lee Venable
da158b0d70 Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client.
Former-commit-id: 2401caa24f [formerly 2401caa24f [formerly 363ddb4af1075686fc5a1d80df884f59d93d7b99]]
Former-commit-id: a176a26618
Former-commit-id: ab5d8d6204
2014-06-23 15:37:10 -05:00
Steve Harris
8270fd8a9f Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: 9213369739 [formerly 9213369739 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]
Former-commit-id: e1c8ad2611
Former-commit-id: 362988b9d7
2014-06-16 08:19:12 -05:00
Slav Korolev
a66dd879c7 Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 2b877529ce [formerly 2b877529ce [formerly 0172e8f27b646a965e472f969f112a4e170d9f41]]
Former-commit-id: 16ec392c12
Former-commit-id: d8ebeb4778
2014-06-12 12:24:34 -04:00
Kenneth Sperow
3e94502542 Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8

Former-commit-id: c302ef8967 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]
Former-commit-id: f2a738cc25
Former-commit-id: ca913b6159
2014-06-03 20:55:29 -07:00
Steve Harris
144354c369 Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 99bc6f990c [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9b98b41cd4
2014-05-27 14:48:24 -04:00
Kenneth Sperow
51b0b4e566 Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 189e3cc1f2 [formerly 189e3cc1f2 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f

Former-commit-id: 8490f7ea33 [formerly 8490f7ea33 [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]
Former-commit-id: 9fa9425aea
Former-commit-id: 846395fd42
2014-05-22 14:16:49 -07:00
brian.dyke
b42011fc76 Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 011d121e4b [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]
Former-commit-id: 58683ad040
Former-commit-id: bc4649765a
2014-05-19 09:45:37 -04:00
Ana Rivera
8cb1bfc3b8 VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Former-commit-id: 91715e7a3f [formerly 91715e7a3f [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]]
Former-commit-id: 81a9d4fa44
Former-commit-id: 88520fc206
2014-05-12 18:55:06 +00:00
Ana Rivera
c150a7c8e1 VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Former-commit-id: aac45623bc [formerly aac45623bc [formerly c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e]]
Former-commit-id: 1b4450ec5f
Former-commit-id: 6a4fb7f0a3
2014-05-08 20:10:24 +00:00
Melissa Porricel
38539cc805 ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca

Former-commit-id: 42c36a5e80 [formerly 42c36a5e80 [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]]
Former-commit-id: 92231e051d
Former-commit-id: 1e32d583b4
2014-05-05 14:56:58 -04:00
Steve Harris
17318b1870 Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml

Former-commit-id: 6ef3b9f1e5 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]
Former-commit-id: 1c8f2f6185
Former-commit-id: b797b4b1fa
2014-05-05 08:21:02 -05:00
mjames-upc
b4c0da1971 first commit orphan branch from remotes/origin/ncep_14.2.1
Former-commit-id: 27eaf7aa70
2014-04-30 19:22:58 -06:00
Ben Steffensmeier
86174019b5 Issue #2874 Allow RTOFS nowcast to be identified by process type.
Former-commit-id: 2d96d9d2df [formerly 2d96d9d2df [formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]
Former-commit-id: fa3d4bb618
Former-commit-id: 7499987f52
2014-04-25 14:38:36 -05:00
David Gillingham
c0fd32360d Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb

Former-commit-id: 2426e463f7 [formerly 2426e463f7 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 2e8b8c6e86
2014-04-25 10:56:43 -05:00
Brian.Dyke
737283b94a Merged 13.5.5-1 into 1412
Former-commit-id: 188d84cc87 [formerly 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]
Former-commit-id: 35ad867281
Former-commit-id: 72618c4214
2014-04-16 12:09:12 -04:00
Everett Kladstrup
d96b56c91a Issue #2725 Move derived parameters logic to common
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: 06d6961c0f [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]
Former-commit-id: 0699041518
Former-commit-id: 260d0beddc
2014-04-09 09:31:12 -05:00
Ben Steffensmeier
d20a1a6f54 Issue #2874 Initial implementation of RTOFS data.
Former-commit-id: 55046a8e1e [formerly 55046a8e1e [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]
Former-commit-id: 12ed72b0c0
Former-commit-id: ab8293c6a1
2014-03-24 11:10:18 -05:00
Ben Steffensmeier
bb39a48e5b Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image.
Former-commit-id: 286f447a9c [formerly 286f447a9c [formerly db3ffd586611ea8692728ea0de5451cec89421b6]]
Former-commit-id: 14af3282cb
Former-commit-id: 48dac44df4
2014-03-20 13:31:08 -05:00
Nate Jensen
432926c40b Merge "Issue #2718 Update to GeoTools 10.5 Undo reformatting of ncep code Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util" into development
Former-commit-id: 540d0f2e1d [formerly 540d0f2e1d [formerly ee5c599bf4822f73e488e42240c5794189e2d70f]]
Former-commit-id: 27625eb93a
Former-commit-id: d8edb8e91b
2014-03-13 11:16:00 -05:00
Ron Anderson
4ffc16ce53 Issue #2718 Update to GeoTools 10.5
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: 1c727465ee [formerly 1c727465ee [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]
Former-commit-id: bcfaf40ebf
Former-commit-id: 4b2a388628
2014-03-13 11:11:53 -05:00
Ben Steffensmeier
3b4d3af43e Issue #2871 Clean up ECMWF bundles.
Former-commit-id: 17a940b6ce [formerly 17a940b6ce [formerly 5eb5f909c575205e3a261c3cce7ef7b05a57dd22]]
Former-commit-id: fe55c49373
Former-commit-id: be4ec3d266
2014-03-12 11:16:42 -05:00
Everett Kladstrup
57f9230654 Issue #2725 deriv param to common stage 1
* Removing viz dependencys from derivparam
** Move LevelUtilities to common
** Use spring instead of eclipse plugin extentions
   to configure derived parameter function types
** Use RequestRouter instead of ThriftClient so
   we can use IServerRequest objects in both CAVE
   and EDEX

The next stage will be to clean up exceptions in
derived parameters to stop using VizException and
VizCommunicationException.


Former-commit-id: bd50a38d87 [formerly bd50a38d87 [formerly 604ae156f8b235e2e1736863b419547289403240]]
Former-commit-id: 80ad25754b
Former-commit-id: 415ccd78fb
2014-02-03 09:02:58 -06:00
Ben Steffensmeier
b3ef07794a Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: a37db9d1b4 [formerly a37db9d1b4 [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]
Former-commit-id: 922674273e
Former-commit-id: 4a86c90bfc
2013-12-11 12:45:11 -06:00
Mike Duff
96de34b2c1 Issue #2271 - Fix menu problem with previously selected points being selectable again
Change-Id: I8c8a1e7f1f87b87ba6bd065df2692c82f988e8ee

Former-commit-id: 0a5f2e3484 [formerly 0a5f2e3484 [formerly 959fcd37424b6261606d2ae65663403764be9c39]]
Former-commit-id: ebc730ac2d
Former-commit-id: 4d210517bd
2013-12-06 12:58:38 -06:00
Steve Harris
98ae84da42 14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: 99e3707c5b
Former-commit-id: 7590a56e0e
2013-10-28 10:55:16 -04:00
Steve Harris
8d67ffede4 14.1.1-3 baseline
Former-commit-id: 94f24e0d8a [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 5739b4f832
Former-commit-id: 4a6a209aea
2013-10-28 10:46:02 -04:00