Commit graph

1237 commits

Author SHA1 Message Date
Nate Jensen
9556951f49 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 de5960d0fb [formerly c34ff0c0b8] [formerly decb23f4ae] [formerly 773ff8c027 [formerly decb23f4ae [formerly 273aed63277891eb091817c5769fe53ef3813759]]]]
Former-commit-id: 773ff8c027
Former-commit-id: fe3f2f7c0d [formerly a3fb320e10] [formerly c2edeadb95aaf18b91f1716790c340e31a0760a3 [formerly 5b1ca237b2]]
Former-commit-id: 00a0ac4302a895a30fc61f782821ddf0cf0a16a3 [formerly 22c47a870a]
Former-commit-id: ff01a406c8
2012-12-11 12:42:51 -06:00
Steve Harris
db5990243a Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]]
Former-commit-id: ce72ebb094
Former-commit-id: 88f9070c93 [formerly 15849ae72a] [formerly 638be45c65cc1e7b65d1b4e332046932a30ff790 [formerly 113fdcb679]]
Former-commit-id: 90d18a302d7bff79b3ebe72d11d8f08efc5f661a [formerly db24093e42]
Former-commit-id: 868acb808b
2012-12-11 08:56:54 -06:00
Steve Harris
179755f156 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 d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]]
Former-commit-id: f6988eefff
Former-commit-id: 377804398b [formerly f02c1ef71d] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]]
Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerly ebcc9975c4]
Former-commit-id: b0a60923c4
2012-12-11 08:45:53 -06:00
Ben Steffensmeier
6016d9fbb7 Issue #1362 create a new resource handler when nsharp is created in a side pane.
Former-commit-id: 2e1d72fd12 [formerly 50ff73809f] [formerly 52497f5630] [formerly 2e1d72fd12 [formerly 50ff73809f] [formerly 52497f5630] [formerly 0eb454f0d4 [formerly 52497f5630 [formerly 62cb0df39d0c24edc80d635f3bf90d2abc564b04]]]]
Former-commit-id: 0eb454f0d4
Former-commit-id: 0f710623ff [formerly d2f5643093] [formerly 0389e78f6ec248b75fa1097fd1938b3fb3461458 [formerly 84fa621b55]]
Former-commit-id: f2c53adcf6ec90921cff3b18b5270ef924ee61dd [formerly c45e8c3123]
Former-commit-id: cc5e452d3f
2012-12-10 17:58:04 -06:00
Roger Ferrel
b544c9205d Issue #1353 Changes for non-blocking DamDisplayControlDlg.
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475

Former-commit-id: 57bad75093 [formerly f9a8d30c4d] [formerly 35261a7964] [formerly 57bad75093 [formerly f9a8d30c4d] [formerly 35261a7964] [formerly 40b8e4ec57 [formerly 35261a7964 [formerly 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a]]]]
Former-commit-id: 40b8e4ec57
Former-commit-id: c6b6263dc8 [formerly 80d7309ea7] [formerly df96fece3ee8f724089352eddd79ab3cbf5a43eb [formerly fdad99bcc8]]
Former-commit-id: 8719df88dc6d6a0d15d4d2045bc3bb20f4fe5184 [formerly 387c5d0e36]
Former-commit-id: d8640632cd
2012-12-10 11:30:06 -06:00
Lee Venable
6b1bb76de2 Merge "Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg." into development
Former-commit-id: a494177cff [formerly 3a4eb415f2] [formerly 59b2cf8872] [formerly a494177cff [formerly 3a4eb415f2] [formerly 59b2cf8872] [formerly 8e7143967b [formerly 59b2cf8872 [formerly 050d9cebb8de520c7ed0d27c686ebf84dc6d084c]]]]
Former-commit-id: 8e7143967b
Former-commit-id: 7b4033f4f4 [formerly 17b9e0077c] [formerly 734ccd218f6db5c98ef93ca7c3ed02548f8ef5ba [formerly f3b9d1cb38]]
Former-commit-id: 02b213241de9f87d67936e3bc2157c566db5c545 [formerly b6e267419c]
Former-commit-id: 5e23a89003
2012-12-10 11:28:34 -06:00
Roger Ferrel
95611a3de2 Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481

Former-commit-id: b5ff90958b [formerly f72e89ad2c] [formerly 921566317a] [formerly b5ff90958b [formerly f72e89ad2c] [formerly 921566317a] [formerly 81966d39fc [formerly 921566317a [formerly 62cdaba1d9e59c77efe6253105582894cd8596a0]]]]
Former-commit-id: 81966d39fc
Former-commit-id: d6787b7477 [formerly bc26433783] [formerly 989bb37959e7fc26d621af08b76f25afbe60302b [formerly 053584c4e2]]
Former-commit-id: 7166d6086831198d6a7eb8718ab6c141ecd6a9d3 [formerly 039b95d202]
Former-commit-id: 50bf368b38
2012-12-07 14:43:53 -06:00
Slav Korolev
f900e2b22f Issue #1351. Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file.
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6

Former-commit-id: 466abfbc1c [formerly 829899374d] [formerly 48f074eb72] [formerly 466abfbc1c [formerly 829899374d] [formerly 48f074eb72] [formerly 1a510a9f61 [formerly 48f074eb72 [formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]]]]
Former-commit-id: 1a510a9f61
Former-commit-id: 46dfd61a44 [formerly a0d07a46f9] [formerly 20c7c17714ef04302d273f0fbac8ec2a7208298e [formerly 6bf265624d]]
Former-commit-id: 12c5585c0e0ccb7bda561900b86f3f8c4fae5f7b [formerly 0b82d18c64]
Former-commit-id: 2d3674e3c2
2012-12-07 15:18:03 -05:00
Nate Jensen
a4386c4dcf Merge "Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw" into development
Former-commit-id: 5c772dc93e [formerly 80c743ac8b] [formerly 4867cd2a64] [formerly 5c772dc93e [formerly 80c743ac8b] [formerly 4867cd2a64] [formerly a505d78463 [formerly 4867cd2a64 [formerly 6ae7f9a4947420a6985ecbe2834f9c9fc9f5cac4]]]]
Former-commit-id: a505d78463
Former-commit-id: 3c9215fbc5 [formerly 7b004618b5] [formerly 93b31715757234f76e490ab3f956e4f601a58bbb [formerly ef76ea6d61]]
Former-commit-id: 7f7d5b85868c6816542163cbec3ae6340e6c877b [formerly 50d01007dc]
Former-commit-id: 8d184d92cd
2012-12-07 13:32:29 -06:00
Lee Venable
4db2c231f1 Merge "Issue #1353 old test code classes." into development
Former-commit-id: efc40939d2 [formerly 4ae765fc4f] [formerly 0d74bf9e67] [formerly efc40939d2 [formerly 4ae765fc4f] [formerly 0d74bf9e67] [formerly 4e13d01e67 [formerly 0d74bf9e67 [formerly 54765a26d6ca098133ff1e0b16c56e94e4053f74]]]]
Former-commit-id: 4e13d01e67
Former-commit-id: 46213ccf36 [formerly 78a124efe3] [formerly 79313bdf07a36dec78d0c48fa9a4e0c1a9dca532 [formerly fa143bd2e1]]
Former-commit-id: 130756667c1327fb43e3ede52c493c81c2384467 [formerly e4c65073b1]
Former-commit-id: b0f681e903
2012-12-07 13:22:46 -06:00
Nate Jensen
0895623c80 Merge "Issue #1396 fix thin client" into development
Former-commit-id: f844311001 [formerly 206e288594] [formerly 01c27ce5aa] [formerly f844311001 [formerly 206e288594] [formerly 01c27ce5aa] [formerly f577fc578d [formerly 01c27ce5aa [formerly 4ec3746745f0983226db5e0b9e4969ef0885c44f]]]]
Former-commit-id: f577fc578d
Former-commit-id: 2afce25dae [formerly 94bc1dc9ae] [formerly ebc1ad236803924927d5fa606cb7719944c83330 [formerly 7257650eea]]
Former-commit-id: 6b9aa6166ec15f5c5507c8bfb391099a346e64c1 [formerly fa676a5cf1]
Former-commit-id: df8e16bd63
2012-12-07 13:18:41 -06:00
Lee Venable
3757702bbc Merge "Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs." into development
Former-commit-id: abb4cb535a [formerly 6a8ae7c255] [formerly ee2572e7c0] [formerly abb4cb535a [formerly 6a8ae7c255] [formerly ee2572e7c0] [formerly 650420354f [formerly ee2572e7c0 [formerly c94fde29a1e43467378bc11100fbe0fdfcf7a51a]]]]
Former-commit-id: 650420354f
Former-commit-id: 59a002705f [formerly dfb7dfc55a] [formerly 5803c9d1d198a1e506572941e9572feb2c55dab4 [formerly e5cf7d4ba5]]
Former-commit-id: e8810097b52b40a7b41d2d8241670e60815d97c9 [formerly cdc302da70]
Former-commit-id: 051cf6dcdd
2012-12-07 13:02:53 -06:00
Lee Venable
fa3a0b96b4 Merge "Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments." into development
Former-commit-id: f58f5cc4ed [formerly bf83e5b5c6] [formerly 2c44afd3ab] [formerly f58f5cc4ed [formerly bf83e5b5c6] [formerly 2c44afd3ab] [formerly 37b91cccb0 [formerly 2c44afd3ab [formerly 4bab9df17245e28128644fcdbfb8bac6d4c6dc7e]]]]
Former-commit-id: 37b91cccb0
Former-commit-id: f6646b8740 [formerly b33bdc354e] [formerly bc9b5eb2d123fbb8428632e7961a9e398a1b7f54 [formerly 78af1aa566]]
Former-commit-id: f0f3069aed67ed2f874c44e4c62a9a5c868d66fb [formerly 9ee06391e8]
Former-commit-id: f17c2d0bc0
2012-12-07 12:52:44 -06:00
Nate Jensen
87e33eb8c2 Issue #1396 fix thin client
Change-Id: I58dc3f40594697d8332cc372f45f30bb28927100

Former-commit-id: 52b55cdf65 [formerly 851f8977f3] [formerly 020b84e373] [formerly 52b55cdf65 [formerly 851f8977f3] [formerly 020b84e373] [formerly 03e6f7ee16 [formerly 020b84e373 [formerly 1afd50427bff0a11ebbf99eb3b29d2d8c3e02c44]]]]
Former-commit-id: 03e6f7ee16
Former-commit-id: adad056c53 [formerly 7c0941e292] [formerly db935f8f15b87218882a4babaf96d3d58289cbba [formerly 496fa1ede9]]
Former-commit-id: 502d457e7e9a9564188a34109c31a23d6b0411b1 [formerly c1de3bcff5]
Former-commit-id: 0ffbeecd4e
2012-12-07 11:59:13 -06:00
Max Schenkelberg
68ab110a18 Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw
Change-Id: I8207e9e3082db861c8040858ef11dc67e63747da

Former-commit-id: 9ed56d2a16 [formerly 72f31d5f0c] [formerly d833d917db] [formerly 9ed56d2a16 [formerly 72f31d5f0c] [formerly d833d917db] [formerly d7c9ac3b84 [formerly d833d917db [formerly ba1d1a6bfe57466a6a0fe5864cd87ffefe61a2f8]]]]
Former-commit-id: d7c9ac3b84
Former-commit-id: 0950126c48 [formerly d0e091312a] [formerly b7f1408e11e1d131d4a8f3404d8ff6a088ea47fd [formerly e27d415da5]]
Former-commit-id: 640eddb6b3bdd325d525eeba62ec3457b59270fe [formerly 1fbb76abfd]
Former-commit-id: 40f67f7e54
2012-12-07 11:44:46 -06:00
Roger Ferrel
7a37daf4e2 Issue #1353 old test code classes.
Change-Id: I5b0f7a45ff6e00c669aa1acc6493350f90a66350

Former-commit-id: 9eaf793d9e [formerly 754afb9c52] [formerly cfb11d2d38] [formerly 9eaf793d9e [formerly 754afb9c52] [formerly cfb11d2d38] [formerly 327f35c657 [formerly cfb11d2d38 [formerly 51f185625e30425c1466a04d46b3eac39dfac4dc]]]]
Former-commit-id: 327f35c657
Former-commit-id: 612e60b3e5 [formerly ddab76526a] [formerly 18a577a20f1ef92a930b06ea70f0a6e023fceeec [formerly 125d271d40]]
Former-commit-id: be0b025f7787c6916ef88a85f2181857af1b1ec3 [formerly 88a2587cbc]
Former-commit-id: 6406fe0ecb
2012-12-07 11:27:31 -06:00
Max Schenkelberg
b183944982 Issue #1328 Fixed time matching error for 4-panel products where No Data Available on some of the panes
Amend: Changed time cache object to have single setter for setting fields, changed map to identity map

Change-Id: I598e9033187b794631d1dbfc78bb018084ec95cf

Former-commit-id: 0cda5a49ee [formerly dbc9141454] [formerly 8fc766ab05] [formerly 0cda5a49ee [formerly dbc9141454] [formerly 8fc766ab05] [formerly 424c6e0b1b [formerly 8fc766ab05 [formerly 9a5766f8a6bd61734b2f9e44aaabbef835d1d676]]]]
Former-commit-id: 424c6e0b1b
Former-commit-id: d05d9c1904 [formerly 9a978a9156] [formerly 598a914c099b0e3e8613a8f807aaaa1c214ae6c0 [formerly 4cb9cc5632]]
Former-commit-id: 68e92f951b16bc8ffce114577a92cd77f5d11e74 [formerly 87ad71d28d]
Former-commit-id: 057dc3019a
2012-12-07 11:24:44 -06:00
Slav Korolev
a9fabaf914 Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments.
Change-Id: I605f6819def85f197e37e13803627baec67e6786

Former-commit-id: 81d98a46f1 [formerly 349ea52e2b] [formerly a284f0f50f] [formerly 81d98a46f1 [formerly 349ea52e2b] [formerly a284f0f50f] [formerly b650fa6675 [formerly a284f0f50f [formerly 64fffb1598b943dc9890d2b9ee04a690c006bfe7]]]]
Former-commit-id: b650fa6675
Former-commit-id: 59753c678d [formerly b5fc4b6800] [formerly ab9c4b8c7dbfa4854adca6dd7fb1a100ffd79506 [formerly 1c16ed59c1]]
Former-commit-id: 14e2d036ba5337bb7759432348ef01359a1f5aaf [formerly 61d69bbccf]
Former-commit-id: 02ea1250da
2012-12-07 12:23:39 -05:00
Roger Ferrel
79b868a585 Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs.
Change-Id: Ie8589daa43e45a83835d119bdecc1674c7104ed0

Former-commit-id: 8d386b762a [formerly 991c64f0a9] [formerly 0c83b2a277] [formerly 8d386b762a [formerly 991c64f0a9] [formerly 0c83b2a277] [formerly 3cb0385a93 [formerly 0c83b2a277 [formerly c243a7bdb065db53dee2a01b251e5fbc5f1ec23e]]]]
Former-commit-id: 3cb0385a93
Former-commit-id: fd2e92a9b9 [formerly 351e3711fb] [formerly 38dca43e15ed38d02c589e769eeda53a1ff21ddc [formerly b6ae15b04e]]
Former-commit-id: 478b8fc2c0d7657d47cc5783722a4f6ccae64c3f [formerly b4d43d2d1e]
Former-commit-id: 1ae2cea7b1
2012-12-07 10:46:14 -06:00
Lee Venable
611cceb4d3 Merge "Issue #1353 Changes for non-blocking AttributeThresholdDlg, BasinTrendDlg and ConfigSummaryDlg." into development
Former-commit-id: 92e19a0119 [formerly 723e4845e9] [formerly ecb7946aa1] [formerly 92e19a0119 [formerly 723e4845e9] [formerly ecb7946aa1] [formerly 4630059ce6 [formerly ecb7946aa1 [formerly ca3afef8fe6a7a5840a35af569927a1e8e1a6bfd]]]]
Former-commit-id: 4630059ce6
Former-commit-id: f3fa72b26b [formerly a4bbcd2205] [formerly 6bac944e4f12bc2bafd1dcada9443de6f9e78591 [formerly 0d626354b8]]
Former-commit-id: 9be8a06de57b5e083e9d13d887c81b6dc359d539 [formerly d455c023a6]
Former-commit-id: eccc05f81c
2012-12-07 08:49:23 -06:00
Ron Anderson
464ceb1658 Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06

Former-commit-id: 0c849c04d7 [formerly 45914e0a46] [formerly bb163074fa] [formerly 0c849c04d7 [formerly 45914e0a46] [formerly bb163074fa] [formerly b6fcd999f4 [formerly bb163074fa [formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]]]
Former-commit-id: b6fcd999f4
Former-commit-id: 7c09ef9001 [formerly c5b3111795] [formerly a37aae4d7e209290f67a1eb565eee632c0e19fd2 [formerly 70cca3900b]]
Former-commit-id: 341f47a5a9d882b376fc4121ea445322390c9a2b [formerly 111c0495a4]
Former-commit-id: b02f3a733f
2012-12-06 17:02:56 -06:00
Ron Anderson
d582b42490 Issue #1395 Modified LineStyle to contain a definition of the style so that GL and SWT can render them the same way
Change-Id: I9e9875c3d56870309d4c5420a541674fb8733a09

Former-commit-id: 03dff87b0d [formerly 330e913cb2] [formerly 5143e82d4a] [formerly 03dff87b0d [formerly 330e913cb2] [formerly 5143e82d4a] [formerly 9398573f2f [formerly 5143e82d4a [formerly 6c2704dffcbadab19611464df580f781bb5ebefd]]]]
Former-commit-id: 9398573f2f
Former-commit-id: 76141bfc05 [formerly d42afa44dc] [formerly d82c8ff0301aef55921e5f77656fa41a6963ce17 [formerly 10479a1909]]
Former-commit-id: 793c4a33d940970a3c242820b41e2fe8e3155183 [formerly ddd26d1fbd]
Former-commit-id: bb50fa220a
2012-12-06 15:38:04 -06:00
Ron Anderson
8ea12b6e21 Issue #1395 Factored out AbstractMapHandler pattern
Change-Id: I24e9e12f10742292b04dbf31571f0adfe24e35cd

Former-commit-id: a6f52387eb [formerly 7ec03736a8] [formerly 91f8c043e1] [formerly a6f52387eb [formerly 7ec03736a8] [formerly 91f8c043e1] [formerly 87fbaf8ff4 [formerly 91f8c043e1 [formerly 522b3bd9cc24c1d75fe5fbdf6222e72ffb8a8468]]]]
Former-commit-id: 87fbaf8ff4
Former-commit-id: 3f21e14753 [formerly af067ab22c] [formerly 0c305e80ac175f8d1460d27b3bca7f90c499c2c8 [formerly 39509a66bb]]
Former-commit-id: c27f9d87c9f720a02c20cb06d316daaca5babc94 [formerly 39866900ea]
Former-commit-id: 1a27d852e1
2012-12-06 15:18:49 -06:00
Ron Anderson
9df312eb89 Merge "Issue #1369 fix geotiff import in CAVE" into development
Former-commit-id: 9fb87376b8 [formerly 617acaf0ee] [formerly 08547b0d36] [formerly 9fb87376b8 [formerly 617acaf0ee] [formerly 08547b0d36] [formerly f58e79f210 [formerly 08547b0d36 [formerly 2b5b3e68faa94c2d67b7fb4be5b21e58e6925350]]]]
Former-commit-id: f58e79f210
Former-commit-id: d46edf78e9 [formerly 426acf7c76] [formerly 669c077064f0d4adeb82acdaf866bb4adbef5421 [formerly b011ff05a9]]
Former-commit-id: f38d0f4711d1a5e6a93c7a723fd61c326e36de67 [formerly f090343fad]
Former-commit-id: 7fabf1b52e
2012-12-06 14:14:26 -06:00
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
Steve Harris
cedbde75e3 12.12.1-12 baseline
Former-commit-id: 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 79b0e973ef [formerly 69ab975fab] [formerly 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23]]
Former-commit-id: 54c80ccffc60d6ee8a544b475ed12355b32a2f26 [formerly 190378beeb]
Former-commit-id: f8a9ae24cb
2012-12-06 09:18:28 -06:00
Steve Harris
25facfa9a7 12.12.1-10 baseline
Former-commit-id: 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 45f5150eb6 [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]]]
Former-commit-id: 28018b8d9b
Former-commit-id: d2da55254b [formerly 8a41d325d2] [formerly e0830ae197e0ce5e3085d3fffa18fe7132792d42 [formerly 0c67cb78a3]]
Former-commit-id: b37b8565f1ec8f0e35f587d2337f734e0608c210 [formerly 8ada406bfe]
Former-commit-id: a10d7d3041
2012-12-06 09:12:15 -06:00
Steve Harris
5f22640e99 12.12.1-8 baseline
Former-commit-id: 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]]
Former-commit-id: 5093a7c442
Former-commit-id: a45a7fe1bf [formerly ff4131c2ee] [formerly 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735]]
Former-commit-id: d1f389a14d75a14807b83f7528cff619dda45f17 [formerly ec2cdc1593]
Former-commit-id: 0b22b3c014
2012-12-06 09:02:51 -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