Commit graph

1121 commits

Author SHA1 Message Date
Ben Steffensmeier
6ee146e0ed Issue #1459 fix interp function when data is shared amongst multiple parameters.
Former-commit-id: 167fe74ee7 [formerly f04c6b7e1e] [formerly 167fe74ee7 [formerly f04c6b7e1e] [formerly c0e9f3429b [formerly 9c8281cd26029e9b3979fbc8f0ed713b66f092ba]]]
Former-commit-id: c0e9f3429b
Former-commit-id: 76802aefa9 [formerly 93e6818a2d]
Former-commit-id: 4a051b3a57
2013-01-07 16:39:45 -06:00
Brad Gonzales
9fcb9f9179 Issue #1456 Added DualList.setSelectedList(ArrayList<String>).
Change-Id: I86765b965f90bf714ede8707c516287a91c64de7

Former-commit-id: 945d6be2c8 [formerly cf3a7e1455] [formerly 945d6be2c8 [formerly cf3a7e1455] [formerly e457297ceb [formerly 334782a0f7df272200196a3905d656d2fa3603d7]]]
Former-commit-id: e457297ceb
Former-commit-id: 66a5a6d5bc [formerly 7b0dc0478d]
Former-commit-id: a0a9a3027e
2013-01-07 16:08:18 -06:00
Richard Peter
7ef0bc956c Merge "Issue #1431 - Fix Dual List filter problem." into development
Former-commit-id: bed085536e [formerly e329929bd2] [formerly bed085536e [formerly e329929bd2] [formerly 9ab999ed33 [formerly d0bcfbc3ce548ef84dff78ba50de8b44627bf8a8]]]
Former-commit-id: 9ab999ed33
Former-commit-id: 1cb120525b [formerly 13fac27c76]
Former-commit-id: 1f5f1c5950
2013-01-07 13:15:32 -06:00
Bryan Kowal
1996f92f7e Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: ab8b346489 [formerly c8a43edd9e] [formerly ab8b346489 [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 6d7f57c62a [formerly 146c43a606]
Former-commit-id: 0136f9d5a3
2013-01-07 12:16:01 -06:00
Mike Duff
08d438cdbc Issue #1431 - Fix Dual List filter problem.
Former-commit-id: 71ce5aa249 [formerly ace6214c3f] [formerly 71ce5aa249 [formerly ace6214c3f] [formerly 7eb980fd83 [formerly 0fc212dac04a4693060ee0e321c532a3f5076e01]]]
Former-commit-id: 7eb980fd83
Former-commit-id: 0014c1073a [formerly 4757feb616]
Former-commit-id: d72d3db542
2013-01-07 09:19:01 -06:00
Steve Harris
b7f180d9d3 13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Dustin Johnson
3d9c459c10 Issue #1451 Allow overriding of IUserManager via ServiceLoader.
Change-Id: Iec63c05fe7365051e7bd1a01ecca701b5553c9e9

Former-commit-id: f5f6884b79 [formerly 452729a647] [formerly f5f6884b79 [formerly 452729a647] [formerly 19f1b30437 [formerly 46d756ba5cd37ae22fc31ae67dac0751c2c02985]]]
Former-commit-id: 19f1b30437
Former-commit-id: cdf08ea65a [formerly 818664e557]
Former-commit-id: a29d38f5f9
2013-01-04 12:34:43 -06:00
Dustin Johnson
1bc5b09603 Issue #1449 Add interface in front of VizApp task running methods
Change-Id: I4696782d800a836f347cf72738c6c0673314a492

Former-commit-id: f6e081d331 [formerly b9c9030d05] [formerly f6e081d331 [formerly b9c9030d05] [formerly dc61af2dea [formerly 3ed5c31344148559c0e5479f4b7955fcee7cb0a7]]]
Former-commit-id: dc61af2dea
Former-commit-id: 853ea19014 [formerly 19cdf2f57c]
Former-commit-id: 05951d66c6
2013-01-02 11:01:15 -06:00
Richard Peter
d58d5fbc2b Merge "Issue #1445 fix time range for accumulations" into development
Former-commit-id: f169ff1a6d [formerly 4512f39b31] [formerly f169ff1a6d [formerly 4512f39b31] [formerly 312f5ea6c3 [formerly 3057efc842920e3843a90005d4166c5b5d4814a6]]]
Former-commit-id: 312f5ea6c3
Former-commit-id: d2b6381d85 [formerly 7ac93e7ea3]
Former-commit-id: 4d7cb47c65
2012-12-21 10:14:10 -06:00
Ben Steffensmeier
3b9f1b2ae2 Issue #1445 fix time range for accumulations
Former-commit-id: e7db0f009c [formerly 144ddacb07] [formerly e7db0f009c [formerly 144ddacb07] [formerly bb557546bf [formerly 590d927da3f051ed033c41bc0c89108a25826759]]]
Former-commit-id: bb557546bf
Former-commit-id: 2a2f226b92 [formerly 403381dde1]
Former-commit-id: e80deb958f
2012-12-19 15:14:03 -06:00
Ben Steffensmeier
8af25f1870 Issue #1425 make contouring handle NaN better.
Former-commit-id: a1bda65a85 [formerly 1588e1b194] [formerly a1bda65a85 [formerly 1588e1b194] [formerly b4f100da04 [formerly c090b012a6fafb8816f0c17c1af6f14774f08d83]]]
Former-commit-id: b4f100da04
Former-commit-id: a7c1e74ac2 [formerly 06ae24cf4f]
Former-commit-id: 45d4ef7ea5
2012-12-19 13:23:28 -06:00
Max Schenkelberg
7f708ac427 Issue #1329 Fixed issues with tile intersection calculation.
Change-Id: I753abdfefc0ed38ef838c3f7b8de6d1cd1ee264a

Former-commit-id: 14f102d8ae [formerly b4952b003a] [formerly 14f102d8ae [formerly b4952b003a] [formerly 373de78320 [formerly 8b5bfd7e9010f9ffd4ce019c5fd961e1b370ff1e]]]
Former-commit-id: 373de78320
Former-commit-id: 886c39f5a4 [formerly adf6aed592]
Former-commit-id: c18d3486eb
2012-12-17 17:05:34 -06:00
Nate Jensen
995f614e67 Merge "Issue #1369 fix reproject geotiffs" into development
Former-commit-id: 0a262d7716 [formerly ed075faf68] [formerly 0a262d7716 [formerly ed075faf68] [formerly 0316240cf6 [formerly 310f0e9e274ded8256d6b644ade33cea427638f0]]]
Former-commit-id: 0316240cf6
Former-commit-id: 937220f430 [formerly 65dc6cbd0e]
Former-commit-id: 43c5037070
2012-12-17 12:14:07 -06:00
Matt Nash
fabcff6dd5 Issue #1369 fix reproject geotiffs
Change-Id: I576fa38e88afc95914db26c9232acb9e9d3bd6ce

Former-commit-id: 159265e53e [formerly 2ed0f446d9] [formerly 159265e53e [formerly 2ed0f446d9] [formerly 323e97d617 [formerly 6b06041578eb02e8955ab7d614e2574b5838181e]]]
Former-commit-id: 323e97d617
Former-commit-id: c4c8221582 [formerly c3d94429f7]
Former-commit-id: 31d4a3c2af
2012-12-17 11:31:20 -06:00
Jonathan Sanchez
937f3212f9 Issue #1424 Removed coordinate truncate when adding vertex.
Former-commit-id: 8e83a6ea6d [formerly ccc37dc454] [formerly 8e83a6ea6d [formerly ccc37dc454] [formerly 351148804c [formerly 5531ffd29021d7e0db627f2c59ad7ef6de71a896]]]
Former-commit-id: 351148804c
Former-commit-id: c4e044d7b9 [formerly 61f80591bb]
Former-commit-id: 88e931376e
2012-12-14 07:42:39 -06:00
Ron Anderson
d176bc1e2f Merge "Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item." into development
Former-commit-id: e49ea6c147 [formerly 6f79ba14e6] [formerly e49ea6c147 [formerly 6f79ba14e6] [formerly c17e0a19c9 [formerly 6e0bfe56d437622b9c5f6e3d4d8d9c0192fc5a46]]]
Former-commit-id: c17e0a19c9
Former-commit-id: bf7960b5f9 [formerly cb4721ae15]
Former-commit-id: 5c59df1ae1
2012-12-13 15:47:04 -06:00
Ron Anderson
c341ac0f55 Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1

Former-commit-id: 3e4aeeab8b [formerly 753fa0487b] [formerly 3e4aeeab8b [formerly 753fa0487b] [formerly 639b5abbd9 [formerly a7657cf6b42a3d7a0f5fd64468820d1547ad1e9d]]]
Former-commit-id: 639b5abbd9
Former-commit-id: 8b81f0bfb4 [formerly 995f28220a]
Former-commit-id: 676819adfa
2012-12-13 15:25:24 -06:00
Nate Jensen
2b93ece40d Merge "Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension" into development
Former-commit-id: acccca74eb [formerly 67d30566c0] [formerly acccca74eb [formerly 67d30566c0] [formerly 823bedcebd [formerly e7b347563598a3f4809cc74096de1f2dc0ef0788]]]
Former-commit-id: 823bedcebd
Former-commit-id: 31d8e9a9ae [formerly 0388c1b179]
Former-commit-id: 6ac9952901
2012-12-13 14:25:56 -06:00
Lee Venable
6002363f85 Merge "Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit." into development
Former-commit-id: fabb15ab10 [formerly d098b2e271] [formerly fabb15ab10 [formerly d098b2e271] [formerly 3ca1080fa0 [formerly c7e9e83612df941e1c6a99cac5d07a724525bbb3]]]
Former-commit-id: 3ca1080fa0
Former-commit-id: 2c29835b63 [formerly 1be8e81228]
Former-commit-id: d202b932b3
2012-12-13 14:24:55 -06:00
Nate Jensen
c1c0b738e0 Merge "Issue #1369 add pattern to p2-build.xml file to match the new cots product" into development
Former-commit-id: c2bc33e51a [formerly f0340fba98] [formerly c2bc33e51a [formerly f0340fba98] [formerly 59f315f14b [formerly 4663e9a09db1fbf0e3f72dd9893e5daa73698f90]]]
Former-commit-id: 59f315f14b
Former-commit-id: ceceed5b27 [formerly e5ad2acde4]
Former-commit-id: af1c73a788
2012-12-13 14:13:57 -06:00
Roger Ferrel
946b0f7477 Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit.
Change-Id: Iaff7b8b64e2b1a94680c29087d174a27658c5873

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

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

Former-commit-id: a661c27de7 [formerly cf0090b7d4] [formerly a661c27de7 [formerly cf0090b7d4] [formerly 87b4d4b4e6 [formerly a862d259af867bd15d381e05e421d8d653ae4f21]]]
Former-commit-id: 87b4d4b4e6
Former-commit-id: 5de49c6734 [formerly 83b9a4dfb7]
Former-commit-id: 778191a87a
2012-12-13 12:42:40 -06:00
Richard Peter
2c06db239c Merge "Issue #1415 fix or level node time matching Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a" into development
Former-commit-id: d773303870 [formerly 4b2e80da58] [formerly d773303870 [formerly 4b2e80da58] [formerly fffeaecbe5 [formerly 1f04e62af4557d74f9a5378d88571a01060b9891]]]
Former-commit-id: fffeaecbe5
Former-commit-id: 541c2cf5e3 [formerly d0cdd8f533]
Former-commit-id: e051ac15ec
2012-12-13 11:57:37 -06:00
Ben Steffensmeier
c01596aa63 Issue #1415 fix or level node time matching
Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a

Former-commit-id: 80a3471237 [formerly 3ac43300fc] [formerly 80a3471237 [formerly 3ac43300fc] [formerly 9da83d3f4f [formerly 7ad0749d76328eafcd2f02137c099f7a302e0387]]]
Former-commit-id: 9da83d3f4f
Former-commit-id: 1a3f91949c [formerly 199577ed39]
Former-commit-id: 5826da0d8f
2012-12-13 11:35:15 -06:00
Matt Nash
bf2dcdb733 Issue #1369 add geosolutions project to cots feature
Change-Id: I62dd15c2f0d2ee017fcb3ad9483399b688c508f3

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

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

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

Former-commit-id: c5cd2304a9 [formerly 5327d88a6d] [formerly c5cd2304a9 [formerly 5327d88a6d] [formerly 06fdf91a1c [formerly 4636ad873e7de401e6384dd42857265e962aa8d9]]]
Former-commit-id: 06fdf91a1c
Former-commit-id: f4624af03c [formerly 17b983ba02]
Former-commit-id: a41d5a1ad0
2012-12-12 09:09:28 -06:00
Ron Anderson
ea5a6d9537 Merge "Issue #1395 Modifed AwipsCalender and added additional date/time related widgets" into development
Former-commit-id: 4ba089395c [formerly d05dc0c6ca] [formerly 4ba089395c [formerly d05dc0c6ca] [formerly 277c9cb0ec [formerly c6c26811ad96f862ae3ffb0e6d9056f0d9edecfb]]]
Former-commit-id: 277c9cb0ec
Former-commit-id: 14849786eb [formerly 087af45be8]
Former-commit-id: a0e7ae0f08
2012-12-11 16:09:24 -06:00
Ron Anderson
958957d603 Issue #1395 Modifed AwipsCalender and added additional date/time related widgets
Change-Id: I123a63ff4a42d36b2a35229dff719eda49097f7b

Former-commit-id: cc883294f1 [formerly bc5f445ecf] [formerly cc883294f1 [formerly bc5f445ecf] [formerly 43881be47a [formerly 475861fe615a070f1a3cad18dd798ba6db6b66e8]]]
Former-commit-id: 43881be47a
Former-commit-id: 01081fe723 [formerly 641d268bd8]
Former-commit-id: bd7162eca5
2012-12-11 13:31:05 -06:00
Nate Jensen
ff01a406c8 Merge "Issue #1362 create a new resource handler when nsharp is created in a side pane." into development
Former-commit-id: c34ff0c0b8 [formerly decb23f4ae] [formerly c34ff0c0b8 [formerly decb23f4ae] [formerly 773ff8c027 [formerly 273aed63277891eb091817c5769fe53ef3813759]]]
Former-commit-id: 773ff8c027
Former-commit-id: a3fb320e10 [formerly 5b1ca237b2]
Former-commit-id: 22c47a870a
2012-12-11 12:42:51 -06:00
Steve Harris
868acb808b Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: d4686333a1 [formerly ab8b1ae64d] [formerly d4686333a1 [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]
Former-commit-id: ce72ebb094
Former-commit-id: 15849ae72a [formerly 113fdcb679]
Former-commit-id: db24093e42
2012-12-11 08:56:54 -06:00
Steve Harris
b0a60923c4 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: 4d4771ee3a [formerly 43ddfe98c4] [formerly 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: f02c1ef71d [formerly 6287b32e7d]
Former-commit-id: ebcc9975c4
2012-12-11 08:45:53 -06:00
Ben Steffensmeier
cc5e452d3f Issue #1362 create a new resource handler when nsharp is created in a side pane.
Former-commit-id: 50ff73809f [formerly 52497f5630] [formerly 50ff73809f [formerly 52497f5630] [formerly 0eb454f0d4 [formerly 62cb0df39d0c24edc80d635f3bf90d2abc564b04]]]
Former-commit-id: 0eb454f0d4
Former-commit-id: d2f5643093 [formerly 84fa621b55]
Former-commit-id: c45e8c3123
2012-12-10 17:58:04 -06:00
Roger Ferrel
d8640632cd Issue #1353 Changes for non-blocking DamDisplayControlDlg.
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475

Former-commit-id: f9a8d30c4d [formerly 35261a7964] [formerly f9a8d30c4d [formerly 35261a7964] [formerly 40b8e4ec57 [formerly 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a]]]
Former-commit-id: 40b8e4ec57
Former-commit-id: 80d7309ea7 [formerly fdad99bcc8]
Former-commit-id: 387c5d0e36
2012-12-10 11:30:06 -06:00
Lee Venable
5e23a89003 Merge "Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg." into development
Former-commit-id: 3a4eb415f2 [formerly 59b2cf8872] [formerly 3a4eb415f2 [formerly 59b2cf8872] [formerly 8e7143967b [formerly 050d9cebb8de520c7ed0d27c686ebf84dc6d084c]]]
Former-commit-id: 8e7143967b
Former-commit-id: 17b9e0077c [formerly f3b9d1cb38]
Former-commit-id: b6e267419c
2012-12-10 11:28:34 -06:00
Roger Ferrel
50bf368b38 Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481

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

Former-commit-id: 829899374d [formerly 48f074eb72] [formerly 829899374d [formerly 48f074eb72] [formerly 1a510a9f61 [formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]]]
Former-commit-id: 1a510a9f61
Former-commit-id: a0d07a46f9 [formerly 6bf265624d]
Former-commit-id: 0b82d18c64
2012-12-07 15:18:03 -05:00
Nate Jensen
8d184d92cd Merge "Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw" into development
Former-commit-id: 80c743ac8b [formerly 4867cd2a64] [formerly 80c743ac8b [formerly 4867cd2a64] [formerly a505d78463 [formerly 6ae7f9a4947420a6985ecbe2834f9c9fc9f5cac4]]]
Former-commit-id: a505d78463
Former-commit-id: 7b004618b5 [formerly ef76ea6d61]
Former-commit-id: 50d01007dc
2012-12-07 13:32:29 -06:00
Lee Venable
b0f681e903 Merge "Issue #1353 old test code classes." into development
Former-commit-id: 4ae765fc4f [formerly 0d74bf9e67] [formerly 4ae765fc4f [formerly 0d74bf9e67] [formerly 4e13d01e67 [formerly 54765a26d6ca098133ff1e0b16c56e94e4053f74]]]
Former-commit-id: 4e13d01e67
Former-commit-id: 78a124efe3 [formerly fa143bd2e1]
Former-commit-id: e4c65073b1
2012-12-07 13:22:46 -06:00
Nate Jensen
df8e16bd63 Merge "Issue #1396 fix thin client" into development
Former-commit-id: 206e288594 [formerly 01c27ce5aa] [formerly 206e288594 [formerly 01c27ce5aa] [formerly f577fc578d [formerly 4ec3746745f0983226db5e0b9e4969ef0885c44f]]]
Former-commit-id: f577fc578d
Former-commit-id: 94bc1dc9ae [formerly 7257650eea]
Former-commit-id: fa676a5cf1
2012-12-07 13:18:41 -06:00
Lee Venable
051cf6dcdd Merge "Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs." into development
Former-commit-id: 6a8ae7c255 [formerly ee2572e7c0] [formerly 6a8ae7c255 [formerly ee2572e7c0] [formerly 650420354f [formerly c94fde29a1e43467378bc11100fbe0fdfcf7a51a]]]
Former-commit-id: 650420354f
Former-commit-id: dfb7dfc55a [formerly e5cf7d4ba5]
Former-commit-id: cdc302da70
2012-12-07 13:02:53 -06:00
Lee Venable
f17c2d0bc0 Merge "Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments." into development
Former-commit-id: bf83e5b5c6 [formerly 2c44afd3ab] [formerly bf83e5b5c6 [formerly 2c44afd3ab] [formerly 37b91cccb0 [formerly 4bab9df17245e28128644fcdbfb8bac6d4c6dc7e]]]
Former-commit-id: 37b91cccb0
Former-commit-id: b33bdc354e [formerly 78af1aa566]
Former-commit-id: 9ee06391e8
2012-12-07 12:52:44 -06:00
Nate Jensen
0ffbeecd4e Issue #1396 fix thin client
Change-Id: I58dc3f40594697d8332cc372f45f30bb28927100

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

Former-commit-id: 72f31d5f0c [formerly d833d917db] [formerly 72f31d5f0c [formerly d833d917db] [formerly d7c9ac3b84 [formerly ba1d1a6bfe57466a6a0fe5864cd87ffefe61a2f8]]]
Former-commit-id: d7c9ac3b84
Former-commit-id: d0e091312a [formerly e27d415da5]
Former-commit-id: 1fbb76abfd
2012-12-07 11:44:46 -06:00
Roger Ferrel
6406fe0ecb Issue #1353 old test code classes.
Change-Id: I5b0f7a45ff6e00c669aa1acc6493350f90a66350

Former-commit-id: 754afb9c52 [formerly cfb11d2d38] [formerly 754afb9c52 [formerly cfb11d2d38] [formerly 327f35c657 [formerly 51f185625e30425c1466a04d46b3eac39dfac4dc]]]
Former-commit-id: 327f35c657
Former-commit-id: ddab76526a [formerly 125d271d40]
Former-commit-id: 88a2587cbc
2012-12-07 11:27:31 -06:00