Commit graph

1060 commits

Author SHA1 Message Date
Ron Anderson
7a124883c5 Merge "Issue #1328 Fixed bug in GFE time matcher when no grids are available for discrete type" into development
Former-commit-id: 7cbca57715 [formerly 408c47019e] [formerly f85dcb12c5] [formerly 7cbca57715 [formerly 408c47019e] [formerly f85dcb12c5] [formerly ab1822c6a2 [formerly f85dcb12c5 [formerly f281a810241140999419bc27560d6418d3b2bcc8]]]]
Former-commit-id: ab1822c6a2
Former-commit-id: d992c38c7f [formerly 12232c7975] [formerly 01efdd1a5b79b07250418da775fd59e16cc7cce7 [formerly d3f595a6aa]]
Former-commit-id: 7d7673360bb17a89a502e28480adb352057f2ab1 [formerly d37b8616e2]
Former-commit-id: f5faab1dd3
2012-12-06 14:09:52 -06:00
Roger Ferrel
6a34b1d31a Issue #1353 Changes for non-blocking AttributeThresholdDlg, BasinTrendDlg and ConfigSummaryDlg.
Change-Id: Ie5ed937d78478c91eab84998024ee3347f79c95e

Former-commit-id: 04db36835c [formerly d99abd8f22] [formerly 7233f6fd64] [formerly 04db36835c [formerly d99abd8f22] [formerly 7233f6fd64] [formerly c30152a13d [formerly 7233f6fd64 [formerly ea9896b2e8653b5d521c3f2d4a497116d135ea64]]]]
Former-commit-id: c30152a13d
Former-commit-id: b964c296cf [formerly b736c70e88] [formerly c65b8ccca6fe95b4348bfa353af6a74f37a8bace [formerly 2a4a7a605f]]
Former-commit-id: 84eed2f7c1d63e34d76bb25472ddf6bf0b07f2ef [formerly c7faa655ec]
Former-commit-id: 3afacaa66e
2012-12-06 13:40:48 -06:00
Lee Venable
f16349e8bd Merge "Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables." into development
Former-commit-id: 12a7e58b1a [formerly 13750a21e2] [formerly a114b7003e] [formerly 12a7e58b1a [formerly 13750a21e2] [formerly a114b7003e] [formerly e9cef99c97 [formerly a114b7003e [formerly 2bebbe390d9398df6d3304b25265ed276fa757aa]]]]
Former-commit-id: e9cef99c97
Former-commit-id: d6a94c31a2 [formerly 1d264b4fa8] [formerly d9b30dc66547cdd8fb8386e151e045d557856cec [formerly 17124560bd]]
Former-commit-id: a72ac61aa878eda88bc3aa297deb969d6ef9f0ce [formerly fa3cd5a725]
Former-commit-id: dbf805159d
2012-12-06 13:26:24 -06:00
Matt Nash
6b907be8c9 Issue #1369 fix geotiff import in CAVE
Change-Id: Iccc051478064e5746c80be5cf8edad7eb8e89f50

Former-commit-id: b591c681fb [formerly cb9cd97d1f] [formerly fc4d7daab4] [formerly b591c681fb [formerly cb9cd97d1f] [formerly fc4d7daab4] [formerly 10d399aafe [formerly fc4d7daab4 [formerly ab5775f5187c2b0a2180dfeebc32774c3a1adb16]]]]
Former-commit-id: 10d399aafe
Former-commit-id: d5654048bd [formerly 01dc19b06d] [formerly 919796c9928b099579e5d3474a4ef09ebcf528d6 [formerly c9372636d9]]
Former-commit-id: 8169e8edbe656bfd9d3be0b23d6119b2f699421a [formerly dc7355a3e4]
Former-commit-id: 2a207511e4
2012-12-06 12:02:11 -06:00
Slav Korolev
47fcfda6da Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables.
Change-Id: Ic68f4afd44a3039707cb80ee71a935aa2f00a6a2

Former-commit-id: 32f192134d [formerly 153af1673a] [formerly 5e4bbc03a4] [formerly 32f192134d [formerly 153af1673a] [formerly 5e4bbc03a4] [formerly af101861e4 [formerly 5e4bbc03a4 [formerly 82dc81aa3cbdfcfcd0b3f5f6566bfce0b6fddd22]]]]
Former-commit-id: af101861e4
Former-commit-id: d9710603e7 [formerly fd46994bb9] [formerly d7de73f56f69ac57bd4c037b1331da78ad5eafa0 [formerly a6241ff4d8]]
Former-commit-id: ea094f0bb19456530bb0dfb6f5a0181129fb8e44 [formerly 7b66b5258d]
Former-commit-id: 627c3987ea
2012-12-06 12:42:06 -05:00
Max Schenkelberg
5d14a6278a Issue #1328 Fixed bug in GFE time matcher when no grids are available for discrete type
Change-Id: I71f9f9b23573394e9f98895164be4aef659ec02a

Former-commit-id: f9f8c75b79 [formerly 5693e567ef] [formerly 032b0948a4] [formerly f9f8c75b79 [formerly 5693e567ef] [formerly 032b0948a4] [formerly 2e1bb4f7c6 [formerly 032b0948a4 [formerly a4c781a6c57579f04413dc16a0b3937ac6ce72d4]]]]
Former-commit-id: 2e1bb4f7c6
Former-commit-id: 71d34ca33a [formerly 8974e33edc] [formerly bdf52e73976551873e82686836572d9d03b9024c [formerly 2e51e024b8]]
Former-commit-id: d9a18c713e9dd5823199b0d8f70a56e945947ee0 [formerly 37b94ec835]
Former-commit-id: d47f34fb45
2012-12-06 11:23:22 -06:00
Roger Ferrel
a276ea7917 Issue #1353 Changes for non-blocking AttributesDlg.
Change-Id: I10c64bc287d7b5f79836ce14567df9cb05e4aa5d

Former-commit-id: d4eadcac11 [formerly 48143df9b1] [formerly bdaf7fa39e] [formerly d4eadcac11 [formerly 48143df9b1] [formerly bdaf7fa39e] [formerly 6efe221abf [formerly bdaf7fa39e [formerly da1fcd1d3d1716a1742b2e394d5d28b7d641ec3e]]]]
Former-commit-id: 6efe221abf
Former-commit-id: 0c858d6da8 [formerly 9e0ca8f515] [formerly fdac0ea11351a166a7d38c13f3203be22d5db92c [formerly 7a146ba846]]
Former-commit-id: 3580d84249994abab4f8e8d3f807e5abfb361056 [formerly 1ef3d31d1e]
Former-commit-id: 7421cf8741
2012-12-06 09:54:13 -06:00
Lee Venable
3f8f12e64b Merge "Issue #1353 Delete old test classes that no longer work or are referenced anywhere." into development
Former-commit-id: b02c667e72 [formerly 45630ede78] [formerly 67243cacf8] [formerly b02c667e72 [formerly 45630ede78] [formerly 67243cacf8] [formerly 3fb520b16b [formerly 67243cacf8 [formerly ff448dd0525f9e66f844c74556228b73a3e68196]]]]
Former-commit-id: 3fb520b16b
Former-commit-id: 72f6a0ea90 [formerly a533c424c7] [formerly 64f2893d62ec58895835eb11834358ffebf3e8d4 [formerly 7943e69cf8]]
Former-commit-id: 240a8bccf37af264d689b13e10b48ce137403794 [formerly 262da6b409]
Former-commit-id: a12f2e271c
2012-12-05 16:19:05 -06:00
Roger Ferrel
d555013164 Issue #1353 Delete old test classes that no longer work or are referenced anywhere.
Change-Id: Idcd6f01985b73f6a29af1e69699798d23ffc2d22

Former-commit-id: bc1ca38eef [formerly a74be95da7] [formerly eef69ff910] [formerly bc1ca38eef [formerly a74be95da7] [formerly eef69ff910] [formerly e985aca148 [formerly eef69ff910 [formerly 881bff62599a078b6266483f79b8f2b2583fa6e0]]]]
Former-commit-id: e985aca148
Former-commit-id: aece2ae77b [formerly f8fb1d2748] [formerly 9beb34452e8ea6a26424b15d580ca83b7843de7b [formerly 104e7e54ee]]
Former-commit-id: 59fcd7624285873982c2fce7175d62367bc9cd26 [formerly 1c1c17a7a6]
Former-commit-id: 237669c533
2012-12-05 16:06:19 -06:00
Roger Ferrel
f929866580 Issue #1353 Changes for non-blocking FFTIControlDlg.
Change-Id: Idf182e728a60d55aeb671201396c97beb3752bb3

Former-commit-id: 343c2c25dd [formerly d509833714] [formerly b81d12f775] [formerly 343c2c25dd [formerly d509833714] [formerly b81d12f775] [formerly 171dd5c3bf [formerly b81d12f775 [formerly 8bf40b32fc3d9e0fa11133d8fb7ac94e6dcf4c05]]]]
Former-commit-id: 171dd5c3bf
Former-commit-id: 6d48ea303b [formerly 778100f3d6] [formerly 8658544258904029f7bf236ea6d3f1c93481904d [formerly 2f3b693576]]
Former-commit-id: b1e3e6c68a6392af3436ed15b6f0adde84a61aa6 [formerly 48943302fe]
Former-commit-id: 8afb72099b
2012-12-05 15:45:43 -06:00
Richard Peter
a6a0ddc99c Merge "Issue #1390 move envelope reprojection to from COntourSupport to MapUtil" into development
Former-commit-id: 5675181913 [formerly d976904786] [formerly 67c0b0245c] [formerly 5675181913 [formerly d976904786] [formerly 67c0b0245c] [formerly 3d342ebd0b [formerly 67c0b0245c [formerly 08986d69d56c407038f905b973321cdaf7839894]]]]
Former-commit-id: 3d342ebd0b
Former-commit-id: 58d8c919ae [formerly 7e1b51854d] [formerly 828dca1ca43f304fee8a7a5653815a4b3e748109 [formerly 98b33be553]]
Former-commit-id: 0867836bf4fff12c75b4ad30188ae0cb9de53c45 [formerly fdbd2b97bc]
Former-commit-id: ac9458ea54
2012-12-05 13:01:50 -06:00
Nate Jensen
d52d7056b9 Merge "Issue #1364 PointsDataManager changed to no longer use File.separator." into development
Former-commit-id: bf59e80201 [formerly 58fc02d3fd] [formerly 320e1f5f43] [formerly bf59e80201 [formerly 58fc02d3fd] [formerly 320e1f5f43] [formerly e49dcf4490 [formerly 320e1f5f43 [formerly 508d298d9e40394679b038977957947fe8f688ab]]]]
Former-commit-id: e49dcf4490
Former-commit-id: fd5d2b7e9b [formerly ea92da516b] [formerly 2d0da0e08f76166a640b061575e03e64bb4f7369 [formerly 9230c9cc82]]
Former-commit-id: d799af4b0d3677b65cd47eba940de9789e2b133a [formerly bde1af9985]
Former-commit-id: 7ba996149b
2012-12-05 12:50:52 -06:00
Ron Anderson
1b494ca8b2 Merge "Issue #1328 Made GFE use descriptor for time matching and time storage and manipulation" into development
Former-commit-id: 95fc1169a3 [formerly b93cfaf286] [formerly 55cc75b5f0] [formerly 95fc1169a3 [formerly b93cfaf286] [formerly 55cc75b5f0] [formerly 6c354222ac [formerly 55cc75b5f0 [formerly 424fb6edb9314a2fc90c27cf31cc13ff1ab4a594]]]]
Former-commit-id: 6c354222ac
Former-commit-id: 20c5f72340 [formerly 45edaa3b68] [formerly 0008c91401b4d4c1af51a21b73f7c3875145cb57 [formerly e241aa7db2]]
Former-commit-id: a510ef22f3d0a09d6161ad0853a222907e03bbc8 [formerly 3e28991c6f]
Former-commit-id: f4bde3e264
2012-12-05 12:42:48 -06:00
Roger Ferrel
f4d72e4895 Issue #1364 PointsDataManager changed to no longer use File.separator.
Change-Id: I619cb6670e0e73b19b040e7acce918d0c2eebeb3

Former-commit-id: 293f5947e4 [formerly d500d560c5] [formerly dcc2201b07] [formerly 293f5947e4 [formerly d500d560c5] [formerly dcc2201b07] [formerly b55ceb3f36 [formerly dcc2201b07 [formerly 2dc070320d9e5f9a4154f0007c708016d7f2cd8f]]]]
Former-commit-id: b55ceb3f36
Former-commit-id: 47b67efba1 [formerly fb55a378ad] [formerly f454a1412ecad3afccf69acd0eec0b702d4622f2 [formerly 6fc0163e37]]
Former-commit-id: a6c7e9dc7a8183d6f2b7b48dae18741d6c281c2f [formerly 4c93e28a82]
Former-commit-id: 0f90df2723
2012-12-05 12:11:18 -06:00
Ben Steffensmeier
b19aff135e Issue #1390 move envelope reprojection to from COntourSupport to MapUtil
Former-commit-id: 68569242ec [formerly 8ba69b5683] [formerly 595b732066] [formerly 68569242ec [formerly 8ba69b5683] [formerly 595b732066] [formerly 9b2389dd7e [formerly 595b732066 [formerly 3cd041526b5f827bcdc2ef846b2a04ca71e37c99]]]]
Former-commit-id: 9b2389dd7e
Former-commit-id: d8f06fa3ad [formerly 0af2ec4f0a] [formerly 500683c2263b9e5b2543c02fb4413a4a3f6fa55e [formerly 6bd25a7cfc]]
Former-commit-id: 2d96d12e5578c234a71b3ab208a37aafaf8c4ec5 [formerly b186b3f10c]
Former-commit-id: f050bf8ef0
2012-12-05 10:47:54 -06:00
Richard Peter
820a501b76 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: 320f0db47d [formerly ea5314b983] [formerly 970f1fc201] [formerly 320f0db47d [formerly ea5314b983] [formerly 970f1fc201] [formerly f279d478f8 [formerly 970f1fc201 [formerly 251535242b781031c5324708db7be1127844c6d0]]]]
Former-commit-id: f279d478f8
Former-commit-id: a20520a3dd [formerly 5597c522e0] [formerly 89887bf85b48b6bbeb94c26f4d79cf4b3a42933e [formerly 35e382251d]]
Former-commit-id: 3f43a28c2de9f09c4d0001420be862c80f48dac0 [formerly e79fa94195]
Former-commit-id: 849eedffb2
2012-12-04 16:15:16 -06:00
Richard Peter
9817b58dac 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: e1eb022847 [formerly 60de2da63d] [formerly 9086b40a2f] [formerly e1eb022847 [formerly 60de2da63d] [formerly 9086b40a2f] [formerly cef8be2e64 [formerly 9086b40a2f [formerly bec1c58fdbea0aff7bfaace01d0bb0274f5c0643]]]]
Former-commit-id: cef8be2e64
Former-commit-id: be2b9604fa [formerly 691db16613] [formerly 976134b7009f1e0e7c2030149311de111c1ea507 [formerly 30eec037c3]]
Former-commit-id: 5f7ff8a09dace89fe8cac2e21e9fb2a1e2449880 [formerly dd36773776]
Former-commit-id: 51c0a0efed
2012-12-04 14:34:49 -06:00
Ben Steffensmeier
46632ba247 Issue #1387 updated style rules for RFC-FFG products, fixed never ending Requesting Gridded Data when RFC-FFG is loaded
Former-commit-id: 0aa85c1c28 [formerly 45220299f9] [formerly 95dc87b6cf] [formerly 0aa85c1c28 [formerly 45220299f9] [formerly 95dc87b6cf] [formerly e44db81177 [formerly 95dc87b6cf [formerly 26abcb77b1b1157ce6e8bc5bda28202430f2d4f7]]]]
Former-commit-id: e44db81177
Former-commit-id: 9b86fc6221 [formerly d3456e3ee3] [formerly 621f07af3d6794831b815542020e9c529dd63003 [formerly e1b134aa35]]
Former-commit-id: 6d56fa25ba1d3046692504fc07bd5d96ad7e214f [formerly d5d586c967]
Former-commit-id: 805b9ff1ff
2012-12-04 14:09:28 -06:00
Ben Steffensmeier
d577b7eb00 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: 9cf868a9bb [formerly f4c534a556] [formerly 038e87f4b0] [formerly 9cf868a9bb [formerly f4c534a556] [formerly 038e87f4b0] [formerly d0e8e3b1c3 [formerly 038e87f4b0 [formerly e804d35462beea4483d6c0b01f3f61a2576b8098]]]]
Former-commit-id: d0e8e3b1c3
Former-commit-id: a6b0550c86 [formerly e23992352e] [formerly 6989c96b12a5b485bafb9ed6f457aa4f1e7e3ee1 [formerly 7f18e0bbee]]
Former-commit-id: f3722a22e3c3e495c7079e572bb8b08a20bad1a5 [formerly 6d6d3bbb35]
Former-commit-id: 5f588f1b55
2012-12-04 12:49:50 -06:00
Ben Steffensmeier
d18d322d19 Issue #1371 fix offscreen rendering on graphics cards that don't support luminance.
Former-commit-id: 78e9553fcc [formerly a980e67c9c] [formerly 16b918000e] [formerly 78e9553fcc [formerly a980e67c9c] [formerly 16b918000e] [formerly 73dbed5bfc [formerly 16b918000e [formerly 4c620ffc4a6df585c67b41868ec1b28dab21a7e4]]]]
Former-commit-id: 73dbed5bfc
Former-commit-id: 09a3a976e3 [formerly 979e0ccc4e] [formerly d50a723a5f3f8ee10034ca4246ae5e1c170ca48d [formerly 4a6fc8ea28]]
Former-commit-id: fc77598ab18a72d2182c06b49262dc43304ee304 [formerly b384be652b]
Former-commit-id: 286b4f5dcf
2012-12-04 12:28:43 -06:00
Richard Peter
d2eb6cea46 Merge "Issue #1380 fix kml handling of uninitialized coor bars." into development
Former-commit-id: bf6c3ef4d5 [formerly 5bb646638d] [formerly 2248bf0f53] [formerly bf6c3ef4d5 [formerly 5bb646638d] [formerly 2248bf0f53] [formerly 50f2d6ab93 [formerly 2248bf0f53 [formerly 4187da110efb8e261aaa92c2b537e461df01ecc1]]]]
Former-commit-id: 50f2d6ab93
Former-commit-id: 8681aa0f62 [formerly 6e65a592f4] [formerly 2d5d972ec19feb8d5eeb7135b547a6af6d9a5109 [formerly 75a74fe4bc]]
Former-commit-id: 608168efa8e1a3ca3b6b78c789f2229f515bb838 [formerly f408803e8c]
Former-commit-id: 4fc5e57dfb
2012-12-04 10:37:23 -06:00
Roger Ferrel
f39ceebd46 Issue #1353 Fix messed up merge for GhgFilterDlg and GhgMonitorDlg.
Change-Id: I35d6d6b1a66887e6c8af4b43267ecc3fef079b2c

Former-commit-id: 3160bce884 [formerly 1a53158248] [formerly 9ce284e2d9] [formerly 3160bce884 [formerly 1a53158248] [formerly 9ce284e2d9] [formerly c4e925aba1 [formerly 9ce284e2d9 [formerly 8904b7a7cfb3fdd9e2c28f2799550bed863e72ec]]]]
Former-commit-id: c4e925aba1
Former-commit-id: d4ead8c154 [formerly 4e2a3a69f1] [formerly 26010147de9e525d488a1a60f2fac3147991c5ef [formerly 61930c5532]]
Former-commit-id: 9ef86eca0336f791389bdfe04279e8a8cbecf3d7 [formerly 7c0913de25]
Former-commit-id: 4a2568b80f
2012-12-03 17:13:04 -06:00
Ben Steffensmeier
6e962adfef Issue #1380 fix kml handling of uninitialized coor bars.
Former-commit-id: fc3a59d796 [formerly 5040239f69] [formerly 0418beb8c7] [formerly fc3a59d796 [formerly 5040239f69] [formerly 0418beb8c7] [formerly 1828fcbccf [formerly 0418beb8c7 [formerly 31189d6a6ca7a97220f2713f067c27e9bb415fd1]]]]
Former-commit-id: 1828fcbccf
Former-commit-id: 242ea756de [formerly 1c508fc105] [formerly 4af344ddcea63070ee5636c11476c5bc7bc9cb20 [formerly ba7f4d2e71]]
Former-commit-id: 3f975eb81366fda48a50c613ef2d948aba3184f9 [formerly c94c7901af]
Former-commit-id: 04d22c0f2b
2012-12-03 15:21:20 -06:00
Lee Venable
0ffbb6aaa7 Merge "Issue #1353 Changers for non-blocking GhgFilterDlg and GhgSaveDeleteFilterDlg." into development
Former-commit-id: 14a370c1cb [formerly df15966db4] [formerly a8deaf8406] [formerly 14a370c1cb [formerly df15966db4] [formerly a8deaf8406] [formerly 58366542fe [formerly a8deaf8406 [formerly 1be8fb92dc4eb8e8fa628fb42a6a08431a4c2641]]]]
Former-commit-id: 58366542fe
Former-commit-id: 3293bdf216 [formerly 9169d6610b] [formerly b30287b9e8ae1ee8cb6791979b908b32a83d2dca [formerly bcd1c722bf]]
Former-commit-id: b0f300f6ddf9ffb4504cef14be035f3e936ed57b [formerly a7c74a846f]
Former-commit-id: 1f292aa0ba
2012-12-03 13:27:34 -06:00
Lee Venable
2a35a05540 Merge "Issue #1353 Changes for non-blocking RetrieveMergeDlg and LoadSaveDelteSelectDlg close callbacks added to FFFGDlg." into development
Former-commit-id: 840ed57de0 [formerly 696fb95b92] [formerly 6a187c705a] [formerly 840ed57de0 [formerly 696fb95b92] [formerly 6a187c705a] [formerly a0ba84d5e0 [formerly 6a187c705a [formerly e433fbe19e51138c78f69b8a3a89decffbb75f13]]]]
Former-commit-id: a0ba84d5e0
Former-commit-id: 7272abb525 [formerly 370f18863b] [formerly 48c130595df949d7d60e2cc3f2ed249a714d36f8 [formerly e76cb36b09]]
Former-commit-id: 3e0ac1a79db6c6bd8bd09a5149919a82893ede4b [formerly 0f16eccdee]
Former-commit-id: 9a2d14837a
2012-12-03 13:09:53 -06:00
Dustin Johnson
60f5576f5e Issue #1377 Break registry dependency on data delivery
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea

Former-commit-id: eda8a2208f [formerly 6d1831b002] [formerly bba092f51e] [formerly eda8a2208f [formerly 6d1831b002] [formerly bba092f51e] [formerly 529238d010 [formerly bba092f51e [formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]]]]
Former-commit-id: 529238d010
Former-commit-id: 46c2b31f91 [formerly 5953c5372f] [formerly a57882853f80c6e174dda103c8aec580f19821e6 [formerly 1b165c8e73]]
Former-commit-id: 500c5eb369844a461c4870f114119e1e9ecc28b9 [formerly 5731299558]
Former-commit-id: 5f51b0b3f8
2012-12-03 12:06:32 -06:00
Roger Ferrel
289180881f Issue #1353 Changers for non-blocking GhgFilterDlg and GhgSaveDeleteFilterDlg.
Change-Id: I9a6278ea75eda3f8bc9666f6ae41451b255cb223

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

Former-commit-id: 42fae1b228 [formerly 1ba00e7eab] [formerly 6eb1c3cac3] [formerly 42fae1b228 [formerly 1ba00e7eab] [formerly 6eb1c3cac3] [formerly 45a957ebf3 [formerly 6eb1c3cac3 [formerly 5c23c4d932b4a4ae2274c58fe5257be9a46c7076]]]]
Former-commit-id: 45a957ebf3
Former-commit-id: 40263371fe [formerly 061b0ca7ef] [formerly 32dd5f7473c1019a9ed7ca99656c414b3bb16f36 [formerly 3bdff81196]]
Former-commit-id: afc6bd75d095d9ce9693bd196acb7047caf8345d [formerly 72eb575336]
Former-commit-id: f6650e79ac
2012-12-03 10:24:18 -06:00
Lee Venable
e42ff23ef5 Merge "Issue #1353 Chagnes for non-blocking GhgColorDlg and GhgMonitorDlg." into development
Former-commit-id: 508fab5c48 [formerly a39a0d5e8a] [formerly 93024b2e94] [formerly 508fab5c48 [formerly a39a0d5e8a] [formerly 93024b2e94] [formerly 0d3b988a73 [formerly 93024b2e94 [formerly 7e628df1a120757a29a0a2a691103f25f4b92cf9]]]]
Former-commit-id: 0d3b988a73
Former-commit-id: 88d88a7ed6 [formerly 2aebd77b15] [formerly 1df378fe0b2df5aff6ba73eb46c128c8d2aea39c [formerly a286ebd2e7]]
Former-commit-id: 69e0706b7860b40435cdd20a7cc2d133abfc331a [formerly 02982f29d5]
Former-commit-id: 3fc8d7ec53
2012-12-03 08:51:05 -06:00
Lee Venable
b8c411e6e5 Merge "Issue #1353 Changes for non-blocking FFFGDlg, AboutDlg, AcknowledgmentsDlg and HelpDlg dialogs." into development
Former-commit-id: 2801275155 [formerly e35e996f83] [formerly 8814b9f60c] [formerly 2801275155 [formerly e35e996f83] [formerly 8814b9f60c] [formerly 9847ce1342 [formerly 8814b9f60c [formerly e551f490df4fed58de7150110214b5728c94a0a6]]]]
Former-commit-id: 9847ce1342
Former-commit-id: 7602d688f7 [formerly 8bf39671de] [formerly 80d03c38da741a9e292c29163583af7b7a426157 [formerly 76c5005d07]]
Former-commit-id: 44f9500e6bbb73047862704d93bdbe3ce776be30 [formerly 3f7f68ebf8]
Former-commit-id: 53686315b2
2012-12-03 08:50:36 -06:00
Max Schenkelberg
0a1a51c6ef 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: a614307c95 [formerly b744ba68e0] [formerly 624cafb066] [formerly a614307c95 [formerly b744ba68e0] [formerly 624cafb066] [formerly 1328deac56 [formerly 624cafb066 [formerly 974ef3068d48244ca622edc17045266cc34b6468]]]]
Former-commit-id: 1328deac56
Former-commit-id: c9f3a07ac0 [formerly 47c7518388] [formerly b86ec7c1b619648b5b662c8f776712e299e94036 [formerly c5536a9a84]]
Former-commit-id: 53e8d333e59bfe0fb923f0e1ef352a70cc918e0d [formerly b1c2bf1cc4]
Former-commit-id: a488900f51
2012-11-30 14:17:50 -06:00
Nate Jensen
36b53c1a37 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: 7d54baa54c [formerly f397c00218] [formerly e17a176b94] [formerly 7d54baa54c [formerly f397c00218] [formerly e17a176b94] [formerly e4edf2f060 [formerly e17a176b94 [formerly 3bd66b30e6d23f8f4308c3587b9873aaec37bb71]]]]
Former-commit-id: e4edf2f060
Former-commit-id: 578cce07de [formerly 7caf683acd] [formerly fd7ddbf7751147b09f4f702eb610699597565784 [formerly 23c70ac8f2]]
Former-commit-id: 5868a3e0590d4194e4ad85822e4d34a206ee57f1 [formerly 0327a255a6]
Former-commit-id: b91a90ab8d
2012-11-30 11:08:22 -06:00
Ben Steffensmeier
fef62925c4 Issue #1370 fix exception that occurs when cubes of derived parameters are only partially available.
Change-Id: Icd7a7acc2447d7a0d9cebe3107ea05281c2c4bbe

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

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

Former-commit-id: 7a2cd0f6ae [formerly 55ddd1bce6] [formerly 4649d1becd] [formerly 7a2cd0f6ae [formerly 55ddd1bce6] [formerly 4649d1becd] [formerly 4dcb533215 [formerly 4649d1becd [formerly 9a1620b31f1ef86c19c4d3c3dd53ee29161e5f60]]]]
Former-commit-id: 4dcb533215
Former-commit-id: e60ff1cb9f [formerly bf610cc4f3] [formerly 3a9ae35aceedd3910b926b2e739638626abd0529 [formerly f761ed04b9]]
Former-commit-id: 77fde028af3c9e90bcf921635b1ea0ee7aa555a0 [formerly 98c067a76c]
Former-commit-id: fe94c3a9eb
2012-11-29 11:13:47 -06:00
Steve Harris
29de351acf Merge "Issue #1273 product browser re-orders for all applicable data types" into development
Former-commit-id: cf2d513d6a [formerly cf3bc24cd3] [formerly ff6bd410f6] [formerly cf2d513d6a [formerly cf3bc24cd3] [formerly ff6bd410f6] [formerly 94fb2d77eb [formerly ff6bd410f6 [formerly 8e9849915099639b7a3943c128ed39b7371bda9d]]]]
Former-commit-id: 94fb2d77eb
Former-commit-id: d96c86345a [formerly 95dec9ace7] [formerly 252aaa5f3b7316fc9dc6b12a342fb6f2ae1be5c2 [formerly 6c07e54f85]]
Former-commit-id: a069f2ffaa8ca7b511d60a5b19d0fc165407df97 [formerly b00d97348d]
Former-commit-id: 409d87c0de
2012-11-29 10:53:54 -06:00
Max Schenkelberg
8215537399 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: a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly ed77d56a84 [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]]
Former-commit-id: ed77d56a84
Former-commit-id: 1f8c88490a [formerly f681c1304c] [formerly 9fbbf5fdd49d3393d497c172fb165e221cdc3c0c [formerly b24440cc37]]
Former-commit-id: c5ee37a2251945312e76e97b444e5dc6495a440a [formerly b8b98a78c3]
Former-commit-id: a7b239f9c1
2012-11-29 10:29:36 -06:00
Matt Nash
1c50091222 Issue #1273 product browser re-orders for all applicable data types
Change-Id: I8612578d239119e9df22724ebb0bc100cf7826af

Former-commit-id: 3ec3104feb [formerly 5fa5302739] [formerly 3f2c497286] [formerly 3ec3104feb [formerly 5fa5302739] [formerly 3f2c497286] [formerly 73a0b0da75 [formerly 3f2c497286 [formerly c4e2ff5e1b4f22b1bf712f26dea71ab8d15a75f1]]]]
Former-commit-id: 73a0b0da75
Former-commit-id: d2fe46ce1a [formerly 7687db01f4] [formerly 009331e4c9c0ec761422e6c0b20ed4b8c91a5a2d [formerly 1b2d3d642d]]
Former-commit-id: be148945847e4ab601d6ac04786d8d6f0c3ac2f8 [formerly 2c4164decc]
Former-commit-id: d72df0dc66
2012-11-29 09:54:50 -06:00
Bryan Kowal
ecaf5b86dd 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: 8fe14a9a60 [formerly 3a4ca9582d] [formerly d3b455c955] [formerly 8fe14a9a60 [formerly 3a4ca9582d] [formerly d3b455c955] [formerly f99d351995 [formerly d3b455c955 [formerly ca0b97b8d8db19900107ab38f6a6af8a9ee7b935]]]]
Former-commit-id: f99d351995
Former-commit-id: 7c25f7a517 [formerly ae64e9ce3b] [formerly e09ce067241433822f5df68635984933d876ecc4 [formerly b0c65323b6]]
Former-commit-id: 1c92174acee3e52589c731c91b5fe228e8000580 [formerly 774d3a8f8d]
Former-commit-id: 49f45e1901
2012-11-28 16:30:10 -06:00
Roger Ferrel
98dd129a7f Issue #1363 The intance of PythonGuidanceJob can now be created on any thread.
Change-Id: I4f24c904007df455aee557cd80cac8836da3d517

Former-commit-id: 9b6bf382f7 [formerly 7b5f60f2cc] [formerly 5fde71e598] [formerly 9b6bf382f7 [formerly 7b5f60f2cc] [formerly 5fde71e598] [formerly e7d453bd77 [formerly 5fde71e598 [formerly 1640c177e60e8e3ba522568a662bedda0cd7546e]]]]
Former-commit-id: e7d453bd77
Former-commit-id: 9fab4bca56 [formerly e2b28b7f96] [formerly 252282391a361f02e921c16d8c1e364551da52db [formerly 48c5724c06]]
Former-commit-id: 9f40952f1a9f9b67eeb8067d8309e6c6bbd2c268 [formerly 8a4e89e6dd]
Former-commit-id: 63977010d3
2012-11-28 10:05:11 -06:00
Roger Ferrel
83bf833ee9 Issue #1353 Chagnes for non-blocking GhgColorDlg and GhgMonitorDlg.
Change-Id: If434b0e6a2ada677bb81fc49b7165e20d3041b17

Former-commit-id: ef04ec46cf [formerly c9fd0d3b06] [formerly fdcd4f519a] [formerly ef04ec46cf [formerly c9fd0d3b06] [formerly fdcd4f519a] [formerly 04a7b91150 [formerly fdcd4f519a [formerly cca0279fe7d8a4e811f81f3c929f24b21eecd1e4]]]]
Former-commit-id: 04a7b91150
Former-commit-id: 2f0c2fd382 [formerly eac135896d] [formerly f6e54e38f0dd4ff8e1cf16e22f3c0a7c332e67a9 [formerly 1f745272cb]]
Former-commit-id: 6a8fdabc15ddf05de87021c8cde894820cf63e46 [formerly 7720709aef]
Former-commit-id: 853def22f6
2012-11-28 07:48:30 -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
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
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