Commit graph

1566 commits

Author SHA1 Message Date
Ben Steffensmeier
a92edd7fec Issue #1445 fix time range for accumulations
Former-commit-id: 19bdfc527a [formerly e7db0f009c] [formerly 144ddacb07] [formerly bb557546bf [formerly 144ddacb07 [formerly 590d927da3f051ed033c41bc0c89108a25826759]]]
Former-commit-id: bb557546bf
Former-commit-id: 54218642851336cbaf62c1352cc6071441068ce0 [formerly 403381dde1]
Former-commit-id: 2a2f226b92
2012-12-19 15:14:03 -06:00
Richard Peter
38ae6f7f0a Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development
Former-commit-id: 218b69a387 [formerly 314bcffd15] [formerly c3e9f40479] [formerly 45f901c1b0 [formerly c3e9f40479 [formerly da48ac436f44dcff85723dfd5befaee9101b6978]]]
Former-commit-id: 45f901c1b0
Former-commit-id: f773ae0c7fbeaee4d49304db8a1346465706b19a [formerly 54778e7490]
Former-commit-id: a608ba1a88
2012-12-18 13:08:40 -06:00
Greg Armendariz
26c02c9291 Merge "Issue #1416: added the python package shapely" into development
Former-commit-id: cd2c2ee429 [formerly 75ed78667c] [formerly 241db36518] [formerly 2b5e44ff99 [formerly 241db36518 [formerly 85b378ef77ba7721e85327a1f0645e1a8eaa1d07]]]
Former-commit-id: 2b5e44ff99
Former-commit-id: 100ad803ba6438636a0a0e24b2db4e9a0d891b31 [formerly 770ff8c4d2]
Former-commit-id: 1beb1152e7
2012-12-18 09:27:03 -06:00
Roger Ferrel
50d3a97bcc Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc

Former-commit-id: ecec7603df [formerly 8c4e70fa9a] [formerly 0c5d10e66a] [formerly 43fd607a30 [formerly 0c5d10e66a [formerly c1567c66f77077f9411a04f349a17d368424db5f]]]
Former-commit-id: 43fd607a30
Former-commit-id: 6ca37b251db62a9996f567e8425299a3fb6ce14e [formerly 6d4946290f]
Former-commit-id: 07fbeb2928
2012-12-18 09:00:46 -06:00
Max Schenkelberg
754fe67e13 Issue #1329 Fixed issues with tile intersection calculation.
Change-Id: I753abdfefc0ed38ef838c3f7b8de6d1cd1ee264a

Former-commit-id: 978c200f04 [formerly 14f102d8ae] [formerly b4952b003a] [formerly 373de78320 [formerly b4952b003a [formerly 8b5bfd7e9010f9ffd4ce019c5fd961e1b370ff1e]]]
Former-commit-id: 373de78320
Former-commit-id: 94aad176091cd344656ab44ae8b6a7db61c25bf6 [formerly adf6aed592]
Former-commit-id: 886c39f5a4
2012-12-17 17:05:34 -06:00
Bryan Kowal
f8df1139b2 Issue #1416: added the python package shapely
- shapely and dependencies will now be built as part of the
  32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
  MSFT Windows environment


Former-commit-id: efe8f338b0 [formerly ef0b12813d] [formerly 8d1e29448a] [formerly 5e22c24657 [formerly 8d1e29448a [formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]]
Former-commit-id: 5e22c24657
Former-commit-id: 6b0159b5868c1e9370ac2d621cc75a1b66d8575f [formerly 6103e7c485]
Former-commit-id: 976834171e
2012-12-17 15:27:43 -06:00
Richard Peter
0da5730964 Merge "Issue #1262:" into development
Former-commit-id: 9c718d9364 [formerly 0268ccd3a3] [formerly dc528d3e14] [formerly c4028fe005 [formerly dc528d3e14 [formerly 6ad2bed46b41a9071f6a7ef70ae267d57e824e1d]]]
Former-commit-id: c4028fe005
Former-commit-id: 27ca9986b0e3df8daf195e11ae9649b78d31c0d4 [formerly ce427112a9]
Former-commit-id: 35ff18eb2e
2012-12-17 12:20:50 -06:00
Nate Jensen
8513c006e0 Merge "Issue #1369 fix reproject geotiffs" into development
Former-commit-id: efe60ecc54 [formerly 0a262d7716] [formerly ed075faf68] [formerly 0316240cf6 [formerly ed075faf68 [formerly 310f0e9e274ded8256d6b644ade33cea427638f0]]]
Former-commit-id: 0316240cf6
Former-commit-id: b29aba8f03d8441a6e83c62c86c1b143a17ebaa1 [formerly 65dc6cbd0e]
Former-commit-id: 937220f430
2012-12-17 12:14:07 -06:00
Matt Nash
a6b098ffcd Issue #1369 fix reproject geotiffs
Change-Id: I576fa38e88afc95914db26c9232acb9e9d3bd6ce

Former-commit-id: 4635b478d8 [formerly 159265e53e] [formerly 2ed0f446d9] [formerly 323e97d617 [formerly 2ed0f446d9 [formerly 6b06041578eb02e8955ab7d614e2574b5838181e]]]
Former-commit-id: 323e97d617
Former-commit-id: 728357c6e1781fff5e24571640555ef73b3836b1 [formerly c3d94429f7]
Former-commit-id: c4c8221582
2012-12-17 11:31:20 -06:00
Bryan Kowal
10960c5d62 Issue #1262:
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds

Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396

Former-commit-id: 8d50e95643 [formerly 7fb4e993e6] [formerly 660a9b615f] [formerly f39489c44c [formerly 660a9b615f [formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]]
Former-commit-id: f39489c44c
Former-commit-id: edcca021807dc76971231ad55a5724539778b5ee [formerly c44c4bd061]
Former-commit-id: 8579adf932
2012-12-16 21:40:26 -06:00
Richard Peter
785b6c7bfe Revert "Issue #1262:"
This reverts commit 333e7ab7d4 [formerly bad53d1b7f] [formerly 9daf66759db7f15cffd920e394ee9cbc9ce0ff8c [formerly 9490652103]] [formerly 0970259114] [formerly 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 0970259114 [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]]


Former-commit-id: 80a95c53ba [formerly 9d03a53fb5] [formerly 9a7cfa2383] [formerly f37f948456 [formerly 9a7cfa2383 [formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]]]
Former-commit-id: f37f948456
Former-commit-id: efeeaf09bb60e407eb7f16418882f2261396e41e [formerly 48641ca26f]
Former-commit-id: 2100b136a9
2012-12-16 20:37:21 -06:00
Richard Peter
2fd8ce1e29 Merge "Issue #1428: Optimize deserialize to directly lookup set method" into development
Former-commit-id: e97ab89d1d [formerly 8d28163deb] [formerly 76e643e876] [formerly b0d47ed420 [formerly 76e643e876 [formerly a5d9b113bbf644a613015fe593f4b9d4070ab167]]]
Former-commit-id: b0d47ed420
Former-commit-id: 6df0cbdfa214b59e1ee4d4dd2cd80597fae9d106 [formerly 0295be792f]
Former-commit-id: 9007b1c424
2012-12-14 17:38:41 -06:00
Richard Peter
9eb797713e Issue #1428: Optimize deserialize to directly lookup set method
Change-Id: I8efb8ea6d67a42e5e2b1f2e6587a2fcd785df914

Former-commit-id: 3c7eeaf557 [formerly db24b1c2fa] [formerly 58089a58eeb13706e2119ae244ec6035665a52cd [formerly a4d36258d0]] [formerly 061104acf1 [formerly a4d36258d0 [formerly 33ecdcf14de180606cb487e13aa940e913a8a405]]]
Former-commit-id: 061104acf1
Former-commit-id: a6312d6d714294092e5615a4f8a82680eb9deebb [formerly 279fb8d21f]
Former-commit-id: 35f6d17680
2012-12-14 17:37:50 -06:00
Richard Peter
e453a5ad8a Merge "Issue #1262:" into development
Former-commit-id: 9810561c86 [formerly e3ffce8228] [formerly d091159ef2] [formerly 70d2347dca [formerly d091159ef2 [formerly cea057d02c0eba841295a25abce31ea17022e2e9]]]
Former-commit-id: 70d2347dca
Former-commit-id: a048871174fb2fd01f7fe18d3de5aedf8903e61b [formerly cd9fa8e508]
Former-commit-id: 0f41a375b2
2012-12-14 10:07:31 -06:00
Jonathan Sanchez
1fc6cb399e Issue #1424 Removed coordinate truncate when adding vertex.
Former-commit-id: 165b798876 [formerly 8e83a6ea6d] [formerly ccc37dc454] [formerly 351148804c [formerly ccc37dc454 [formerly 5531ffd29021d7e0db627f2c59ad7ef6de71a896]]]
Former-commit-id: 351148804c
Former-commit-id: ef883515f518537c82b29725baa63e1069106693 [formerly 61f80591bb]
Former-commit-id: c4e044d7b9
2012-12-14 07:42:39 -06:00
Ron Anderson
dfd0f22255 Merge "Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item." into development
Former-commit-id: 6323e27238 [formerly e49ea6c147] [formerly 6f79ba14e6] [formerly c17e0a19c9 [formerly 6f79ba14e6 [formerly 6e0bfe56d437622b9c5f6e3d4d8d9c0192fc5a46]]]
Former-commit-id: c17e0a19c9
Former-commit-id: 7db76158e2d550187b0635ca2f55bdd04ee50b19 [formerly cb4721ae15]
Former-commit-id: bf7960b5f9
2012-12-13 15:47:04 -06:00
Ron Anderson
3ef1648013 Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1

Former-commit-id: e5c1e61664 [formerly 3e4aeeab8b] [formerly 753fa0487b] [formerly 639b5abbd9 [formerly 753fa0487b [formerly a7657cf6b42a3d7a0f5fd64468820d1547ad1e9d]]]
Former-commit-id: 639b5abbd9
Former-commit-id: 268b50c70033e4dcada30393facee318b4eee737 [formerly 995f28220a]
Former-commit-id: 8b81f0bfb4
2012-12-13 15:25:24 -06:00
Nate Jensen
fcf7aafab6 Merge "Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension" into development
Former-commit-id: 7490c6cc42 [formerly acccca74eb] [formerly 67d30566c0] [formerly 823bedcebd [formerly 67d30566c0 [formerly e7b347563598a3f4809cc74096de1f2dc0ef0788]]]
Former-commit-id: 823bedcebd
Former-commit-id: 32e25181e7f0139f8b48852cbafe883b52ef0d59 [formerly 0388c1b179]
Former-commit-id: 31d8e9a9ae
2012-12-13 14:25:56 -06:00
Lee Venable
004a3e2b60 Merge "Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit." into development
Former-commit-id: 4bf40c5ec8 [formerly fabb15ab10] [formerly d098b2e271] [formerly 3ca1080fa0 [formerly d098b2e271 [formerly c7e9e83612df941e1c6a99cac5d07a724525bbb3]]]
Former-commit-id: 3ca1080fa0
Former-commit-id: f8cccdc45dae645e9f42ab67adf2ceb8844e185b [formerly 1be8e81228]
Former-commit-id: 2c29835b63
2012-12-13 14:24:55 -06:00
Nate Jensen
e5c633642d Merge "Issue #1369 add pattern to p2-build.xml file to match the new cots product" into development
Former-commit-id: 1b65a390e9 [formerly c2bc33e51a] [formerly f0340fba98] [formerly 59f315f14b [formerly f0340fba98 [formerly 4663e9a09db1fbf0e3f72dd9893e5daa73698f90]]]
Former-commit-id: 59f315f14b
Former-commit-id: 6f589c91ef60b06f30015e490b30df8116e64654 [formerly e5ad2acde4]
Former-commit-id: ceceed5b27
2012-12-13 14:13:57 -06:00
Roger Ferrel
31c8e5a19b Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit.
Change-Id: Iaff7b8b64e2b1a94680c29087d174a27658c5873

Former-commit-id: 4ff3a1366c [formerly 9d770cf725] [formerly 65699f7a26] [formerly 77c60c8925 [formerly 65699f7a26 [formerly 8eee3bf91d4e40b55b36f699ecf7ca37bc6591aa]]]
Former-commit-id: 77c60c8925
Former-commit-id: a7cc30ec66b7398b4aabcaaab61e837fae4cb926 [formerly 258dd80db8]
Former-commit-id: d3482bd513
2012-12-13 13:50:47 -06:00
Matt Nash
a34462a41c Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension
Change-Id: I6cc0d8eb6079efc224136b67962903b75330c8e1

Former-commit-id: 124beb0449 [formerly 9d35cdf724] [formerly c992d831af] [formerly 3ff52fb9ff [formerly c992d831af [formerly 8e1660c65bbb6ad76bdc44c3327819170c3244f5]]]
Former-commit-id: 3ff52fb9ff
Former-commit-id: c78eb61c2fba2fc5c9840c27da3bf7ec82bebc91 [formerly 7d5f78c785]
Former-commit-id: 3f76c7ab62
2012-12-13 13:00:09 -06:00
Matt Nash
06964bc4ed Issue #1369 add pattern to p2-build.xml file to match the new cots product
Change-Id: I5a30c7fd6067b1c59794983c67b8186775af3849

Former-commit-id: c9f7f64c87 [formerly a661c27de7] [formerly cf0090b7d4] [formerly 87b4d4b4e6 [formerly cf0090b7d4 [formerly a862d259af867bd15d381e05e421d8d653ae4f21]]]
Former-commit-id: 87b4d4b4e6
Former-commit-id: 366d969178f0966d239a5f229d0f375488b48401 [formerly 83b9a4dfb7]
Former-commit-id: 5de49c6734
2012-12-13 12:42:40 -06:00
Bryan Kowal
333e7ab7d4 Issue #1262:
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib


Former-commit-id: 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 0970259114 [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]
Former-commit-id: 0970259114
Former-commit-id: 9daf66759db7f15cffd920e394ee9cbc9ce0ff8c [formerly 9490652103]
Former-commit-id: bad53d1b7f
2012-12-13 12:40:31 -06:00
Richard Peter
4142b13668 Merge "Issue #1415 fix or level node time matching Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a" into development
Former-commit-id: afd4a308c6 [formerly d773303870] [formerly 4b2e80da58] [formerly fffeaecbe5 [formerly 4b2e80da58 [formerly 1f04e62af4557d74f9a5378d88571a01060b9891]]]
Former-commit-id: fffeaecbe5
Former-commit-id: dab8e96293992116335e67e475857894ad606092 [formerly d0cdd8f533]
Former-commit-id: 541c2cf5e3
2012-12-13 11:57:37 -06:00
Ben Steffensmeier
65f5a3a7e0 Issue #1415 fix or level node time matching
Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a

Former-commit-id: 2a9016cf50 [formerly 80a3471237] [formerly 3ac43300fc] [formerly 9da83d3f4f [formerly 3ac43300fc [formerly 7ad0749d76328eafcd2f02137c099f7a302e0387]]]
Former-commit-id: 9da83d3f4f
Former-commit-id: e9f8a892d3dddee8f184c707fd4e36efb6840fc8 [formerly 199577ed39]
Former-commit-id: 1a3f91949c
2012-12-13 11:35:15 -06:00
Nate Jensen
483cce46c2 Merge "Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore" into development
Former-commit-id: 5f6c90ab12 [formerly c2c508d495] [formerly 8953fcf4af] [formerly 8a6844e5a3 [formerly 8953fcf4af [formerly 93c0e07b71d33560678eb3781465e20e9222642d]]]
Former-commit-id: 8a6844e5a3
Former-commit-id: 61b92d6c0296409e93f789207b40100073dd3d6f [formerly 8208937771]
Former-commit-id: a9395e64ab
2012-12-13 11:05:12 -06:00
Richard Peter
bcf2592bf1 Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7

Former-commit-id: 548b521f3f [formerly 3d4fb31161] [formerly 513dd75a23] [formerly 08919e73c3 [formerly 513dd75a23 [formerly fb25e736d298225d217a1775891a65de7e0bd50c]]]
Former-commit-id: 08919e73c3
Former-commit-id: a2ffba67b6efe6ed162228db4c9f67b3e99a3233 [formerly f7859723e5]
Former-commit-id: e2007e61e1
2012-12-13 11:02:07 -06:00
Matt Nash
df28ed4abf Issue #1369 add geosolutions project to cots feature
Change-Id: I62dd15c2f0d2ee017fcb3ad9483399b688c508f3

Former-commit-id: ce8795b271 [formerly 6949c1f105] [formerly 1d56d879fb] [formerly ab07a92d48 [formerly 1d56d879fb [formerly 01033bfd4b1b298095697267be60d978aa5c14a5]]]
Former-commit-id: ab07a92d48
Former-commit-id: 5a514d93d7982a7df8191a39807e94e778ed2652 [formerly d24fab93dd]
Former-commit-id: 210da024a4
2012-12-13 09:40:49 -06:00
Ben Steffensmeier
4bd5d7cd65 Issue #1401 add the word Grid in front of load properties because that always makes things better.
Former-commit-id: 5d61ce529e [formerly 8b3667d646] [formerly 1848f614fd] [formerly d43336bcbd [formerly 1848f614fd [formerly 345673524a287d87efbdfcb60ef838dd78c33ae3]]]
Former-commit-id: d43336bcbd
Former-commit-id: 16556a74e89ddc5834e7541482d131ff5d1ede32 [formerly ff5a5cac4c]
Former-commit-id: 8c66a66834
2012-12-12 14:33:48 -06:00
Nate Jensen
78380dc03b Merge "Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny" into development
Former-commit-id: 580d27c4fa [formerly 291bb86680] [formerly d0fe7c860f] [formerly 6debcb5ff4 [formerly d0fe7c860f [formerly 9a388df8f163c1bbde711c12dcda1a7c8f70bf06]]]
Former-commit-id: 6debcb5ff4
Former-commit-id: b80429cabfa918f11b3de9f281d78d8a535850c9 [formerly 196fdc6110]
Former-commit-id: 231ddfb978
2012-12-12 12:27:30 -06:00
Max Schenkelberg
cf9e6ff3b2 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: 24938de2d2 [formerly be99f6c7ca] [formerly 3e128b266a] [formerly 5db71ca943 [formerly 3e128b266a [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]
Former-commit-id: 5db71ca943
Former-commit-id: e215a3aeda7dede45a9e7e93feb2e2f2e9e6e34b [formerly b74d788909]
Former-commit-id: d43e0c1c25
2012-12-12 11:39:32 -06:00
Nate Jensen
9eb19cc1c2 Issue #1409 Initial implementation of hydro data access
Change-Id: I309694f9477384446658520794e19ca9493473fb

Former-commit-id: dbf9edd0fe [formerly c236b4e1ad] [formerly 817717fe0a] [formerly 85658e7e1d [formerly 817717fe0a [formerly ae7ac8a8bfc51d1c7dc3493c8fc036a87772f323]]]
Former-commit-id: 85658e7e1d
Former-commit-id: bfc98151a081a65d7cfc11a95d3cd9c422ae9b3f [formerly 3c2865bbd7]
Former-commit-id: 94b9d10c81
2012-12-12 11:20:42 -06:00
Ron Anderson
620d8f31d7 Issue #1395 Comment out change in p2-build.xml to fix build
Change-Id: I47d426383734b876d5def9ba03677ef7ff745403

Former-commit-id: 48dbe8b641 [formerly c5cd2304a9] [formerly 5327d88a6d] [formerly 06fdf91a1c [formerly 5327d88a6d [formerly 4636ad873e7de401e6384dd42857265e962aa8d9]]]
Former-commit-id: 06fdf91a1c
Former-commit-id: f46b472b52d9fa302dd37019f37fcd05c9d31c60 [formerly 17b983ba02]
Former-commit-id: f4624af03c
2012-12-12 09:09:28 -06:00
Ben Steffensmeier
0e733903aa Issue #1356 add javadoc to subgrid changes.
Former-commit-id: 24e1b8fed9 [formerly c44dad8a5c] [formerly 6da5ac2873] [formerly 7e6d6fa794 [formerly 6da5ac2873 [formerly 618c8a0accbfde0e95d47b76659f3804b32a7652]]]
Former-commit-id: 7e6d6fa794
Former-commit-id: ddd3f1b8e6c6839c8b7da5dd2c5162c696cc8a43 [formerly 47cb87096a]
Former-commit-id: 5d87636fb2
2012-12-11 17:40:28 -06:00
Richard Peter
5f4f867295 Merge "Issue #1356 create subgrid for grib files with extra columns" into development
Former-commit-id: b6674338ed [formerly 559876930b] [formerly 9f9c32fc4e] [formerly 4082968b07 [formerly 9f9c32fc4e [formerly d489dcb15e98ae3b07665df4fc2edd2bb852c7db]]]
Former-commit-id: 4082968b07
Former-commit-id: 8f43d6e6261035b5da10173c59a560c1e52e1eba [formerly ada54d8e92]
Former-commit-id: f7de6135ca
2012-12-11 17:05:27 -06:00
Richard Peter
0c7ccaebd3 Merge "Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea" into development
Former-commit-id: 5509a226b1 [formerly 6bc665ca3a] [formerly 63465edb95] [formerly 2a5171c2f3 [formerly 63465edb95 [formerly 5117b93ee59b6c291d16e084d7a0be0e492b120f]]]
Former-commit-id: 2a5171c2f3
Former-commit-id: c6aa2d733aa7e5ec3e439c933751c6d5e031900b [formerly 1100c4fa8b]
Former-commit-id: 6613cbf5ee
2012-12-11 16:38:53 -06:00
Ben Steffensmeier
a1c18c6ba5 Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes
Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea

Former-commit-id: 97618c7f7a [formerly b32d039c92] [formerly 8070e798b0e9e318cb545d96e106a0057c7b38b6 [formerly b77f1592a7]] [formerly 11d3ee3014 [formerly b77f1592a7 [formerly a6c7730ba1c0b07fdf21bef19717859fc7238724]]]
Former-commit-id: 11d3ee3014
Former-commit-id: 98abd4aba1a2dca8062b2e5a3c935a37fec9ccdc [formerly 9277840fad]
Former-commit-id: a693a33f97
2012-12-11 16:12:53 -06:00
Ron Anderson
c68f7097ea Merge "Issue #1395 Modifed AwipsCalender and added additional date/time related widgets" into development
Former-commit-id: 871672fb21 [formerly 4ba089395c] [formerly d05dc0c6ca] [formerly 277c9cb0ec [formerly d05dc0c6ca [formerly c6c26811ad96f862ae3ffb0e6d9056f0d9edecfb]]]
Former-commit-id: 277c9cb0ec
Former-commit-id: c97adef4e79f5fd88656a760f044b526fb9aa42f [formerly 087af45be8]
Former-commit-id: 14849786eb
2012-12-11 16:09:24 -06:00
Ben Steffensmeier
adc94e56a1 Issue #1356 create subgrid for grib files with extra columns
Former-commit-id: 2b2fdedb39 [formerly dd560f4d15] [formerly c3e1005dc8] [formerly a7a13d27cd [formerly c3e1005dc8 [formerly c9c82e37fa21a01a7357c2e065aea435b325587f]]]
Former-commit-id: a7a13d27cd
Former-commit-id: ee71010c76827c148c8eb57b86279b09db2c3bab [formerly 64922c17c5]
Former-commit-id: ddcb3e675d
2012-12-11 16:00:03 -06:00
Roger Ferrel
5cd4fc444b Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4

Former-commit-id: 4dfc153172 [formerly 6929a73900] [formerly b677a5ba3d] [formerly aefa650cda [formerly b677a5ba3d [formerly b406c990607a06678a58e36118edcddaab073b26]]]
Former-commit-id: aefa650cda
Former-commit-id: c67e79c92750b1d329293564dce947f07a6fc957 [formerly f64a99d554]
Former-commit-id: 662d51cda1
2012-12-11 15:43:54 -06:00
Ron Anderson
cd8f3771d8 Issue #1395 Modifed AwipsCalender and added additional date/time related widgets
Change-Id: I123a63ff4a42d36b2a35229dff719eda49097f7b

Former-commit-id: f7cbb2f02e [formerly cc883294f1] [formerly bc5f445ecf] [formerly 43881be47a [formerly bc5f445ecf [formerly 475861fe615a070f1a3cad18dd798ba6db6b66e8]]]
Former-commit-id: 43881be47a
Former-commit-id: 4cf2d90e058f019ff51a78b9bc82342a2dd98b36 [formerly 641d268bd8]
Former-commit-id: 01081fe723
2012-12-11 13:31:05 -06:00
Nate Jensen
fe3f2f7c0d Merge "Issue #1362 create a new resource handler when nsharp is created in a side pane." into development
Former-commit-id: de5960d0fb [formerly c34ff0c0b8] [formerly decb23f4ae] [formerly 773ff8c027 [formerly decb23f4ae [formerly 273aed63277891eb091817c5769fe53ef3813759]]]
Former-commit-id: 773ff8c027
Former-commit-id: c2edeadb95aaf18b91f1716790c340e31a0760a3 [formerly 5b1ca237b2]
Former-commit-id: a3fb320e10
2012-12-11 12:42:51 -06:00
Dustin Johnson
c4ca04a7a4 Issue #1407 EventBus changes to support sending notifications for subscription verification
Change-Id: I8f979e44520e32fa908aa700bb0c93596a2dd820

Former-commit-id: 6fd82e22bc [formerly 79fa61bb8a] [formerly 8b942c31dd] [formerly 3d900240b7 [formerly 8b942c31dd [formerly 12b51905d9b710ebc6fa54346d82cad9178b0bba]]]
Former-commit-id: 3d900240b7
Former-commit-id: 6dd3cea132861002e64a2cbc9a5e982ea702839e [formerly e72d5dc09d]
Former-commit-id: 4de56a0141
2012-12-11 09:37:20 -06:00
Steve Harris
88f9070c93 Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]
Former-commit-id: ce72ebb094
Former-commit-id: 638be45c65cc1e7b65d1b4e332046932a30ff790 [formerly 113fdcb679]
Former-commit-id: 15849ae72a
2012-12-11 08:56:54 -06:00
Steve Harris
377804398b Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]
Former-commit-id: f02c1ef71d
2012-12-11 08:45:53 -06:00
Ben Steffensmeier
0f710623ff Issue #1362 create a new resource handler when nsharp is created in a side pane.
Former-commit-id: 2e1d72fd12 [formerly 50ff73809f] [formerly 52497f5630] [formerly 0eb454f0d4 [formerly 52497f5630 [formerly 62cb0df39d0c24edc80d635f3bf90d2abc564b04]]]
Former-commit-id: 0eb454f0d4
Former-commit-id: 0389e78f6ec248b75fa1097fd1938b3fb3461458 [formerly 84fa621b55]
Former-commit-id: d2f5643093
2012-12-10 17:58:04 -06:00
Brad Gonzales
34edaff61f Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties.
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d

Former-commit-id: 88a5c6b8ae [formerly 4e44770674] [formerly bcff2c134c] [formerly 6ab74bb6ab [formerly bcff2c134c [formerly 5aa303242b0ca1abf08685b6197ddd17d465250c]]]
Former-commit-id: 6ab74bb6ab
Former-commit-id: 409accd565b4196070d7d63669a4ed0a10b032a9 [formerly 065ddf4d4a]
Former-commit-id: 15b3a61287
2012-12-10 14:08:54 -06:00
Richard Peter
da111b23dd Merge "Issue #1367: Fix static topo route uri" into development
Former-commit-id: 77a62e6c06 [formerly 3781119c4f] [formerly 9a5fc20edb] [formerly a33301394c [formerly 9a5fc20edb [formerly 0bfbe098d5ae0bc93f536fd09e6fa5e63c6dd10d]]]
Former-commit-id: a33301394c
Former-commit-id: c03c2b6d463e524a977576642d10e8fe80133ef5 [formerly 932f49fd2c]
Former-commit-id: f78c720d68
2012-12-10 12:59:36 -06:00
Lee Venable
332d017f66 Merge "Issue #1353 Changes for non-blocking DamDisplayControlDlg." into development
Former-commit-id: 6135ac6c9f [formerly 3afa901791] [formerly ef814e2d0b] [formerly 1175e34b0d [formerly ef814e2d0b [formerly ce03df033eac42f2d035a7483349ba9db315a2e4]]]
Former-commit-id: 1175e34b0d
Former-commit-id: d198acfba4afc73c759429d29016761cb79ab0fa [formerly f122f274ac]
Former-commit-id: 8b25017106
2012-12-10 12:55:16 -06:00