Commit graph

1298 commits

Author SHA1 Message Date
Ron Anderson
f4bde3e264 Merge "Issue #1328 Made GFE use descriptor for time matching and time storage and manipulation" into development
Former-commit-id: b93cfaf286 [formerly 55cc75b5f0] [formerly b93cfaf286 [formerly 55cc75b5f0] [formerly 6c354222ac [formerly 424fb6edb9314a2fc90c27cf31cc13ff1ab4a594]]]
Former-commit-id: 6c354222ac
Former-commit-id: 45edaa3b68 [formerly e241aa7db2]
Former-commit-id: 3e28991c6f
2012-12-05 12:42:48 -06:00
Roger Ferrel
0f90df2723 Issue #1364 PointsDataManager changed to no longer use File.separator.
Change-Id: I619cb6670e0e73b19b040e7acce918d0c2eebeb3

Former-commit-id: d500d560c5 [formerly dcc2201b07] [formerly d500d560c5 [formerly dcc2201b07] [formerly b55ceb3f36 [formerly 2dc070320d9e5f9a4154f0007c708016d7f2cd8f]]]
Former-commit-id: b55ceb3f36
Former-commit-id: fb55a378ad [formerly 6fc0163e37]
Former-commit-id: 4c93e28a82
2012-12-05 12:11:18 -06:00
Ben Steffensmeier
f050bf8ef0 Issue #1390 move envelope reprojection to from COntourSupport to MapUtil
Former-commit-id: 8ba69b5683 [formerly 595b732066] [formerly 8ba69b5683 [formerly 595b732066] [formerly 9b2389dd7e [formerly 3cd041526b5f827bcdc2ef846b2a04ca71e37c99]]]
Former-commit-id: 9b2389dd7e
Former-commit-id: 0af2ec4f0a [formerly 6bd25a7cfc]
Former-commit-id: b186b3f10c
2012-12-05 10:47:54 -06:00
Richard Peter
849eedffb2 Merge "Issue #1384 allow the derived parameters to function even if the database has multiple identical coverages, add cluster locking to grid coverage creation." into development
Former-commit-id: ea5314b983 [formerly 970f1fc201] [formerly ea5314b983 [formerly 970f1fc201] [formerly f279d478f8 [formerly 251535242b781031c5324708db7be1127844c6d0]]]
Former-commit-id: f279d478f8
Former-commit-id: 5597c522e0 [formerly 35e382251d]
Former-commit-id: e79fa94195
2012-12-04 16:15:16 -06:00
Richard Peter
51c0a0efed Merge "Issue #1387 updated style rules for RFC-FFG products, fixed never ending Requesting Gridded Data when RFC-FFG is loaded" into development
Former-commit-id: 60de2da63d [formerly 9086b40a2f] [formerly 60de2da63d [formerly 9086b40a2f] [formerly cef8be2e64 [formerly bec1c58fdbea0aff7bfaace01d0bb0274f5c0643]]]
Former-commit-id: cef8be2e64
Former-commit-id: 691db16613 [formerly 30eec037c3]
Former-commit-id: dd36773776
2012-12-04 14:34:49 -06:00
Ben Steffensmeier
805b9ff1ff Issue #1387 updated style rules for RFC-FFG products, fixed never ending Requesting Gridded Data when RFC-FFG is loaded
Former-commit-id: 45220299f9 [formerly 95dc87b6cf] [formerly 45220299f9 [formerly 95dc87b6cf] [formerly e44db81177 [formerly 26abcb77b1b1157ce6e8bc5bda28202430f2d4f7]]]
Former-commit-id: e44db81177
Former-commit-id: d3456e3ee3 [formerly e1b134aa35]
Former-commit-id: d5d586c967
2012-12-04 14:09:28 -06:00
Ben Steffensmeier
5f588f1b55 Issue #1384 allow the derived parameters to function even if the database has multiple identical coverages, add cluster locking to grid coverage creation.
Former-commit-id: f4c534a556 [formerly 038e87f4b0] [formerly f4c534a556 [formerly 038e87f4b0] [formerly d0e8e3b1c3 [formerly e804d35462beea4483d6c0b01f3f61a2576b8098]]]
Former-commit-id: d0e8e3b1c3
Former-commit-id: e23992352e [formerly 7f18e0bbee]
Former-commit-id: 6d6d3bbb35
2012-12-04 12:49:50 -06:00
Ben Steffensmeier
286b4f5dcf Issue #1371 fix offscreen rendering on graphics cards that don't support luminance.
Former-commit-id: a980e67c9c [formerly 16b918000e] [formerly a980e67c9c [formerly 16b918000e] [formerly 73dbed5bfc [formerly 4c620ffc4a6df585c67b41868ec1b28dab21a7e4]]]
Former-commit-id: 73dbed5bfc
Former-commit-id: 979e0ccc4e [formerly 4a6fc8ea28]
Former-commit-id: b384be652b
2012-12-04 12:28:43 -06:00
Richard Peter
4fc5e57dfb Merge "Issue #1380 fix kml handling of uninitialized coor bars." into development
Former-commit-id: 5bb646638d [formerly 2248bf0f53] [formerly 5bb646638d [formerly 2248bf0f53] [formerly 50f2d6ab93 [formerly 4187da110efb8e261aaa92c2b537e461df01ecc1]]]
Former-commit-id: 50f2d6ab93
Former-commit-id: 6e65a592f4 [formerly 75a74fe4bc]
Former-commit-id: f408803e8c
2012-12-04 10:37:23 -06:00
Roger Ferrel
4a2568b80f Issue #1353 Fix messed up merge for GhgFilterDlg and GhgMonitorDlg.
Change-Id: I35d6d6b1a66887e6c8af4b43267ecc3fef079b2c

Former-commit-id: 1a53158248 [formerly 9ce284e2d9] [formerly 1a53158248 [formerly 9ce284e2d9] [formerly c4e925aba1 [formerly 8904b7a7cfb3fdd9e2c28f2799550bed863e72ec]]]
Former-commit-id: c4e925aba1
Former-commit-id: 4e2a3a69f1 [formerly 61930c5532]
Former-commit-id: 7c0913de25
2012-12-03 17:13:04 -06:00
Ben Steffensmeier
04d22c0f2b Issue #1380 fix kml handling of uninitialized coor bars.
Former-commit-id: 5040239f69 [formerly 0418beb8c7] [formerly 5040239f69 [formerly 0418beb8c7] [formerly 1828fcbccf [formerly 31189d6a6ca7a97220f2713f067c27e9bb415fd1]]]
Former-commit-id: 1828fcbccf
Former-commit-id: 1c508fc105 [formerly ba7f4d2e71]
Former-commit-id: c94c7901af
2012-12-03 15:21:20 -06:00
Lee Venable
1f292aa0ba Merge "Issue #1353 Changers for non-blocking GhgFilterDlg and GhgSaveDeleteFilterDlg." into development
Former-commit-id: df15966db4 [formerly a8deaf8406] [formerly df15966db4 [formerly a8deaf8406] [formerly 58366542fe [formerly 1be8fb92dc4eb8e8fa628fb42a6a08431a4c2641]]]
Former-commit-id: 58366542fe
Former-commit-id: 9169d6610b [formerly bcd1c722bf]
Former-commit-id: a7c74a846f
2012-12-03 13:27:34 -06:00
Lee Venable
9a2d14837a Merge "Issue #1353 Changes for non-blocking RetrieveMergeDlg and LoadSaveDelteSelectDlg close callbacks added to FFFGDlg." into development
Former-commit-id: 696fb95b92 [formerly 6a187c705a] [formerly 696fb95b92 [formerly 6a187c705a] [formerly a0ba84d5e0 [formerly e433fbe19e51138c78f69b8a3a89decffbb75f13]]]
Former-commit-id: a0ba84d5e0
Former-commit-id: 370f18863b [formerly e76cb36b09]
Former-commit-id: 0f16eccdee
2012-12-03 13:09:53 -06:00
Dustin Johnson
5f51b0b3f8 Issue #1377 Break registry dependency on data delivery
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea

Former-commit-id: 6d1831b002 [formerly bba092f51e] [formerly 6d1831b002 [formerly bba092f51e] [formerly 529238d010 [formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]]]
Former-commit-id: 529238d010
Former-commit-id: 5953c5372f [formerly 1b165c8e73]
Former-commit-id: 5731299558
2012-12-03 12:06:32 -06:00
Roger Ferrel
65c5ad614d Issue #1353 Changers for non-blocking GhgFilterDlg and GhgSaveDeleteFilterDlg.
Change-Id: I9a6278ea75eda3f8bc9666f6ae41451b255cb223

Former-commit-id: 317e34f89b [formerly d1d846267c] [formerly 317e34f89b [formerly d1d846267c] [formerly 2be7ff7c35 [formerly 5a2362265aa6378f323144d87f6d7ef01cd37c9f]]]
Former-commit-id: 2be7ff7c35
Former-commit-id: 0d05519f0a [formerly ba682f2812]
Former-commit-id: 66b44dffbe
2012-12-03 10:31:22 -06:00
Roger Ferrel
f6650e79ac Issue #1353 Changes for non-blocking RetrieveMergeDlg and LoadSaveDelteSelectDlg close callbacks added to FFFGDlg.
Change-Id: I6ae982cef57ed66093145c93f4bec0491402882c

Former-commit-id: 1ba00e7eab [formerly 6eb1c3cac3] [formerly 1ba00e7eab [formerly 6eb1c3cac3] [formerly 45a957ebf3 [formerly 5c23c4d932b4a4ae2274c58fe5257be9a46c7076]]]
Former-commit-id: 45a957ebf3
Former-commit-id: 061b0ca7ef [formerly 3bdff81196]
Former-commit-id: 72eb575336
2012-12-03 10:24:18 -06:00
Lee Venable
3fc8d7ec53 Merge "Issue #1353 Chagnes for non-blocking GhgColorDlg and GhgMonitorDlg." into development
Former-commit-id: a39a0d5e8a [formerly 93024b2e94] [formerly a39a0d5e8a [formerly 93024b2e94] [formerly 0d3b988a73 [formerly 7e628df1a120757a29a0a2a691103f25f4b92cf9]]]
Former-commit-id: 0d3b988a73
Former-commit-id: 2aebd77b15 [formerly a286ebd2e7]
Former-commit-id: 02982f29d5
2012-12-03 08:51:05 -06:00
Lee Venable
53686315b2 Merge "Issue #1353 Changes for non-blocking FFFGDlg, AboutDlg, AcknowledgmentsDlg and HelpDlg dialogs." into development
Former-commit-id: e35e996f83 [formerly 8814b9f60c] [formerly e35e996f83 [formerly 8814b9f60c] [formerly 9847ce1342 [formerly e551f490df4fed58de7150110214b5728c94a0a6]]]
Former-commit-id: 9847ce1342
Former-commit-id: 8bf39671de [formerly 76c5005d07]
Former-commit-id: 3f7f68ebf8
2012-12-03 08:50:36 -06:00
Max Schenkelberg
a488900f51 Issue #1328 Made GFE use descriptor for time matching and time storage and manipulation
Amend: Fixed time matcher index error when no data is available in GFE

Change-Id: Ie222ba72cb3890d3dc32699828b45012cd1783e5

Former-commit-id: b744ba68e0 [formerly 624cafb066] [formerly b744ba68e0 [formerly 624cafb066] [formerly 1328deac56 [formerly 974ef3068d48244ca622edc17045266cc34b6468]]]
Former-commit-id: 1328deac56
Former-commit-id: 47c7518388 [formerly c5536a9a84]
Former-commit-id: b1c2bf1cc4
2012-11-30 14:17:50 -06:00
Nate Jensen
b91a90ab8d Merge "Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins" into development
Former-commit-id: f397c00218 [formerly e17a176b94] [formerly f397c00218 [formerly e17a176b94] [formerly e4edf2f060 [formerly 3bd66b30e6d23f8f4308c3587b9873aaec37bb71]]]
Former-commit-id: e4edf2f060
Former-commit-id: 7caf683acd [formerly 23c70ac8f2]
Former-commit-id: 0327a255a6
2012-11-30 11:08:22 -06:00
Ben Steffensmeier
3fc1649932 Issue #1370 fix exception that occurs when cubes of derived parameters are only partially available.
Change-Id: Icd7a7acc2447d7a0d9cebe3107ea05281c2c4bbe

Former-commit-id: 41c4dadaf2 [formerly 4fc5859087] [formerly 41c4dadaf2 [formerly 4fc5859087] [formerly 1d4f377e7d [formerly 5fe57b5d66fdef047e5b91942c024175c2d3959d]]]
Former-commit-id: 1d4f377e7d
Former-commit-id: 1961735800 [formerly 18aff579ed]
Former-commit-id: 3c9e24a020
2012-11-29 14:40:34 -06:00
Mike Duff
9112fd0b14 Issue #1366 - Fix to stats aggregator
Former-commit-id: 359cffd60e [formerly 0dd8732067] [formerly 359cffd60e [formerly 0dd8732067] [formerly 8ad3fa9b60 [formerly ae58feea5fb410725747ab106caa8d194b4b9f57]]]
Former-commit-id: 8ad3fa9b60
Former-commit-id: fe932e395c [formerly 1a399cf337]
Former-commit-id: 25d30b190d
2012-11-29 13:51:27 -06:00
Roger Ferrel
7e243e872c Issue #1353 Changes for non-blocking FFFGDlg, AboutDlg, AcknowledgmentsDlg and HelpDlg dialogs.
Change-Id: Id72c6a0c0329f485fe7a9ca115c3f029019145e6

Former-commit-id: 9832e2dbb0 [formerly 64a78503b2] [formerly 9832e2dbb0 [formerly 64a78503b2] [formerly f3b83e02b4 [formerly 372417c1d355e3c5eef327f14be9b72dfe1e0f08]]]
Former-commit-id: f3b83e02b4
Former-commit-id: 1533fda1e3 [formerly 391f07ea69]
Former-commit-id: 49bdfb071c
2012-11-29 13:21:15 -06:00
Roger Ferrel
fe94c3a9eb Issue #1365 RangeRingDialog now perform a close properly when not on the UI thread.
Change-Id: Idc32bb73f6a3cba2c8f2be5119606a17356e3ec7

Former-commit-id: 55ddd1bce6 [formerly 4649d1becd] [formerly 55ddd1bce6 [formerly 4649d1becd] [formerly 4dcb533215 [formerly 9a1620b31f1ef86c19c4d3c3dd53ee29161e5f60]]]
Former-commit-id: 4dcb533215
Former-commit-id: bf610cc4f3 [formerly f761ed04b9]
Former-commit-id: 98c067a76c
2012-11-29 11:13:47 -06:00
Steve Harris
409d87c0de Merge "Issue #1273 product browser re-orders for all applicable data types" into development
Former-commit-id: cf3bc24cd3 [formerly ff6bd410f6] [formerly cf3bc24cd3 [formerly ff6bd410f6] [formerly 94fb2d77eb [formerly 8e9849915099639b7a3943c128ed39b7371bda9d]]]
Former-commit-id: 94fb2d77eb
Former-commit-id: 95dec9ace7 [formerly 6c07e54f85]
Former-commit-id: b00d97348d
2012-11-29 10:53:54 -06:00
Max Schenkelberg
a7b239f9c1 Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: 56ae27e172 [formerly b648c5828e] [formerly 56ae27e172 [formerly b648c5828e] [formerly ed77d56a84 [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]
Former-commit-id: ed77d56a84
Former-commit-id: f681c1304c [formerly b24440cc37]
Former-commit-id: b8b98a78c3
2012-11-29 10:29:36 -06:00
Matt Nash
d72df0dc66 Issue #1273 product browser re-orders for all applicable data types
Change-Id: I8612578d239119e9df22724ebb0bc100cf7826af

Former-commit-id: 5fa5302739 [formerly 3f2c497286] [formerly 5fa5302739 [formerly 3f2c497286] [formerly 73a0b0da75 [formerly c4e2ff5e1b4f22b1bf712f26dea71ab8d15a75f1]]]
Former-commit-id: 73a0b0da75
Former-commit-id: 7687db01f4 [formerly 1b2d3d642d]
Former-commit-id: 2c4164decc
2012-11-29 09:54:50 -06:00
Bryan Kowal
49f45e1901 Issue #1354 - the Linux CAVE thinclient and the MSFT Windows CAVE thinclient will now <b>always</b> include the same CAVE features
Change-Id: Ib0f1a90fc55293cff2d43d236bec93001d93e8bf

Former-commit-id: 3a4ca9582d [formerly d3b455c955] [formerly 3a4ca9582d [formerly d3b455c955] [formerly f99d351995 [formerly ca0b97b8d8db19900107ab38f6a6af8a9ee7b935]]]
Former-commit-id: f99d351995
Former-commit-id: ae64e9ce3b [formerly b0c65323b6]
Former-commit-id: 774d3a8f8d
2012-11-28 16:30:10 -06:00
Roger Ferrel
63977010d3 Issue #1363 The intance of PythonGuidanceJob can now be created on any thread.
Change-Id: I4f24c904007df455aee557cd80cac8836da3d517

Former-commit-id: 7b5f60f2cc [formerly 5fde71e598] [formerly 7b5f60f2cc [formerly 5fde71e598] [formerly e7d453bd77 [formerly 1640c177e60e8e3ba522568a662bedda0cd7546e]]]
Former-commit-id: e7d453bd77
Former-commit-id: e2b28b7f96 [formerly 48c5724c06]
Former-commit-id: 8a4e89e6dd
2012-11-28 10:05:11 -06:00
Roger Ferrel
853def22f6 Issue #1353 Chagnes for non-blocking GhgColorDlg and GhgMonitorDlg.
Change-Id: If434b0e6a2ada677bb81fc49b7165e20d3041b17

Former-commit-id: c9fd0d3b06 [formerly fdcd4f519a] [formerly c9fd0d3b06 [formerly fdcd4f519a] [formerly 04a7b91150 [formerly cca0279fe7d8a4e811f81f3c929f24b21eecd1e4]]]
Former-commit-id: 04a7b91150
Former-commit-id: eac135896d [formerly 1f745272cb]
Former-commit-id: 7720709aef
2012-11-28 07:48:30 -06:00
Mike Duff
dfc4895f1e Issue #728 - Updates to stats graphs
Former-commit-id: 31aeeab7a1 [formerly 4317b70d87] [formerly 31aeeab7a1 [formerly 4317b70d87] [formerly 6d6ee01f45 [formerly 2b132ce2e29f90cef28d31c4f5b68abc35ac368f]]]
Former-commit-id: 6d6ee01f45
Former-commit-id: 021d153312 [formerly 919ed16028]
Former-commit-id: 10ec60a8b2
2012-11-27 16:15:34 -06:00
Roger Ferrel
bb21c0b2f7 Issue #1298 Plugin changes to get localization import of files to work for test procedures.
Change-Id: I91e5e5abc76789f0b65ebc2dc7c793f7afa32d7d

Former-commit-id: ac09c59d38 [formerly 2a1024ff50] [formerly ac09c59d38 [formerly 2a1024ff50] [formerly 230e24addc [formerly 67b55ee03d17a878375be75bc36bcb5500ca98fd]]]
Former-commit-id: 230e24addc
Former-commit-id: 0011eb0ff4 [formerly ea3b2aebc6]
Former-commit-id: 2cc1b72f9e
2012-11-27 10:37:06 -06:00
Richard Peter
8c6ea90652 Issue #1350: Fix cave feature dependencies
Change-Id: Ia96e46656ae21388cce0196a5fad7f7badeb36da

Former-commit-id: 25c47696b9 [formerly 8a149f1671] [formerly 25c47696b9 [formerly 8a149f1671] [formerly 955025940c [formerly 19dc217fe08245411df16efd34bab8980ec7dcb5]]]
Former-commit-id: 955025940c
Former-commit-id: 3efd48eded [formerly 4cc389183e]
Former-commit-id: ffb053edb2
2012-11-27 09:18:01 -06:00
Nate Jensen
2621f23dfa Issue #1323 fix build issue
Change-Id: I5918a05535bc7e928214075784f615cf454d2972

Former-commit-id: cbb77b884b [formerly d76ab40583] [formerly cbb77b884b [formerly d76ab40583] [formerly f24fcc07cf [formerly db083d70f18b771740f73ecb787c103b5264881d]]]
Former-commit-id: f24fcc07cf
Former-commit-id: 8a4544a632 [formerly 10be056dcb]
Former-commit-id: 2385f6223a
2012-11-27 09:07:07 -06:00
Mike Duff
d6b3380e9a Issue #728 - Make graph scale to visible data when adding or removing data from graph
Change-Id: I44150e19b52436b7103226f6ce539b0e9536d072

Former-commit-id: 94a1921f8b [formerly fb04389920] [formerly 94a1921f8b [formerly fb04389920] [formerly 0675868464 [formerly dd45abb6461510408a92e66e68a25222d45e9ecf]]]
Former-commit-id: 0675868464
Former-commit-id: e6647d5e9a [formerly dc8a5420d4]
Former-commit-id: f98e4fa57e
2012-11-26 18:07:10 -06:00
Richard Peter
55e043169e Merge "Issue #728 - Implementation of Statistics graphs peer review comments Changing to use average value rather than sum." into development
Former-commit-id: e48eef4e8c [formerly 56627c6391] [formerly e48eef4e8c [formerly 56627c6391] [formerly 3124712dd5 [formerly d4c42ddc3e1f15ec7f415fe1abca1da05ac76ae7]]]
Former-commit-id: 3124712dd5
Former-commit-id: a810e06c03 [formerly 5eb311271a]
Former-commit-id: 786d9183ef
2012-11-26 17:36:43 -06:00
Mike Duff
4ec36b8ce4 Issue #728 - Implementation of Statistics graphs
peer review comments
Changing to use average value rather than sum.

Change-Id: I7f97e27c4f463fe60bec2cbc52f3eac66d8fa77f

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

Former-commit-id: 4b1c9a1d2c [formerly 1bc40b2daf] [formerly 4b1c9a1d2c [formerly 1bc40b2daf] [formerly 520fa44d23 [formerly 98d0d27124baa44bcbbdf6e9276aa1966e420207]]]
Former-commit-id: 520fa44d23
Former-commit-id: 49c3225d11 [formerly 05da65c512]
Former-commit-id: 4a01a00a5d
2012-11-26 15:15:38 -06:00
Roger Ferrel
b1cbcb5716 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: c34b777804 [formerly 0b87e0fdfd] [formerly c34b777804 [formerly 0b87e0fdfd] [formerly 5e7227d1b0 [formerly bdf2bf3c1e3b907fb16acf82dda230f97a3cc517]]]
Former-commit-id: 5e7227d1b0
Former-commit-id: 77db62f285 [formerly 8319d7245d]
Former-commit-id: 8c64034eb1
2012-11-26 14:06:03 -06:00
Ben Steffensmeier
ce495bd549 Issue #1316 pass original constraints through when doing time queries in derived parameters.
Former-commit-id: a1fc232a19 [formerly 7061c6db78] [formerly a1fc232a19 [formerly 7061c6db78] [formerly f6a502fb78 [formerly 5f67639bdd24711dc6f77b41163f49bf8626b7d3]]]
Former-commit-id: f6a502fb78
Former-commit-id: 27b77f735d [formerly 59a00a75f9]
Former-commit-id: d08d71d471
2012-11-21 14:21:01 -06:00
Richard Peter
64efa971f6 Merge "Issue #1343: Fix Derived Parameter clean up of global map performance" into development
Former-commit-id: 1f4591a861 [formerly a8b691b11e] [formerly 1f4591a861 [formerly a8b691b11e] [formerly d276bf25df [formerly 7ca68476dd30a056223d4b1b8788640cae245ca9]]]
Former-commit-id: d276bf25df
Former-commit-id: e709143e10 [formerly a482cd3f17]
Former-commit-id: 55c6fa7bb7
2012-11-20 16:58:13 -06:00
Richard Peter
42850516da Issue #1343: Fix Derived Parameter clean up of global map performance
Change-Id: Id5a37b16ffe311891a39acd21dab792d6c62fb29

Former-commit-id: 3fb4137264 [formerly a4ca44195e] [formerly 3fb4137264 [formerly a4ca44195e] [formerly 94ff0868d8 [formerly eeed667765a9da192ba4d28923fa447d8ea81437]]]
Former-commit-id: 94ff0868d8
Former-commit-id: 1ee2e40970 [formerly 57b23523dc]
Former-commit-id: c3e4b81c7c
2012-11-20 16:42:27 -06:00
Dustin Johnson
5e480196a4 Issue #1322 Add IDisplay
Change-Id: I0f20b5e2e4544c2a984c317a812855f92e935b92

Former-commit-id: 973ffa6f71 [formerly 4425d25c71] [formerly 973ffa6f71 [formerly 4425d25c71] [formerly d68c1f84f2 [formerly 039c475445ca8f049c46547dba63d413f3019817]]]
Former-commit-id: d68c1f84f2
Former-commit-id: bd77ea1c11 [formerly fe187f62f7]
Former-commit-id: 5ca7396d38
2012-11-20 15:22:52 -06:00
Richard Peter
a63f796be5 Merge "Issue #189 clean up unneeded references to grib." into development
Former-commit-id: 42ce93afa8 [formerly b68a8d986f] [formerly 42ce93afa8 [formerly b68a8d986f] [formerly 48e33e05e7 [formerly 6cb68df37fd22b45abcaee309f9f364456905191]]]
Former-commit-id: 48e33e05e7
Former-commit-id: d695c10d87 [formerly 36ce487edc]
Former-commit-id: dfa27ccab6
2012-11-19 17:16:08 -06:00
Richard Peter
3f48932678 Merge "Issue #189 add some more catch blocks to contour subgridding so it works in more odd cases." into development
Former-commit-id: cee57ad2c1 [formerly 8bb1e1675d] [formerly cee57ad2c1 [formerly 8bb1e1675d] [formerly 625141ffb3 [formerly 6570ee57790d482a212ee65dc2ed9482ba8de8b6]]]
Former-commit-id: 625141ffb3
Former-commit-id: c063e130f1 [formerly 379b303985]
Former-commit-id: 9f3c913d32
2012-11-19 17:15:07 -06:00
Ben Steffensmeier
63f751fa7b Issue #189 clean up unneeded references to grib.
Former-commit-id: 9dd5c8d545 [formerly 7226decbe2] [formerly 9dd5c8d545 [formerly 7226decbe2] [formerly 7e1463f328 [formerly b25e86c8f369297b8e21efe7cdc0a9874c0cc470]]]
Former-commit-id: 7e1463f328
Former-commit-id: f0c1fcae31 [formerly 9b1b658f42]
Former-commit-id: 08df92cccd
2012-11-19 13:33:02 -06:00
Dustin Johnson
5b64ddb7ba Issue #1322 Move router registry to edex.xml
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: dd82a472e5 [formerly 13b1683458] [formerly dd82a472e5 [formerly 13b1683458] [formerly a9d01486ed [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]]
Former-commit-id: a9d01486ed
Former-commit-id: dd03bf9bd5 [formerly 1bb69653af]
Former-commit-id: f91817813d
2012-11-19 13:21:03 -06:00
Ben Steffensmeier
c12aa2f438 Issue #189 add some more catch blocks to contour subgridding so it works in more odd cases.
Former-commit-id: 7bb12231f6 [formerly 43d506d8eb] [formerly 7bb12231f6 [formerly 43d506d8eb] [formerly 6c875b276a [formerly 6670aaff36bca8df4f6b841dc288199e69b5843d]]]
Former-commit-id: 6c875b276a
Former-commit-id: 688c5b6119 [formerly 6758415123]
Former-commit-id: c6af2e27c9
2012-11-19 12:30:44 -06:00
Steve Harris
e92c60d902 Merge "Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed" into development
Former-commit-id: 264dc4bc43 [formerly 0d16c0c0df] [formerly 264dc4bc43 [formerly 0d16c0c0df] [formerly 63cdc32988 [formerly 4dac2ba9a01b36885188f93fdaf974099cbc9d0c]]]
Former-commit-id: 63cdc32988
Former-commit-id: 082e1cbd09 [formerly 91bc36fda3]
Former-commit-id: 1173d7fd8e
2012-11-16 15:35:47 -06:00
Steve Harris
950e6f7ad7 Merge "Issue #1151 fix radar updates to use levels" into development
Former-commit-id: 601eb746d1 [formerly 5c71f2551b] [formerly 601eb746d1 [formerly 5c71f2551b] [formerly 152c06a718 [formerly 939d9031e4bc1107333f066321ec28ea93cfd3c3]]]
Former-commit-id: 152c06a718
Former-commit-id: 3d628abebe [formerly b04797de6f]
Former-commit-id: 03e30d568f
2012-11-16 15:35:26 -06:00