Commit graph

1929 commits

Author SHA1 Message Date
Richard Peter
eaec7653c2 Merge "Issue #1355 fix bilinear interpolation for grid cells between -1 and 0" into development
Former-commit-id: b49b580840 [formerly 8a28f8e4fc] [formerly 14dcf86cab] [formerly b49b580840 [formerly 8a28f8e4fc] [formerly 14dcf86cab] [formerly 684a1ddfd7 [formerly 14dcf86cab [formerly 8b5edb90f02c7beb3048dfbeb51c6fcb3209295e]]]]
Former-commit-id: 684a1ddfd7
Former-commit-id: afe977e91e [formerly e8e5835045] [formerly f48c002040209c39771a712f273f22efb1595f49 [formerly 32ab58f7b3]]
Former-commit-id: 8aff96fa73cf715d9ec108cc8cb88c2cedda4f37 [formerly 7a886dbb27]
Former-commit-id: bf3850c7a9
2012-11-27 16:18:22 -06:00
Mike Duff
e5fdc25004 Issue #728 - Updates to stats graphs
Former-commit-id: e65f4744e2 [formerly 31aeeab7a1] [formerly 4317b70d87] [formerly e65f4744e2 [formerly 31aeeab7a1] [formerly 4317b70d87] [formerly 6d6ee01f45 [formerly 4317b70d87 [formerly 2b132ce2e29f90cef28d31c4f5b68abc35ac368f]]]]
Former-commit-id: 6d6ee01f45
Former-commit-id: 02482e5954 [formerly 021d153312] [formerly 919bbc1c18d494e277f5bb0d69e76e333db32f56 [formerly 919ed16028]]
Former-commit-id: 23c2f0699de3067ef0dca499965bde135f7e13ae [formerly 10ec60a8b2]
Former-commit-id: dfc4895f1e
2012-11-27 16:15:34 -06:00
Ben Steffensmeier
56217738ee Issue #1355 fix bilinear interpolation for grid cells between -1 and 0
Former-commit-id: b647a5e940 [formerly 52c4a1b36e] [formerly 97ebdae978] [formerly b647a5e940 [formerly 52c4a1b36e] [formerly 97ebdae978] [formerly bb2094a69d [formerly 97ebdae978 [formerly 6ea390529a24a0a74be227b6d1cd6bdf0de7a27b]]]]
Former-commit-id: bb2094a69d
Former-commit-id: 6f408a6932 [formerly c2877a3b60] [formerly 79a288870e7d042cfffcd2125239fdb5020d9156 [formerly 04d67c8932]]
Former-commit-id: 83d1313f786be94d494f0a576fdac6c4c22bc8d3 [formerly 70b2a2b947]
Former-commit-id: 25cf2e55b7
2012-11-27 15:15:57 -06:00
Bryan Kowal
aa311c56f2 Issue #1292 - delta scripts
Change-Id: Iec5eb9746e0531349b6bdbe70577125a7a6254d5

Former-commit-id: cd67a692d1 [formerly 3bfb3b93b3] [formerly 623812116b] [formerly cd67a692d1 [formerly 3bfb3b93b3] [formerly 623812116b] [formerly 11c98b66a2 [formerly 623812116b [formerly 0f1643912c5713f556a931725a6ad4b75620a4df]]]]
Former-commit-id: 11c98b66a2
Former-commit-id: d1aeee2503 [formerly cb142a0650] [formerly 72cb53368a006fdb6a817ac772d65aca6fddab9c [formerly 2bcc0bbd60]]
Former-commit-id: 76cec0b571ba0b39c6b35117abf680cf8d0451ef [formerly c49ac64444]
Former-commit-id: 0afc122e00
2012-11-27 14:05:24 -06:00
Richard Peter
8aaed2f15e Merge "Issue #1350: Fix ingestGrib and ingestDat posting of stats" into development
Former-commit-id: 5feb8b92a2 [formerly 5a5b7274ba] [formerly fb3a4b154b] [formerly 5feb8b92a2 [formerly 5a5b7274ba] [formerly fb3a4b154b] [formerly 0dc908bc45 [formerly fb3a4b154b [formerly 46c26b2b58b0bf9d59e0005d537f82ccf3f0acbd]]]]
Former-commit-id: 0dc908bc45
Former-commit-id: 489f95d5eb [formerly 45a173ddc9] [formerly 2fe51fd2fa7c551a1aa0591761be7709eca029ac [formerly 442c2778fa]]
Former-commit-id: 88c9068389a919e23feed1de85dec0000fcb55f2 [formerly 66f8cfe826]
Former-commit-id: c1ed2217e0
2012-11-27 11:20:59 -06:00
Richard Peter
79281c81dd Issue #1350: Fix ingestGrib and ingestDat posting of stats
Change-Id: I74154680ff6b4e8f5b5e4b2b3440e2b99a16b6df

Former-commit-id: fe234bb17e [formerly cffbf1da06] [formerly 98297abdd0] [formerly fe234bb17e [formerly cffbf1da06] [formerly 98297abdd0] [formerly 6c81be8499 [formerly 98297abdd0 [formerly e9afcf3d12599fc3bace2b140deb0d85ee303c6c]]]]
Former-commit-id: 6c81be8499
Former-commit-id: 4c72a415d1 [formerly 7e93b3d90d] [formerly 72554dd29be56930ad4d3a2dcebbad8521fcd38e [formerly 251cc3764d]]
Former-commit-id: db9caae32f793edbc719c31495d72d9c4c0bc5f4 [formerly e139125e89]
Former-commit-id: 38829d92c3
2012-11-27 10:59:46 -06:00
Roger Ferrel
cfe190d1a7 Issue #1298 Plugin changes to get localization import of files to work for test procedures.
Change-Id: I91e5e5abc76789f0b65ebc2dc7c793f7afa32d7d

Former-commit-id: 3e7d2cc03c [formerly ac09c59d38] [formerly 2a1024ff50] [formerly 3e7d2cc03c [formerly ac09c59d38] [formerly 2a1024ff50] [formerly 230e24addc [formerly 2a1024ff50 [formerly 67b55ee03d17a878375be75bc36bcb5500ca98fd]]]]
Former-commit-id: 230e24addc
Former-commit-id: 588a4f7da3 [formerly 0011eb0ff4] [formerly b6c45933b44d7827fbc20bcfd0aa6e32b0594cee [formerly ea3b2aebc6]]
Former-commit-id: a51946ac8b8444c59ae1a309dcaf09482cfb124a [formerly 2cc1b72f9e]
Former-commit-id: bb21c0b2f7
2012-11-27 10:37:06 -06:00
Richard Peter
ee758a8bb5 Issue #1350: Fix cave feature dependencies
Change-Id: Ia96e46656ae21388cce0196a5fad7f7badeb36da

Former-commit-id: 7973f0f807 [formerly 25c47696b9] [formerly 8a149f1671] [formerly 7973f0f807 [formerly 25c47696b9] [formerly 8a149f1671] [formerly 955025940c [formerly 8a149f1671 [formerly 19dc217fe08245411df16efd34bab8980ec7dcb5]]]]
Former-commit-id: 955025940c
Former-commit-id: 2cca486a1c [formerly 3efd48eded] [formerly 061ea3878396318582f24170f1d4e997edb664cf [formerly 4cc389183e]]
Former-commit-id: da34b8ce36c28349f1ff0b8238b6f3a195d626a1 [formerly ffb053edb2]
Former-commit-id: 8c6ea90652
2012-11-27 09:18:01 -06:00
Nate Jensen
7088298f2a Issue #1323 fix build issue
Change-Id: I5918a05535bc7e928214075784f615cf454d2972

Former-commit-id: f2ff0e89ca [formerly cbb77b884b] [formerly d76ab40583] [formerly f2ff0e89ca [formerly cbb77b884b] [formerly d76ab40583] [formerly f24fcc07cf [formerly d76ab40583 [formerly db083d70f18b771740f73ecb787c103b5264881d]]]]
Former-commit-id: f24fcc07cf
Former-commit-id: c5a27b653a [formerly 8a4544a632] [formerly 77af90edc781818f265653aebd82cbfac24f0a3f [formerly 10be056dcb]]
Former-commit-id: 280d92a4aa3d7b711b4e708b2a25452d4db9ed35 [formerly 2385f6223a]
Former-commit-id: 2621f23dfa
2012-11-27 09:07:07 -06:00
Richard Peter
fef192dabb Merge "Issue #1350: Track ingestGrib and ingestDat statistics" into development
Former-commit-id: 43991f57fd [formerly 5c398cb93f] [formerly 53426e2e90] [formerly 43991f57fd [formerly 5c398cb93f] [formerly 53426e2e90] [formerly 9a90b123e7 [formerly 53426e2e90 [formerly 08b5d690e71afd7424fc00e0d4c06b497447d93a]]]]
Former-commit-id: 9a90b123e7
Former-commit-id: 8fda9e8567 [formerly 88602c16f4] [formerly 6f95475db39ab5699bac720819dccad18b1a1b0a [formerly a7d31535da]]
Former-commit-id: 5120c232f07c6def09ce7c9f26b234c8cb9464bc [formerly 3e12efe275]
Former-commit-id: a67465cf41
2012-11-26 18:15:21 -06:00
Richard Peter
92e2681de8 Issue #1350: Track ingestGrib and ingestDat statistics
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132

Former-commit-id: 797b0bb4e8 [formerly 0db7ec08a2] [formerly 8d40a8fea9] [formerly 797b0bb4e8 [formerly 0db7ec08a2] [formerly 8d40a8fea9] [formerly 4d5f2fd360 [formerly 8d40a8fea9 [formerly 3bbb6602d8ee99792b4a65e040091d1a1923d0b1]]]]
Former-commit-id: 4d5f2fd360
Former-commit-id: 998a26d5d8 [formerly d1d28437ad] [formerly c48e3deb2d581da3a86dbbdebf380436a997b65b [formerly b891bb63e1]]
Former-commit-id: f75def3790ba91588bed560a0f9d6d7813d262b0 [formerly 17189b1862]
Former-commit-id: 688cc569f5
2012-11-26 18:13:13 -06:00
Mike Duff
033f1324a3 Issue #728 - Make graph scale to visible data when adding or removing data from graph
Change-Id: I44150e19b52436b7103226f6ce539b0e9536d072

Former-commit-id: d762588b18 [formerly 94a1921f8b] [formerly fb04389920] [formerly d762588b18 [formerly 94a1921f8b] [formerly fb04389920] [formerly 0675868464 [formerly fb04389920 [formerly dd45abb6461510408a92e66e68a25222d45e9ecf]]]]
Former-commit-id: 0675868464
Former-commit-id: 1e8de3d4fb [formerly e6647d5e9a] [formerly 24454286c33ac404ef0216f03926837490475327 [formerly dc8a5420d4]]
Former-commit-id: 72a97d698c8d13095ac3c4fd5cb514b438d78d85 [formerly f98e4fa57e]
Former-commit-id: d6b3380e9a
2012-11-26 18:07:10 -06:00
Richard Peter
58c6f1dadf Merge "Issue #728 - Implementation of Statistics graphs peer review comments Changing to use average value rather than sum." into development
Former-commit-id: 10d6dd3ced [formerly e48eef4e8c] [formerly 56627c6391] [formerly 10d6dd3ced [formerly e48eef4e8c] [formerly 56627c6391] [formerly 3124712dd5 [formerly 56627c6391 [formerly d4c42ddc3e1f15ec7f415fe1abca1da05ac76ae7]]]]
Former-commit-id: 3124712dd5
Former-commit-id: 7d44571c17 [formerly a810e06c03] [formerly 2d343123b385c98c61644b56ebed5951795252ae [formerly 5eb311271a]]
Former-commit-id: f92ee66aec1731bd06d99725bc32f7c71d3039c1 [formerly 786d9183ef]
Former-commit-id: 55e043169e
2012-11-26 17:36:43 -06:00
Mike Duff
a2de34c30b Issue #728 - Implementation of Statistics graphs
peer review comments
Changing to use average value rather than sum.

Change-Id: I7f97e27c4f463fe60bec2cbc52f3eac66d8fa77f

Former-commit-id: 99b713bf3c [formerly 4e15f63b4e] [formerly c49759d28e] [formerly 99b713bf3c [formerly 4e15f63b4e] [formerly c49759d28e] [formerly f000c1a9cf [formerly c49759d28e [formerly f15ba1ee009abf4a562bb37450d65f97c7ffa217]]]]
Former-commit-id: f000c1a9cf
Former-commit-id: f4d7bbb7e0 [formerly 830a3918d9] [formerly 8b4920d99f0a66cdd159cd7f478ebeb93e904a03 [formerly 56cd5da64d]]
Former-commit-id: c0d7382ab1ab37a47f9cbbbf8d4e718baae984ba [formerly 514c93b9b8]
Former-commit-id: 4ec36b8ce4
2012-11-26 17:31:29 -06:00
Roger Ferrel
e76630a226 Issue #1298 Changes for WeatherPlogDialog found in testing of 1229 (part 2).
Change-Id: I86d06e37a791a8d73937d487a8f1c22cc23199b3

Former-commit-id: ffd2843b9f [formerly 4b1c9a1d2c] [formerly 1bc40b2daf] [formerly ffd2843b9f [formerly 4b1c9a1d2c] [formerly 1bc40b2daf] [formerly 520fa44d23 [formerly 1bc40b2daf [formerly 98d0d27124baa44bcbbdf6e9276aa1966e420207]]]]
Former-commit-id: 520fa44d23
Former-commit-id: bd4783bd32 [formerly 49c3225d11] [formerly 83b150b3a3bb8b9d52d1e403ea0ab4b785c18023 [formerly 05da65c512]]
Former-commit-id: d609cd3baba49bec29c5506205309fbc4cddd790 [formerly 4a01a00a5d]
Former-commit-id: 2200b9b31e
2012-11-26 15:15:38 -06:00
Nate Jensen
4a96302505 Merge "Issue #1323 Improving framework based on first factory implementation" into development
Former-commit-id: bcaaf67e72 [formerly 72b4ab6ae7] [formerly 912eec5fab] [formerly bcaaf67e72 [formerly 72b4ab6ae7] [formerly 912eec5fab] [formerly c665e9c43c [formerly 912eec5fab [formerly 4d8d7ba7dc2acc827171856657ceea3c8bf13d2f]]]]
Former-commit-id: c665e9c43c
Former-commit-id: ac53810a1b [formerly 47768a36a2] [formerly ca6bcbb6c6414047c8f5a027226d2c9c605b4016 [formerly 4c041aa2b0]]
Former-commit-id: c6b24680e37d0453820b6a1a346243c030fda087 [formerly 6b9b85de24]
Former-commit-id: 43444e6839
2012-11-26 14:27:06 -06:00
Roger Ferrel
bdb3272ce3 Issue #1298 Testing for 1229 discovered existing bug in WeatherPlotDialog where dispose listener was being added in a non UI thread.
Change-Id: I2bced344aa83035fc62e36a377e8182bf3aebf7c

Former-commit-id: f945dbc58b [formerly c34b777804] [formerly 0b87e0fdfd] [formerly f945dbc58b [formerly c34b777804] [formerly 0b87e0fdfd] [formerly 5e7227d1b0 [formerly 0b87e0fdfd [formerly bdf2bf3c1e3b907fb16acf82dda230f97a3cc517]]]]
Former-commit-id: 5e7227d1b0
Former-commit-id: 5565905cc5 [formerly 77db62f285] [formerly f99f3c45f055174c0aee2334f3a3302c8983894c [formerly 8319d7245d]]
Former-commit-id: 1d5bb12bf712b130d6d2152b746b8ab52acf86ac [formerly 8c64034eb1]
Former-commit-id: b1cbcb5716
2012-11-26 14:06:03 -06:00
Nate Jensen
f2910df16c Issue #1323 Improving framework based on first factory implementation
Change-Id: I817cb7fbab8ae517cf134e1fd53c9b5c3eee5ab1

Former-commit-id: 325f069694 [formerly 7d4aac94c5] [formerly b3602e6bf8] [formerly 325f069694 [formerly 7d4aac94c5] [formerly b3602e6bf8] [formerly 9bbba94c53 [formerly b3602e6bf8 [formerly f95518ac0b8bb862dc69af9f07d72f286cbea085]]]]
Former-commit-id: 9bbba94c53
Former-commit-id: 67b366ff7a [formerly e8a1a72f31] [formerly 2f29f4bfcbe47a489d2f27d0efb600be618ef62b [formerly a1a21d5af4]]
Former-commit-id: ce19d1c7094977b4dcca3e4026ca67be18ccd99b [formerly 2a3140bf72]
Former-commit-id: 4d018e06aa
2012-11-26 13:24:37 -06:00
Bryan Kowal
2d38f83db6 Issue #1318 - re-order dependencies; the core feature is now dependent on the event feature
Change-Id: I6639323fc3d3afaef85b35ab6693986d9e4243b0

Former-commit-id: e0ca63881a [formerly 95efa5f0e0] [formerly 06241d95e0] [formerly e0ca63881a [formerly 95efa5f0e0] [formerly 06241d95e0] [formerly f645f60a75 [formerly 06241d95e0 [formerly 31df15583f3b0182736728654b6131fd7d6bc9a8]]]]
Former-commit-id: f645f60a75
Former-commit-id: d0a39600a7 [formerly 87e0c08179] [formerly 3f8d5a84c32d9b2062047b003a880195b829a06a [formerly f68c9873b7]]
Former-commit-id: 736c111959c9046324b29f0d02ef46d6753adac7 [formerly 55ac52ff6e]
Former-commit-id: da6b3656bd
2012-11-26 13:06:33 -06:00
Richard Peter
5262d0a9fa Merge "Issue #1316 pass original constraints through when doing time queries in derived parameters." into development
Former-commit-id: 63a2de9a5d [formerly c8d397e2be] [formerly a605638948] [formerly 63a2de9a5d [formerly c8d397e2be] [formerly a605638948] [formerly 847abb1ce0 [formerly a605638948 [formerly db7957b642327ee7a3e592467d75cb776e7fb522]]]]
Former-commit-id: 847abb1ce0
Former-commit-id: f152c10e63 [formerly 3782d441e8] [formerly 5d2a3724cf3f41e78725386a6f756959bc41f52c [formerly 11babce68c]]
Former-commit-id: 68d58d5327a9d5641cdfd888f8973e8fd5c80627 [formerly d4e7b02f05]
Former-commit-id: 0506b05950
2012-11-21 15:49:11 -06:00
Richard Peter
3d92a176c6 Issue #1332: Update pypies to create/use condensed group structure
Change-Id: I2e7311b063df1a217a2fe37c0e470272e4e85e92

Former-commit-id: 756a5311a3 [formerly 768ed3b2ed] [formerly c72c0b9f98] [formerly 756a5311a3 [formerly 768ed3b2ed] [formerly c72c0b9f98] [formerly dbe4290f45 [formerly c72c0b9f98 [formerly 90f3cac62473c66dcdef73a6a605becf08868316]]]]
Former-commit-id: dbe4290f45
Former-commit-id: 78088888b6 [formerly 9e51ff1b8a] [formerly f6a83e648173e5af75f219096c477aeab116e566 [formerly 2b3f0a2938]]
Former-commit-id: 7f3757e8dc095f9ffdc6417bfe1e82fcbd2a49f1 [formerly a0827f476e]
Former-commit-id: 9fbabfde61
2012-11-21 15:27:31 -06:00
Ben Steffensmeier
ab014b8e50 Issue #1316 pass original constraints through when doing time queries in derived parameters.
Former-commit-id: a1d2334cc2 [formerly a1fc232a19] [formerly 7061c6db78] [formerly a1d2334cc2 [formerly a1fc232a19] [formerly 7061c6db78] [formerly f6a502fb78 [formerly 7061c6db78 [formerly 5f67639bdd24711dc6f77b41163f49bf8626b7d3]]]]
Former-commit-id: f6a502fb78
Former-commit-id: 5e691cd77e [formerly 27b77f735d] [formerly d52026c91b0f3d62567a0c61038fb292b4782a74 [formerly 59a00a75f9]]
Former-commit-id: e1c30436b2786ca9df79538b772b6a010ac347ff [formerly d08d71d471]
Former-commit-id: ce495bd549
2012-11-21 14:21:01 -06:00
Richard Peter
070ea47301 Merge "Issue #1343: Fix Derived Parameter clean up of global map performance" into development
Former-commit-id: 07bf1fbe9c [formerly 1f4591a861] [formerly a8b691b11e] [formerly 07bf1fbe9c [formerly 1f4591a861] [formerly a8b691b11e] [formerly d276bf25df [formerly a8b691b11e [formerly 7ca68476dd30a056223d4b1b8788640cae245ca9]]]]
Former-commit-id: d276bf25df
Former-commit-id: 3cad444527 [formerly e709143e10] [formerly b8f4c754902c093432f5dc29e291d8e0f95c1e0c [formerly a482cd3f17]]
Former-commit-id: 112f9fd3e6f4a5b2b71b83af4115d802dc4006ab [formerly 55c6fa7bb7]
Former-commit-id: 64efa971f6
2012-11-20 16:58:13 -06:00
Richard Peter
2c135c4501 Issue #1343: Fix Derived Parameter clean up of global map performance
Change-Id: Id5a37b16ffe311891a39acd21dab792d6c62fb29

Former-commit-id: 374bd6faa9 [formerly 3fb4137264] [formerly a4ca44195e] [formerly 374bd6faa9 [formerly 3fb4137264] [formerly a4ca44195e] [formerly 94ff0868d8 [formerly a4ca44195e [formerly eeed667765a9da192ba4d28923fa447d8ea81437]]]]
Former-commit-id: 94ff0868d8
Former-commit-id: 746ecaa62d [formerly 1ee2e40970] [formerly dd7c634d6b85818a4854cd4c99615e90363cf4a9 [formerly 57b23523dc]]
Former-commit-id: 0b1aa4e7a6922b5a95c6a5c2308729bd8995658d [formerly c3e4b81c7c]
Former-commit-id: 42850516da
2012-11-20 16:42:27 -06:00
Dustin Johnson
91082e4360 Issue #1322 Add IDisplay
Change-Id: I0f20b5e2e4544c2a984c317a812855f92e935b92

Former-commit-id: bf8a8c3149 [formerly 973ffa6f71] [formerly 4425d25c71] [formerly bf8a8c3149 [formerly 973ffa6f71] [formerly 4425d25c71] [formerly d68c1f84f2 [formerly 4425d25c71 [formerly 039c475445ca8f049c46547dba63d413f3019817]]]]
Former-commit-id: d68c1f84f2
Former-commit-id: 3ad9e1cbc2 [formerly bd77ea1c11] [formerly e518e2329e6b688915efb09f32fb92d4054cdaf8 [formerly fe187f62f7]]
Former-commit-id: 0272b650a74150e45e1b8db0294bf8852d1a536b [formerly 5ca7396d38]
Former-commit-id: 5e480196a4
2012-11-20 15:22:52 -06:00
Richard Peter
e0668a8fc4 Merge "Issue #189 grid retrieval api. Change-Id: Ice9432ab703420c8d441860de085a8d34a2610c8" into development
Former-commit-id: 8dfd659e03 [formerly 92ff920171] [formerly 0b4f2bd666] [formerly 8dfd659e03 [formerly 92ff920171] [formerly 0b4f2bd666] [formerly 1cd1f8b793 [formerly 0b4f2bd666 [formerly dbaf10dc2036589e21245a7166182ee01e401717]]]]
Former-commit-id: 1cd1f8b793
Former-commit-id: 3e871e74dd [formerly 78cad6b0e1] [formerly 43275093f444c4ecc0da9cd2da47618f814895a4 [formerly 24e21a3e48]]
Former-commit-id: a265deee3d05689256f2101e0fb9e48c5b35a19c [formerly a0327c25fb]
Former-commit-id: a34caf2edf
2012-11-20 11:37:58 -06:00
Ben Steffensmeier
0d0dbca0f9 Issue #189 grid retrieval api.
Change-Id: Ice9432ab703420c8d441860de085a8d34a2610c8

Former-commit-id: b3878e04af [formerly 93ac9ccaf2] [formerly 9bccb6ac7c] [formerly b3878e04af [formerly 93ac9ccaf2] [formerly 9bccb6ac7c] [formerly 56d375da86 [formerly 9bccb6ac7c [formerly e0b91523c54227ef15588f5dd672b2450a9dd8ac]]]]
Former-commit-id: 56d375da86
Former-commit-id: 4f766aac3c [formerly 98cab0f2b3] [formerly 5edc626f4059eb2c64cfcd6e951b3e673af7c85e [formerly dd1a3154e5]]
Former-commit-id: 6a76b0684a02c7e6769314415ae1ab5b0847be88 [formerly 6f844cc7e2]
Former-commit-id: 775ab284c8
2012-11-20 11:32:29 -06:00
Richard Peter
098e205c9e Merge "Issue #1340 Updates to statistics for common baseline, data delivery stats gathering" into development
Former-commit-id: 9efc70bc0c [formerly 4916961d3e] [formerly 5a2ba01a49] [formerly 9efc70bc0c [formerly 4916961d3e] [formerly 5a2ba01a49] [formerly b48635490a [formerly 5a2ba01a49 [formerly 6176f3ef90779a5b99c99b1cfd8f0ffc60a6f316]]]]
Former-commit-id: b48635490a
Former-commit-id: 02a45a5f93 [formerly cb99915ea1] [formerly 0ff709d8e6f762cc5f0efeaf25d94046cd0e4d1e [formerly ffd6fd3e5e]]
Former-commit-id: 6f364f7d42cc811c64ed40844a2f90d15b84d0a1 [formerly e1bd326ef0]
Former-commit-id: 392b68ea83
2012-11-20 10:25:57 -06:00
Dave Hladky
1c7c4914c8 Issue #1340 Updates to statistics for common baseline, data delivery stats gathering
Change-Id: I0b59f1db8579900c7eb50939d60acfeef2db44b8

Former-commit-id: 95dd9d5c2d [formerly a2a27224c4] [formerly 44a7fffe3e] [formerly 95dd9d5c2d [formerly a2a27224c4] [formerly 44a7fffe3e] [formerly a2106c7cbf [formerly 44a7fffe3e [formerly 4571b0066a103973184a8d5732d4a945e95d9638]]]]
Former-commit-id: a2106c7cbf
Former-commit-id: d63c292a1f [formerly 1e16e81c9e] [formerly 09ea86c5ffd6a51f6a691da3722c93a3476d67af [formerly 9722f92d5e]]
Former-commit-id: 1444f6a3db1cba318dfb4c1ded3d429875e8a420 [formerly 6e6b5d72b4]
Former-commit-id: 2912941ad7
2012-11-20 10:22:50 -06:00
Richard Peter
9e0fc31af1 Merge "Issue #189 clean up unneeded references to grib." into development
Former-commit-id: 95efb81458 [formerly 42ce93afa8] [formerly b68a8d986f] [formerly 95efb81458 [formerly 42ce93afa8] [formerly b68a8d986f] [formerly 48e33e05e7 [formerly b68a8d986f [formerly 6cb68df37fd22b45abcaee309f9f364456905191]]]]
Former-commit-id: 48e33e05e7
Former-commit-id: b20e227cb1 [formerly d695c10d87] [formerly 604033f062de5fafc2e57bbf1ac475d77ee2c9f5 [formerly 36ce487edc]]
Former-commit-id: 39faf3a4ffbaf7528e8140375a48d71a84e88550 [formerly dfa27ccab6]
Former-commit-id: a63f796be5
2012-11-19 17:16:08 -06:00
Richard Peter
958ece7446 Merge "Issue #189 add some more catch blocks to contour subgridding so it works in more odd cases." into development
Former-commit-id: 5eca62acc6 [formerly cee57ad2c1] [formerly 8bb1e1675d] [formerly 5eca62acc6 [formerly cee57ad2c1] [formerly 8bb1e1675d] [formerly 625141ffb3 [formerly 8bb1e1675d [formerly 6570ee57790d482a212ee65dc2ed9482ba8de8b6]]]]
Former-commit-id: 625141ffb3
Former-commit-id: 2f00bb819e [formerly c063e130f1] [formerly 2947d8b18b27bef886d297c5bbf0b21d654d4de8 [formerly 379b303985]]
Former-commit-id: 629a2df5e5fda1551cca4f0a8ee897fa6c435a07 [formerly 9f3c913d32]
Former-commit-id: 3f48932678
2012-11-19 17:15:07 -06:00
Ben Steffensmeier
d1cdfbec7d Issue #189 clean up unneeded references to grib.
Former-commit-id: 72792fd1b8 [formerly 9dd5c8d545] [formerly 7226decbe2] [formerly 72792fd1b8 [formerly 9dd5c8d545] [formerly 7226decbe2] [formerly 7e1463f328 [formerly 7226decbe2 [formerly b25e86c8f369297b8e21efe7cdc0a9874c0cc470]]]]
Former-commit-id: 7e1463f328
Former-commit-id: 3c47e2bc6f [formerly f0c1fcae31] [formerly 623f130b6c25d38fa4d4e0a2c769c9011f96f103 [formerly 9b1b658f42]]
Former-commit-id: 81c76cfda13aded66ad0c485bb85ba568420a3f6 [formerly 08df92cccd]
Former-commit-id: 63f751fa7b
2012-11-19 13:33:02 -06:00
Dustin Johnson
a4b4e67a64 Issue #1322 Move router registry to edex.xml
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: ea7537804c [formerly dd82a472e5] [formerly 13b1683458] [formerly ea7537804c [formerly dd82a472e5] [formerly 13b1683458] [formerly a9d01486ed [formerly 13b1683458 [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]]]
Former-commit-id: a9d01486ed
Former-commit-id: add45e6805 [formerly dd03bf9bd5] [formerly c8e8f27647ef18ecfbb5e4b6ae6a9f36c8133dea [formerly 1bb69653af]]
Former-commit-id: d71f218208ec47f1958e84baa204371a3d055b80 [formerly f91817813d]
Former-commit-id: 5b64ddb7ba
2012-11-19 13:21:03 -06:00
Ben Steffensmeier
b022158e4d Issue #189 add some more catch blocks to contour subgridding so it works in more odd cases.
Former-commit-id: b5d4cd8534 [formerly 7bb12231f6] [formerly 43d506d8eb] [formerly b5d4cd8534 [formerly 7bb12231f6] [formerly 43d506d8eb] [formerly 6c875b276a [formerly 43d506d8eb [formerly 6670aaff36bca8df4f6b841dc288199e69b5843d]]]]
Former-commit-id: 6c875b276a
Former-commit-id: 7a7b821029 [formerly 688c5b6119] [formerly e922532cd40d95b117ded20705442ec0d75139b6 [formerly 6758415123]]
Former-commit-id: bc1d2340c3d9d31d2ec484a941f8e98dce95a222 [formerly c6af2e27c9]
Former-commit-id: c12aa2f438
2012-11-19 12:30:44 -06:00
Richard Peter
4496190be4 Merge "Issue #1322 Fix ingestGrib modes.xml to include router spring file" into development
Former-commit-id: f95d3c99f8 [formerly ac10bd4c27] [formerly b71c022247] [formerly f95d3c99f8 [formerly ac10bd4c27] [formerly b71c022247] [formerly 657c7a35c5 [formerly b71c022247 [formerly d846e934736d3e68f65620640ae2699dfb3c7530]]]]
Former-commit-id: 657c7a35c5
Former-commit-id: 26c1302816 [formerly dc5b3410eb] [formerly 9568fbb668620de81123d84d9756a1e3c9eb7e0f [formerly e2f026a6a8]]
Former-commit-id: e3e5ac2db8fcba6768c845409ca8be414e0750ff [formerly 0fec5febc9]
Former-commit-id: 05ab674cdd
2012-11-19 12:14:16 -06:00
Dustin Johnson
572da76975 Issue #1322 Fix ingestGrib modes.xml to include router spring file
Amend:
  Add correct bean name.

Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349

Former-commit-id: 8ec80021c2 [formerly 9cfb406675] [formerly ea7e8ac946] [formerly 8ec80021c2 [formerly 9cfb406675] [formerly ea7e8ac946] [formerly 63db1ce6f8 [formerly ea7e8ac946 [formerly a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0]]]]
Former-commit-id: 63db1ce6f8
Former-commit-id: f661846a65 [formerly 75feca3cd0] [formerly bab3f53f7731061ffcaf6c4adb70871624655bfa [formerly 56ea981db7]]
Former-commit-id: 62f65b517d084ea95ec585a27ea42daada02672d [formerly 167e11671b]
Former-commit-id: 80622f912d
2012-11-19 12:03:31 -06:00
Steve Harris
ae2d459202 Merge "Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed" into development
Former-commit-id: 972bbe5676 [formerly 264dc4bc43] [formerly 0d16c0c0df] [formerly 972bbe5676 [formerly 264dc4bc43] [formerly 0d16c0c0df] [formerly 63cdc32988 [formerly 0d16c0c0df [formerly 4dac2ba9a01b36885188f93fdaf974099cbc9d0c]]]]
Former-commit-id: 63cdc32988
Former-commit-id: 042780cdc0 [formerly 082e1cbd09] [formerly 51ddde0dc0e8afec3e577c5e3a5b7875642863d7 [formerly 91bc36fda3]]
Former-commit-id: 6d39e10b4f48895af3c4344558f3acbb0f10c637 [formerly 1173d7fd8e]
Former-commit-id: e92c60d902
2012-11-16 15:35:47 -06:00
Steve Harris
d257f19e0a Merge "Issue #1151 fix radar updates to use levels" into development
Former-commit-id: e477d5c7ec [formerly 601eb746d1] [formerly 5c71f2551b] [formerly e477d5c7ec [formerly 601eb746d1] [formerly 5c71f2551b] [formerly 152c06a718 [formerly 5c71f2551b [formerly 939d9031e4bc1107333f066321ec28ea93cfd3c3]]]]
Former-commit-id: 152c06a718
Former-commit-id: 93c2fdf3e0 [formerly 3d628abebe] [formerly c9cf9e23e389b5119c8375282fb8d835d167b3df [formerly b04797de6f]]
Former-commit-id: 99e63617fdcb73331a3d17835d3a2511b09c4bf8 [formerly 03e30d568f]
Former-commit-id: 950e6f7ad7
2012-11-16 15:35:26 -06:00
Dustin Johnson
064ecbb159 Issue #1322 Add server keyed routing
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: 22c930824c [formerly d1024d091c] [formerly 87148a8061] [formerly 22c930824c [formerly d1024d091c] [formerly 87148a8061] [formerly 8a6be78eb0 [formerly 87148a8061 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 9b9f41cb5a [formerly a448369b44] [formerly 0e562f6e19c01c0c23b34e7e423696a3b7663f29 [formerly 1d5714b994]]
Former-commit-id: 960ecc6840d0a9a5daf8843cf376de88f65aa067 [formerly 2afb19d76b]
Former-commit-id: 08f3910ece
2012-11-16 14:43:45 -06:00
Max Schenkelberg
0cf0cec449 Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed
Change-Id: I25ab9832d725647c17aea505514334a7c0026ae7

Former-commit-id: 8b497d5900 [formerly 34c4ec44c3] [formerly 0daa22064b] [formerly 8b497d5900 [formerly 34c4ec44c3] [formerly 0daa22064b] [formerly 71367ef5bb [formerly 0daa22064b [formerly a7386c6570455fe6f9175eaeae1225923124cce8]]]]
Former-commit-id: 71367ef5bb
Former-commit-id: 09c3fa90aa [formerly afc4de9a1a] [formerly abe81bf3cd4269bfb4f9905a69a85f5a8e3dafd3 [formerly 102c2dbaa1]]
Former-commit-id: d6b0b16d2c9a2fc53d971c3121462eb681da9d9c [formerly 755c64bfdc]
Former-commit-id: dc4876fa33
2012-11-16 14:12:27 -06:00
Ben Steffensmeier
dc61fe019c Issue #1151 fix radar updates to use levels
Former-commit-id: f27749abb2 [formerly f04ac9f7b0] [formerly 9efd40dfd0] [formerly f27749abb2 [formerly f04ac9f7b0] [formerly 9efd40dfd0] [formerly 8ac1373035 [formerly 9efd40dfd0 [formerly 7666bee12af83d195fccd845e874df19eabd94f6]]]]
Former-commit-id: 8ac1373035
Former-commit-id: 069256d109 [formerly 956b6ecfdb] [formerly bc222ac0e4190182eb5a9af79adf31fd12a57a0b [formerly a1d70499eb]]
Former-commit-id: 42222488d45ceefd41f999f59e7141674d2c90a0 [formerly 060aed7ce2]
Former-commit-id: 07cae7c217
2012-11-16 13:53:05 -06:00
Lee Venable
90a20cd1eb Merge "Issue #189 fix modes for gridcoverage to include converter registration" into development
Former-commit-id: 3b1d97d3d0 [formerly 2ce90a79cb] [formerly 998cbc25d3] [formerly 3b1d97d3d0 [formerly 2ce90a79cb] [formerly 998cbc25d3] [formerly b745b95643 [formerly 998cbc25d3 [formerly 7e4649185aa94d3191773a08d9e0673fad71ddb7]]]]
Former-commit-id: b745b95643
Former-commit-id: b5b7c1d932 [formerly 6c283693e4] [formerly 8a074cdca03b8299edf19d9815dfb641d31c661b [formerly cbe9bc5e76]]
Former-commit-id: a445d940a2cd0c047e08c50674ec5d8bbad2ca90 [formerly 25d56be2a4]
Former-commit-id: 97ce309e3a
2012-11-16 12:28:49 -06:00
Ben Steffensmeier
cdf020c370 Issue #189 fix modes for gridcoverage to include converter registration
Former-commit-id: 27f6224e91 [formerly 1082b1b51d] [formerly 1a7560b8a3] [formerly 27f6224e91 [formerly 1082b1b51d] [formerly 1a7560b8a3] [formerly 6b0ed3fa50 [formerly 1a7560b8a3 [formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]]]
Former-commit-id: 6b0ed3fa50
Former-commit-id: 4135b1ad21 [formerly 5126024a6b] [formerly 0225fcc4d96c0f4eb7101fbb5dc6255eb318fcbc [formerly 2a0769d094]]
Former-commit-id: f60fc16527266f7a3df7c30bc25390365c9b1b12 [formerly 13f8f28c2e]
Former-commit-id: 268f7cb64d
2012-11-16 12:25:00 -06:00
Slav Korolev
fdcb811cad Issue #1297. Changed non-blocking ZoneTableDlg. Next patch.
Changes from reviewers comments.

Change-Id: Ie812ef1167fa6b1ea78ee615190bd3059285a682

Former-commit-id: a519f985ec [formerly 487a9eabb8] [formerly d220f74018] [formerly a519f985ec [formerly 487a9eabb8] [formerly d220f74018] [formerly 4560efe149 [formerly d220f74018 [formerly 8f002a71cb688fe8fbf7378ef53398dfecb0354e]]]]
Former-commit-id: 4560efe149
Former-commit-id: 9bb8e24c52 [formerly 063c155818] [formerly 513793f8cfb0f26fa9576ec1dfb831fc65d80eec [formerly 765dbd8766]]
Former-commit-id: c377dec9d403627caffad2d4a3d988df6b86227a [formerly 711ba6b2b5]
Former-commit-id: 5c09c11912
2012-11-16 11:08:42 -05:00
Lee Venable
4745a2d434 Merge "Issue #1298 Changes for non-blocking GhgAlertDlg." into development
Former-commit-id: 3eba3cc1e6 [formerly eb297f00fc] [formerly 0540d84e4e] [formerly 3eba3cc1e6 [formerly eb297f00fc] [formerly 0540d84e4e] [formerly 40f11cfba5 [formerly 0540d84e4e [formerly e96cd422716fc6da7c0007b58fa75659c7600ad7]]]]
Former-commit-id: 40f11cfba5
Former-commit-id: f246c5746c [formerly 247a2859ca] [formerly db488b57f68a48ef282a9fda654e55329f0e887d [formerly aa4b1f4970]]
Former-commit-id: 47b9158ca8f8b6c3bb20bf5866ba92e44f028d4d [formerly 9bef16f8ab]
Former-commit-id: 84ac6354e8
2012-11-15 17:43:31 -06:00
Max Schenkelberg
f980bf1d4f Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737

Former-commit-id: a40abfda65 [formerly a472f5535b] [formerly 655f54b098] [formerly a40abfda65 [formerly a472f5535b] [formerly 655f54b098] [formerly f540f65fd7 [formerly 655f54b098 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]]]
Former-commit-id: f540f65fd7
Former-commit-id: d86550c239 [formerly db2fe0b5e8] [formerly 6ed55cce2d899bb904eca4a9886c9f8d39f745d2 [formerly f1866b2e49]]
Former-commit-id: b6193bec079d86df90df890267f3f0fecb331b78 [formerly 7ffce5cd45]
Former-commit-id: a94b9c173d
2012-11-15 16:21:42 -06:00
Roger Ferrel
c67b4704a5 Issue #1298 Changes for non-blocking GhgAlertDlg.
Change-Id: I1da7317ad69203a4160c806458fdbf99a7d9108d

Former-commit-id: 7811b44376 [formerly b66bc0210a] [formerly 800c1a6908] [formerly 7811b44376 [formerly b66bc0210a] [formerly 800c1a6908] [formerly c0554d9686 [formerly 800c1a6908 [formerly b3c640da3fad8d1ce07e348b075b9b1a0468da37]]]]
Former-commit-id: c0554d9686
Former-commit-id: 273f68e6bf [formerly 0a11332193] [formerly f1224ad7a9ab994434fec5a5c2870efc11e20f61 [formerly 05f32527bd]]
Former-commit-id: cddcd29451786bb76e6ce9789bf1fd88d155b82a [formerly 342a35599b]
Former-commit-id: f805c4cccd
2012-11-15 15:51:46 -06:00
Roger Ferrel
5651e6cf94 Issue #1298 Changes for non-blocking GhgMonitorDlg.
Change-Id: I69a05b6d62e8d75c998b6cb9059c9f45e6cf39d3

Former-commit-id: 07cc6ec003 [formerly a29b52ca8c] [formerly dc82ad820b] [formerly 07cc6ec003 [formerly a29b52ca8c] [formerly dc82ad820b] [formerly 109dea21e1 [formerly dc82ad820b [formerly 782113272c208a32e6165c02404138fcaa79d523]]]]
Former-commit-id: 109dea21e1
Former-commit-id: 76d9479fb9 [formerly e35d7b3f15] [formerly 2ae5143718b7d58053a166fd95152a86a5f839a4 [formerly 2206167b00]]
Former-commit-id: 85588a6263d25f3adb28f0df471c45afbe533fc5 [formerly 418dd35a9d]
Former-commit-id: 64ae20f4a9
2012-11-15 14:37:29 -06:00
Lee Venable
e6c94740c8 Merge "Issue #1298 Changes for non-blocking SelectionDlg." into development
Former-commit-id: 13043336d7 [formerly ba019bf3f6] [formerly ba95731387] [formerly 13043336d7 [formerly ba019bf3f6] [formerly ba95731387] [formerly 2dee27fbf3 [formerly ba95731387 [formerly a1d258382de88af5c139e22d2efb6183261d1e3b]]]]
Former-commit-id: 2dee27fbf3
Former-commit-id: 32a107dc9d [formerly a4a5c89fa8] [formerly fc63dd3bffdc9bea1ecb6fa95cf613aee3cd8738 [formerly ed64d2f97a]]
Former-commit-id: 9c1da5a0c773e6a4d44089834ddb5e1be5579ebe [formerly a883fd2e08]
Former-commit-id: c1e08c8468
2012-11-15 13:47:46 -06:00
Benjamin Phillippe
46cbdc741d Issue #1335 Fixed EHCache warnings. Changes to necessary config files
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 1fa596463d [formerly 44519995ee] [formerly 5bf46d468d] [formerly 1fa596463d [formerly 44519995ee] [formerly 5bf46d468d] [formerly 5c31b34e12 [formerly 5bf46d468d [formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]]]
Former-commit-id: 5c31b34e12
Former-commit-id: 41647b0274 [formerly 43b94988c8] [formerly d2f70d8685a2cd0f6ca4f66510f619573250a39a [formerly 6b1b73429b]]
Former-commit-id: e5d6b1e32304c3b9436510d0224ab4073c0f9011 [formerly 688e19acc1]
Former-commit-id: debdd584fd
2012-11-15 13:35:25 -06:00