Commit graph

1358 commits

Author SHA1 Message Date
Richard Peter
2d80fdb830 Merge "Issue #1495 enable ensemble subset requests in opendap. Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a" into 13.2.1_delivery
Former-commit-id: e3bd3302be [formerly 7cc497c663] [formerly 9f9020db61] [formerly bf18ba9214 [formerly 9f9020db61 [formerly b940fe556d1421d3709ff6c798ee0a39ae09af10]]]
Former-commit-id: bf18ba9214
Former-commit-id: 3b16030b9f1b267dee1b7eb29f2c46c200bd7d6f [formerly 2e5883c56e]
Former-commit-id: 0f208693ec
2013-01-18 15:35:56 -06:00
Ben Steffensmeier
472fa846d2 Issue #1495 enable ensemble subset requests in opendap.
Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a

Former-commit-id: 2eaa5373a9 [formerly 928cb3b00f] [formerly eb821d7580] [formerly 94ba8511cb [formerly eb821d7580 [formerly ddaf9e6c69221600deedfbaf991a3936d0bb711e]]]
Former-commit-id: 94ba8511cb
Former-commit-id: b0014a9838aaba0f74cd6e57a56e57324e4301d1 [formerly 7e3b6d12f6]
Former-commit-id: 41a0a0e4e4
2013-01-18 14:58:10 -06:00
Ben Steffensmeier
0eee2239c9 Issue #1502 fix grid sampling unit null pointer.
Former-commit-id: 8aaef6b256 [formerly f814fd22a3] [formerly b6fb3706bb] [formerly 5a07b36fa4 [formerly b6fb3706bb [formerly db0a4825b8360afaada2a8f8363108464e61f474]]]
Former-commit-id: 5a07b36fa4
Former-commit-id: c58121817c1977071b465ef1296f92eda4eaa708 [formerly 57ef4597e8]
Former-commit-id: 0b672c9c8c
2013-01-18 11:19:15 -06:00
Ben Steffensmeier
d270c16979 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: 3802dad955 [formerly a9654f859a] [formerly f0af056d97] [formerly ec199ad7d1 [formerly f0af056d97 [formerly deeff9eae06f096612b65832a344e5d05a36db07]]]
Former-commit-id: ec199ad7d1
Former-commit-id: 08da3e13f0dfa4e1eab04881e0b72815afc9b88a [formerly 3bfba5b771]
Former-commit-id: 50d1561165
2013-01-18 10:59:43 -06:00
Steve Harris
f2b52084dc Merge branch '13.2.1_delivery' into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java

Former-commit-id: bf957a3bd7 [formerly 89f3120c0c] [formerly 2c9c6b7dde] [formerly 407d73a04f [formerly 2c9c6b7dde [formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]]]
Former-commit-id: 407d73a04f
Former-commit-id: 5714abfd35536ab502243bd9ff20068b0fa7b7ac [formerly bbb637faf3]
Former-commit-id: 0ca985778e
2013-01-18 10:52:29 -06:00
Steve Harris
b4a3933e87 13.1.2-10 baseline
Former-commit-id: 5b617e763b [formerly 683193255d] [formerly 68dde17de2] [formerly 86ea0b666e [formerly 68dde17de2 [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]]
Former-commit-id: 86ea0b666e
Former-commit-id: 9f07f7e014b3a205684780ddaf335bdd9b824c4d [formerly d148beb4ca]
Former-commit-id: 39f9dc931a
2013-01-18 10:37:25 -05:00
Steve Harris
71267d323e 13.1.2-9 baseline
Former-commit-id: a78d3ab456 [formerly 6fd587d08d] [formerly 0878a7ea57] [formerly ddc6aec013 [formerly 0878a7ea57 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]]]
Former-commit-id: ddc6aec013
Former-commit-id: a5350d4f640abae2d8766048e2614c8856764e55 [formerly 5e0a9a8fd2]
Former-commit-id: 5b752c12c4
2013-01-18 10:29:52 -05:00
Mike Duff
51cc047273 Issue #1386 - Change menu text to read Save Graph Image.
Former-commit-id: 991f3cfe7b [formerly 754fbf637e] [formerly 5b6ec484c0] [formerly 592b2d9088 [formerly 5b6ec484c0 [formerly c8e849b1636d9429215a36ba85febf805cdd4fc6]]]
Former-commit-id: 592b2d9088
Former-commit-id: ae69de2fa237e867ddd3d711b0f7464ebf08b9a8 [formerly d0d05f975d]
Former-commit-id: b3c1a39a24
2013-01-18 09:28:43 -06:00
Nate Jensen
44606a58a4 Issue #1497 fix build
Former-commit-id: bd08d7a537 [formerly 13b5619297] [formerly 6e0f0d330e] [formerly b52aa82213 [formerly 6e0f0d330e [formerly 3b30fcffe24d19c6c694d9519d1a515843248d32]]]
Former-commit-id: b52aa82213
Former-commit-id: da7e2f9e2766d8828401b92dfc04d9fa22173489 [formerly 98ec6fcc1c]
Former-commit-id: cc0725f0b7
2013-01-17 18:42:38 -06:00
David Gillingham
c8ec47e58f Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it.
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc

Former-commit-id: de3e72065e [formerly 9e3999a427] [formerly c6e64d83a2] [formerly d16760c73e [formerly c6e64d83a2 [formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]]
Former-commit-id: d16760c73e
Former-commit-id: b5a1c4056953f024797af353d21b532b9cabd412 [formerly a40383de3b]
Former-commit-id: 09836dacca
2013-01-17 17:42:05 -06:00
Dustin Johnson
ceee5c6ad4 Issue #1501 Use registry version of subscription when sending notification responses
Change-Id: I96622e8f1d2236ade47d4c5a11ad41b750bc7962

Former-commit-id: 5ce7601dfa [formerly 9f775d2dd7] [formerly d9064bdc98] [formerly 38036a0e8b [formerly d9064bdc98 [formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]]
Former-commit-id: 38036a0e8b
Former-commit-id: 0a9edd87c8a06f3382e4aca4205e470a2f005410 [formerly 13a75fabad]
Former-commit-id: 9681f57fac
2013-01-17 14:53:36 -06:00
Ben Steffensmeier
23761bb292 Issue #1502 fix grid sampling unit null pointer.
Former-commit-id: 859b4aa99c [formerly c71e77f65e] [formerly 49cd332f06a3dbb25043df9c6135539ad0f1bfbb [formerly 00f0384065]] [formerly 6409141383 [formerly 00f0384065 [formerly e1618704972fad954ac61bc3aecb09f6767f1255]]]
Former-commit-id: 6409141383
Former-commit-id: df61f9885a8292b81ec56ce84de3ba215cf7d305 [formerly e03f073335]
Former-commit-id: 9053b6e7aa
2013-01-17 13:02:35 -06:00
Ben Steffensmeier
a27ce003b8 Issue #1495 update Product Browser to load all ensemble members
Former-commit-id: e5e95fa98d [formerly 6366bf3b6d] [formerly 4854df66bc] [formerly 9aafe61075 [formerly 4854df66bc [formerly 38af9c697b1bb96e5f6f032eb9fc2055a9e8f7ef]]]
Former-commit-id: 9aafe61075
Former-commit-id: 956a5053048c2cf072fc9ac97092601f6ad9095c [formerly 6ff281dc98]
Former-commit-id: 65c898fb16
2013-01-17 10:32:40 -06:00
Bryan Kowal
9761bc18ea Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
Former-commit-id: 9e1825b270 [formerly 86bd4e3b3f] [formerly a2f745ec54] [formerly 5d769d8a8d [formerly a2f745ec54 [formerly 42a05fc36d0ba3036a7e056d8871f684abf986c9]]]
Former-commit-id: 5d769d8a8d
Former-commit-id: 2108d5adbe08bf12c597593f05366699193eb6b8 [formerly 2bb5377a4d]
Former-commit-id: d9832e846b
2013-01-17 09:59:11 -06:00
Bryan Kowal
066e7e05e3 Issue #1494 - the com.raytheon.viz.dataaccess feature will now be built
Former-commit-id: a921d13fe1 [formerly 846d860eb2] [formerly 68491bee01] [formerly 08c2faaabe [formerly 68491bee01 [formerly 796f9e15632bf3491c68702be5e7135c51b99fec]]]
Former-commit-id: 08c2faaabe
Former-commit-id: b6540a84f2e89d1c2d86209b3c27bcd92e6dad14 [formerly 7dbe52a47a]
Former-commit-id: ef232c483f
2013-01-17 09:57:58 -06:00
Richard Peter
14079c0103 Merge "Issue #1479 fix mod families" into development
Former-commit-id: 0870ae9c39 [formerly 62565f136d] [formerly 9d81479452] [formerly 8d05edb256 [formerly 9d81479452 [formerly 31faae93ac271de25b7671f45548a3c088a2eacf]]]
Former-commit-id: 8d05edb256
Former-commit-id: 9f51fc2d0aa1986ac0b282984a837b97a5eb1480 [formerly 8538c8ff38]
Former-commit-id: 10ffd93cd7
2013-01-16 17:11:12 -06:00
Roger Ferrel
96deac5f43 Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
Changes based on code review and added listener to GridManager and unit test.

Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650

Former-commit-id: 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 1e492b81ff [formerly 1cd076671c [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]
Former-commit-id: 1e492b81ff
Former-commit-id: ea2ddcc686b917f0c5feca15fbe115c2be0949d6 [formerly f10521f861]
Former-commit-id: 86d51634dc
2013-01-16 16:53:29 -06:00
Mike Duff
504dd2f5c0 Issue #1420 - More Rules changes.
Peer review comments

Change-Id: I3ed89b332764bba2d995a248e361d20c1eec6edf

Former-commit-id: 5210083e95 [formerly 1df1b5a94d] [formerly 2a31447d6d] [formerly 8d0a79703f [formerly 2a31447d6d [formerly 84f2d0ed39e11059359558676c988a0bf1e989b9]]]
Former-commit-id: 8d0a79703f
Former-commit-id: dd2462fb0ac1bd87f0124290fd6e8c8a6b100b4b [formerly c6924b6920]
Former-commit-id: 72a70a6eaf
2013-01-16 14:34:55 -06:00
Roger Ferrel
9e9eaa3d4a Issue #1492 Made GFE's GhgFontDlg and volume browser's InventoryDlg non-blocking; removed no longer needed "original" classes. No code changes merge conflict?
Change-Id: I28676d7b6d016e3f4f61fcc667c2e1d2af9e53d1

Former-commit-id: 413e9beda4 [formerly fbf6bc87c4] [formerly 5250a0addf] [formerly cabdfd569f [formerly 5250a0addf [formerly 5444e7653c0cf488eb424a16816beb2e6a9335b1]]]
Former-commit-id: cabdfd569f
Former-commit-id: 4ee08f43125d4ae99c00e0d968468d22822b0fc2 [formerly e8d8dcc795]
Former-commit-id: 5187be10ca
2013-01-16 13:07:58 -06:00
Steve Harris
bda3371aef Merge branch '13.2.1_delivery' into development
Former-commit-id: e87c1739ce [formerly 79e7b50d94] [formerly 8c447659ff] [formerly 483e55bcef [formerly 8c447659ff [formerly 723f0efba18c83c46d3b241dae678e81d2ac924d]]]
Former-commit-id: 483e55bcef
Former-commit-id: 1f1108e1b07236a5416fa8b9d145b56652782043 [formerly 2e34a82690]
Former-commit-id: b8ab464cee
2013-01-16 12:03:50 -06:00
Ben Steffensmeier
f7a19b733a Issue #1479 fix mod families
Former-commit-id: a68b6beda9 [formerly da98f8e176] [formerly 244f55e1f9] [formerly 65b11cf54c [formerly 244f55e1f9 [formerly 4678cbf7764cae77683d357f0ac1bf6ff95bc63e]]]
Former-commit-id: 65b11cf54c
Former-commit-id: 1d879053b88db0e9661b78b6561242b31172f199 [formerly 0d8a901d07]
Former-commit-id: 0fe033c64c
2013-01-16 10:56:21 -06:00
Bryan Kowal
00c7284039 Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
Former-commit-id: d194f3c137 [formerly 55550007cb] [formerly 2ed28bed93] [formerly 8c118e791b [formerly 2ed28bed93 [formerly 18676a8f73c7ac0eb2ce0ff25cf3c66ae1f72f02]]]
Former-commit-id: 8c118e791b
Former-commit-id: d8bdc1f2055cc2924e29bd41737da260c406b70c [formerly 0a39b4ddf1]
Former-commit-id: 1eb4e6d41e
2013-01-15 18:46:46 -06:00
Bryan Kowal
83209a66b7 Issue #1414 - adding Satellite to the Data Access Framework
- addressed peer review comments
- includes the CAVE generic grid resource and resource data
- the generic grid resource now utilizes the populateData method of IGridData
- the data time methods of the satellite factory will now throw data retrieval exceptions

Change-Id: I763cddc8ba8cac715eb0605594904bd9f9c21db9

Former-commit-id: 77660c9f5f [formerly a315e4461b] [formerly 4939e96872] [formerly 789359a779 [formerly 4939e96872 [formerly b084e4a721edc9400fc7a8f25c7da539d6dd8480]]]
Former-commit-id: 789359a779
Former-commit-id: cc9c31268f1400d39d5c2b01410315020dcc64f3 [formerly 53a280116b]
Former-commit-id: 03ccca567a
2013-01-15 18:08:17 -06:00
Brad Gonzales
927d6df024 Issue #1452 Clear current filters when creating a new filter configuration.
Change-Id: I7562e05f404b7b3bc746a168d72601520d3a8500

Former-commit-id: 9c295d4f42 [formerly 5fd396acaf] [formerly 026c98298b] [formerly e7ecc52e25 [formerly 026c98298b [formerly c4f47262403a56a0e6fe28bb1b5ac523fb91e43f]]]
Former-commit-id: e7ecc52e25
Former-commit-id: e681b7568c05bb90bf8bfa1123327c5e349b5e23 [formerly 253ac8f1d3]
Former-commit-id: 382a21f3a2
2013-01-15 15:50:43 -06:00
Dave Hladky
81ef046069 Issue #1475 QPF standalonoe displays appear slow
Change-Id: I352de7f76ade5d3d981b3c6206086955c2243f6a

Former-commit-id: 0b8d399f64 [formerly ffd3faa84b] [formerly 0f7a64798d] [formerly 6822591e1a [formerly 0f7a64798d [formerly 6e7c86aba7103c445823ac2a11a2241939e4b6c2]]]
Former-commit-id: 6822591e1a
Former-commit-id: b34b35f09adc05a6a90fe87bd4081a824d7698fd [formerly 81c9f8e21e]
Former-commit-id: 9d935baf22
2013-01-15 15:50:27 -06:00
Richard Peter
a463891c8e Merge "Issue #1286 Fix bugs found during 1286 testing" into 13.2.1_delivery
Former-commit-id: 75f41d14eb [formerly d30a607764] [formerly c8d963d541] [formerly dc6ee0b9e1 [formerly c8d963d541 [formerly e2516f60d0748830d5849f42819e2dcc66b67bb6]]]
Former-commit-id: dc6ee0b9e1
Former-commit-id: 313b538a60cf36a05c010c4dcf3f45a5c2b0bd4a [formerly b456405145]
Former-commit-id: fe2c8b320e
2013-01-15 15:37:42 -06:00
Bryan Kowal
49b121ed3a Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: 1414f0415b [formerly fba28ea69b] [formerly 300e157b3c8dfc3a1f2f1580d6046fcedc74aed2 [formerly e2a12845d3]] [formerly 4db9c6c321 [formerly e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 59073a26adad34d6d9a1d72d03facd04de433ad2 [formerly c1330e8121]
Former-commit-id: 38480e46b1
2013-01-15 14:56:01 -06:00
Lee Venable
e5e1841b7e Merge "Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates." into development
Former-commit-id: 1578950906 [formerly a3c5aded12] [formerly 32692a6def] [formerly f63da5aba6 [formerly 32692a6def [formerly 517b6e6652b75801928cbb8f2f6899916e8dd988]]]
Former-commit-id: f63da5aba6
Former-commit-id: 2d8f8827471d802ee24a1d297aac5aed42839e14 [formerly 5a733e465d]
Former-commit-id: c4291fcb2a
2013-01-15 14:47:49 -06:00
Max Schenkelberg
4e507c57f6 Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames
Amend: Cleaned up comments and some bugs in code after review

Amend: Rebased changes

Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d

Former-commit-id: 77c2ae6ad1 [formerly e5cd1901a5] [formerly ff72ce0b0c] [formerly db3e7bab99 [formerly ff72ce0b0c [formerly ab74da7808aa343983f532ee076820c7e63fdded]]]
Former-commit-id: db3e7bab99
Former-commit-id: 36ba7490bc83dc4ce324f378bdf66b8020044b22 [formerly c246f56568]
Former-commit-id: fac8769336
2013-01-15 14:41:19 -06:00
Max Schenkelberg
cea378c445 Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously.
Amend: Switched to proper ticket

Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9

Former-commit-id: f51398595e [formerly 9aac1d2871] [formerly 02e7c79de9] [formerly aa88b83859 [formerly 02e7c79de9 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]]
Former-commit-id: aa88b83859
Former-commit-id: 451ec6f6d7261a1c251d7e39253fc41e3af7c367 [formerly c6b6823228]
Former-commit-id: 410abb1144
2013-01-15 14:13:36 -06:00
Nate Jensen
65e91312b6 Issue #1446 Initial python within Jep implementation of data access framework
Change-Id: I7b6ddb25f0ec68419aab7e40f15f94cd16e155b8

Former-commit-id: 744f536415 [formerly e5e7107a56] [formerly e5237fceac] [formerly 12e0a100c4 [formerly e5237fceac [formerly 1c5339c02a8570e12f92559a3159006efdf0df77]]]
Former-commit-id: 12e0a100c4
Former-commit-id: 7bc5f3faca240fbf62ffec334f821eb98bc580ed [formerly aaa442212a]
Former-commit-id: f726a26b54
2013-01-15 13:48:04 -06:00
Richard Peter
ea1a93d1b9 Merge "Issue #1452 Clear current filters when creating a new filter configuration." into development
Former-commit-id: cd3fcb5561 [formerly e1ce9b63f1] [formerly 02f597fdb2] [formerly b94c90fd51 [formerly 02f597fdb2 [formerly 0fd071aa5ac96a6548ac350f55820837cf20a992]]]
Former-commit-id: b94c90fd51
Former-commit-id: 5710507c6a21951c23fd8e681b010a9da4b49ce8 [formerly 4966d706ae]
Former-commit-id: 99513feec9
2013-01-15 13:40:49 -06:00
Richard Peter
00a4f2f3b7 Merge "Issue #1475 QPF standalonoe displays appear slow" into development
Former-commit-id: d2fbb1af03 [formerly ed6d929dcd] [formerly e7305ca187] [formerly 11e8dae113 [formerly e7305ca187 [formerly 1d1a155a0276dcf02ccc9d66937d0a6d37d51722]]]
Former-commit-id: 11e8dae113
Former-commit-id: a4769661683a42397b8db11e48020d84acc28608 [formerly b3d5faebf3]
Former-commit-id: cf1d3faab2
2013-01-15 13:40:13 -06:00
Dustin Johnson
b18fc5ff5e Issue #1286 Fix bugs found during 1286 testing
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 50fa22f710 [formerly 99f8d40bed] [formerly 3d74a68e94] [formerly 2cf52d976b [formerly 3d74a68e94 [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]
Former-commit-id: 2cf52d976b
Former-commit-id: d2caf5c394290add805dceb28270a72f9b600765 [formerly aa7acedf0a]
Former-commit-id: 94e95f3e07
2013-01-15 10:18:14 -06:00
Richard Peter
d880361e06 Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 6e42fa32d3 [formerly a966546e31] [formerly 20520c8f0152154419357d990f91f1ce998a888a [formerly 3fb7d96ec1]] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]
Former-commit-id: 79ef100838
2013-01-14 18:07:17 -06:00
Brad Gonzales
23f6270d4c Issue #1452 Clear current filters when creating a new filter configuration.
Change-Id: I7562e05f404b7b3bc746a168d72601520d3a8500

Former-commit-id: 323f1f44c4 [formerly 574ed7c971] [formerly 03c7656f55] [formerly 771debed33 [formerly 03c7656f55 [formerly dc3f958011b53ba07ea21648ca1c634bd7b677b7]]]
Former-commit-id: 771debed33
Former-commit-id: 3f687442e0ee4193ff1fb6357696a0241823c642 [formerly 10aa12c141]
Former-commit-id: 35a85c2c91
2013-01-14 18:06:29 -06:00
Richard Peter
dd346fa040 Merge "Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development" into development
Former-commit-id: 4c82ddaa12 [formerly d2cc93281a] [formerly 59368e93e1] [formerly 4176d078a7 [formerly 59368e93e1 [formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]]
Former-commit-id: 4176d078a7
Former-commit-id: f0175e39c5b471bab4e4eaa25e855a6631e81662 [formerly 2049e40d87]
Former-commit-id: ea7d2eaff1
2013-01-14 17:49:29 -06:00
Lee Venable
9d53072b41 Merge "Issue #1480 guarantee that framesInfo returned from descriptor is always valid." into development
Former-commit-id: 66aab3680d [formerly c3dec53498] [formerly 7009876544] [formerly a3a7dc44c9 [formerly 7009876544 [formerly 2069b8265416fae4c8fbeb37b4686b85428eca7f]]]
Former-commit-id: a3a7dc44c9
Former-commit-id: fdd917cd63082600218ba6b454499b49789ae013 [formerly 4e2b009db0]
Former-commit-id: baa5496a72
2013-01-14 17:47:59 -06:00
Ben Steffensmeier
2ebe93dc12 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: 1926965b6b [formerly da79be73a2] [formerly f49e77f7df] [formerly 2e10a8408b [formerly f49e77f7df [formerly c0888b1ff6de67da8b4bb7a234bc5dbecafa9009]]]
Former-commit-id: 2e10a8408b
Former-commit-id: 2adb2b2db42f9a0a161c689d6a3b7ec66791bb64 [formerly 0a0d230091]
Former-commit-id: 3d63fa24a1
2013-01-14 17:44:46 -06:00
Steve Harris
3d35fd52d5 13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]
Former-commit-id: e34695538d
2013-01-14 18:42:21 -05:00
Richard Peter
9da3b7e2dd Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]
Former-commit-id: fa6247baf7
2013-01-14 17:38:38 -06:00
Richard Peter
715d5bd5f2 Merge "Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository." into development
Former-commit-id: 99414fa1f0 [formerly 461a503837] [formerly 32d4bc3d9f] [formerly 69c6cfd196 [formerly 32d4bc3d9f [formerly c8cf77295c7f53dbd2821271298391ba136e034c]]]
Former-commit-id: 69c6cfd196
Former-commit-id: 7eb1dd62e445e03b2b2d4d9248f1dfaad042460e [formerly a634690867]
Former-commit-id: ab38a1f89b
2013-01-14 17:33:22 -06:00
Richard Peter
7af4fc10a8 Issue #1408: Merge branch 'ss_builds' (13.1.2-6) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.core/res/spring/viz.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/auth/UserController.java
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/OrLevelNode.java
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogMonitorAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeSeasAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsUserManager.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourSupport.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/CoverageUtils.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/HydroDisplayManager.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/AwipsCalendar.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualListConfig.java
	cave/ohd.hseb.common/externaljars/jdom.jar
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/bin/setup.env
	edexOsgi/build.edex/esb/bin/wrapper.conf
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/build.edex/esb/etc/registry.sh
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyMessage.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyQueue.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticDataGenerator.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribParamInfoLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridModel.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/alias/grib.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid104.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_ECMWF-98.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_FSL-59.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NOAA-161.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NWSTG-8.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RSMC-54.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_UKMET-74.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/grid/IGridData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/mapping/DatasetIdMapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.level/src/com/raytheon/uf/common/dataplugin/level/mapping/LevelMapper.java
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/subgrid/SubGrid.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/lookup/ParameterLookup.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/mapping/ParameterMapper.java
	edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ConvertUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/AliasNamespace.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/Mapper.java
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteServerRequestRouter.java
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
	edexOsgi/com.raytheon.uf.edex.gridcoverage/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
	edexOsgi/com.raytheon.uf.edex.gridcoverage/src/com/raytheon/uf/edex/gridcoverage/GetGridCoverageHandler.java
	edexOsgi/com.raytheon.uf.edex.ohd/resources/com.raytheon.uf.edex.ohd.properties
	edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridInfoCache.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/handler/GraphDataHandler.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: I80504ec890827bb512be138f319380d04bdfc402

Former-commit-id: 9cad9f0c54 [formerly 1a1a69d38c] [formerly 970216e4c9] [formerly 19d923f387 [formerly 970216e4c9 [formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]
Former-commit-id: 19d923f387
Former-commit-id: 8835cc0deb6ecb25ed3f4f23af4a1a62f0414be7 [formerly 8ccc791566]
Former-commit-id: f1262388ce
2013-01-14 16:53:05 -06:00
Dave Hladky
8abd5b779a Issue #1475 QPF standalonoe displays appear slow
Change-Id: I352de7f76ade5d3d981b3c6206086955c2243f6a

Former-commit-id: a8b5ee21f6 [formerly 199d88d6a8] [formerly 8ac74e6b0d] [formerly 75f62b0856 [formerly 8ac74e6b0d [formerly 2f6bf58b35e6ff8317281c3e62d1c1a61eea14f0]]]
Former-commit-id: 75f62b0856
Former-commit-id: 5680236721f68eccd4069a48b6526291dc525a33 [formerly be17e02b4a]
Former-commit-id: 360d3bfe23
2013-01-14 15:50:59 -06:00
Brad Gonzales
eacfe73d3f Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository.
Change-Id: I49b715f4b9f998e933948d3803194aa41deec979

Former-commit-id: 7391e3c0fe [formerly 1644eee264] [formerly 5bbe5d5dbf] [formerly 72cb336592 [formerly 5bbe5d5dbf [formerly 9341aa5fe927e38db949be280a323300cd9fc62d]]]
Former-commit-id: 72cb336592
Former-commit-id: bbcec7aca93cd7df0525463803027bc994288c8e [formerly 881cc10e84]
Former-commit-id: bd8eaa6dc8
2013-01-14 14:47:51 -06:00
Ben Steffensmeier
dea702c873 Issue #1480 guarantee that framesInfo returned from descriptor is always valid.
Former-commit-id: 4547887fe6 [formerly e00348a124] [formerly cf8a9e3f64] [formerly ac9ba67919 [formerly cf8a9e3f64 [formerly c2b715458167c4438d2c2c35b3b0cb54c2a9cc9c]]]
Former-commit-id: ac9ba67919
Former-commit-id: c92b1fa2bb66c18a0319bba6df102f7c8450428d [formerly 147a379a81]
Former-commit-id: c1ae999c81
2013-01-14 14:30:17 -06:00
Richard Peter
8c0a79611e Merge "Issue #1464 fix saving of spatial subsets." into development
Former-commit-id: 16ccbec7fa [formerly fe28e371a6] [formerly 65715d4154] [formerly e180a2ff86 [formerly 65715d4154 [formerly 7a5c93c668bb409857ff0d50a9506c67cae7a081]]]
Former-commit-id: e180a2ff86
Former-commit-id: bb8dc777c2dc2e01f0556a7a8c7253bf8db95622 [formerly 712fb1cb05]
Former-commit-id: 62d3bd6837
2013-01-14 11:56:33 -06:00
Richard Peter
4b57dccb57 Merge "Issue #1473: Fix Alarm Alert NPE" into development
Former-commit-id: b731360a84 [formerly 621a4cd147] [formerly 0f705ac355] [formerly e176fcbf06 [formerly 0f705ac355 [formerly edaf980163ff2f3770cb125b9a837a23ca1b16b2]]]
Former-commit-id: e176fcbf06
Former-commit-id: 668863fe0d8c1e551660ffd2408217fac215e66b [formerly 157e75f7aa]
Former-commit-id: 521e7cf5af
2013-01-14 11:55:35 -06:00
Ben Steffensmeier
19104e6cbf Issue #1464 fix saving of spatial subsets.
Former-commit-id: e787fdcaf9 [formerly 0933461f40] [formerly bc5233748a] [formerly c8ef480815 [formerly bc5233748a [formerly 185311ebfda70bf29adb3898682f37ea55bca467]]]
Former-commit-id: c8ef480815
Former-commit-id: c53d9b72c0b2f445296e31570c1b1f5aa26bb092 [formerly 4fd3d47385]
Former-commit-id: 053b673790
2013-01-14 10:49:14 -06:00
Richard Peter
c9dd98496b Issue #1473: Fix Alarm Alert NPE
Change-Id: If9208dbed2b4b25c2dbedd4d7058b347028d9fff

Former-commit-id: f1dc664a00 [formerly 1d61d65a1e] [formerly a4f3a2a174] [formerly e71db46db9 [formerly a4f3a2a174 [formerly ed157e199cb95e5db44095b638332bb9563548d5]]]
Former-commit-id: e71db46db9
Former-commit-id: 20466293ab658f7939eaea6be47b45f720037a67 [formerly 8ea3bb4d17]
Former-commit-id: c68dcf4554
2013-01-14 09:59:28 -06:00