Commit graph

4187 commits

Author SHA1 Message Date
Ben Steffensmeier
2206fbe420 Merge "Issue #3923 Fix thin client grid updates." into omaha_14.3.1
Former-commit-id: abd42871a5 [formerly 2b6f02ac93 [formerly b1deadcb432529e5259328d5cb982982ea25648d]]
Former-commit-id: 2b6f02ac93
Former-commit-id: fca246c383
2014-12-15 13:37:38 -06:00
Ben Steffensmeier
fa11934170 Issue #3923 Fix thin client grid updates.
Former-commit-id: dcea13e602 [formerly 67701a2480 [formerly 537534fb920a8ea109d9bc655f16579cdb357dda]]
Former-commit-id: 67701a2480
Former-commit-id: 147b6c3733
2014-12-15 13:25:43 -06:00
Fay.Liang
416498a718 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: dd3df6b426 [formerly 03bab427df [formerly f88d457b62161250b44f9cdcbf025fafca43174b]]
Former-commit-id: 03bab427df
Former-commit-id: 4d9470b6e7
2014-12-15 12:44:05 -05:00
Sarah Pontius
430120f6b9 VLab Issue #5674 - HLS/TCV Code Cleanup; fixes #5674
Change-Id: If31b2979fb741f0e258ae0e3a1323981826b3158

Former-commit-id: 9b8bdc88d5 [formerly ff2a0aa1b1 [formerly c044f5c349b27be19c6a3ea2abcc3c2294fc07a3]]
Former-commit-id: ff2a0aa1b1
Former-commit-id: 06ac198594
2014-12-15 09:54:17 -07:00
Jordan Gerth
39f9c87fa3 VLab Issue #5345 - Ingest, Load, Display severe probability for a storm cell
Change-Id: I032b0db29ed8947df3fe630336bb01083dbfecd0

Former-commit-id: e0fd068337 [formerly 784c43ee33 [formerly fe7454aac732eae6bd0024be122b819e909f98fa]]
Former-commit-id: 784c43ee33
Former-commit-id: 4003c09e47
2014-12-14 15:40:19 -06:00
steve.naples
0f80fcc890 ASM #16911 - Updated to fix Ending Hydrologic data when time is after 18Z.
Change-Id: Ia3022f07f1ebc54543b6e210d77d95b1458b434b

Former-commit-id: 9c0e08a03c [formerly 2757754c9e [formerly 571f7dde74c6cbf14553edc2fe27a5031e42d6be]]
Former-commit-id: 2757754c9e
Former-commit-id: 9e13d77410
2014-12-13 01:55:19 +00:00
Ron Anderson
d5dc22de4d VLab Issue #4953 Added support for nwrwavestcv and sending TCV files to VTEC partners
Change-Id: I2af1f2eaf0625ea58153ebebc1ad10bb76da52bd

Former-commit-id: 2c99ce902a [formerly eaa74da50f [formerly 18ab45bdae51ae9971a0c5f4b4bde7afe82074d4]]
Former-commit-id: eaa74da50f
Former-commit-id: b484070ec5
2014-12-12 17:25:52 -06:00
Ana Rivera
fa94f95d1e Merge "VLab Issue #5421 - Capture frames with date and time in file name" into field_14.4.1
Former-commit-id: 703b8197de [formerly a2bf9ed474 [formerly 2a888aa22e77a3069b4ee88d7c9ebbaae2e90524]]
Former-commit-id: a2bf9ed474
Former-commit-id: 11f5ee56be
2014-12-12 20:41:08 +00:00
Lee Venable
5897b87e43 Merge "Omaha #3709 Add icon that displays text colors next to color change menu items" into omaha_14.4.1
Former-commit-id: 6812dc291c [formerly b3b6b164ed [formerly 2baba567db90a6f3fe4f9cbf440798454d88fbaf]]
Former-commit-id: b3b6b164ed
Former-commit-id: 24aa804855
2014-12-12 14:00:43 -06:00
Jordan Gerth
58db5bbdbf VLab Issue #5421 - Capture frames with date and time in file name
Change-Id: Ie20956810b46abd3d74a93b993d1a4e134785d29

Former-commit-id: 786afd6b76 [formerly 5b9602defb [formerly 4d3fc8e57e5b5d73599620491e0078a4e7e3bbcc]]
Former-commit-id: 5b9602defb
Former-commit-id: 4a62915f97
2014-12-12 13:39:01 -06:00
Mark Peters
c054291607 Omaha #3709 Add icon that displays text colors next to color change menu items
Change-Id: I5a8fe5cc5679381587cb7b13cfa5984bf796ee42

Former-commit-id: 05eabb4a91 [formerly 7b591d8a68 [formerly ca40c8637ae75b25119864f0182cb25471d52219]]
Former-commit-id: 7b591d8a68
Former-commit-id: 5a19380c59
2014-12-12 13:09:14 -06:00
Chip Gobs
09154aae12 VLab Issue #5616 MPE:Gage Color by Value does not display correctly; fixes #5616
Former-commit-id: 3645172fef [formerly 0532714504 [formerly 41c962fd89f3b9998599f8a246967cb47888ffe3]]
Former-commit-id: 0532714504
Former-commit-id: 1d6c968fa6
2014-12-12 13:24:47 -05:00
Slav Korolev
cf10f6a374 Omaha #3888 - Fixed NPE error in the process() method.Corrected
Former-commit-id: ed97d72dcb [formerly 63014f65c7 [formerly 3193057c916ee8cc6f99c8d0ecc69d067fb68c16]]
Former-commit-id: 63014f65c7
Former-commit-id: c6dbb0aa95
2014-12-12 12:29:03 -05:00
Lee Venable
be95d4ed2b Merge "Omaha #3888 - Fixed NPE error in the process() method." into omaha_14.4.1
Former-commit-id: 2bc4cfdaae [formerly e036b3e70e [formerly 04284dafa2f563224067e6a3312d69cc942e1d7d]]
Former-commit-id: e036b3e70e
Former-commit-id: 793cf6d676
2014-12-12 11:20:19 -06:00
Richard Peter
245ec3d100 Merge branch 'omaha_14.4.1' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_14.4.1
Former-commit-id: 5ce93f49eb [formerly 644a076c76 [formerly 5b26ce7815295057f79a114de83e4443a5464ae4]]
Former-commit-id: 644a076c76
Former-commit-id: 286cf3e921
2014-12-12 10:57:15 -06:00
Slav Korolev
9f4b0c1e83 Omaha #3888 - Fixed NPE error in the process() method.
Former-commit-id: 9cf99b9e88 [formerly 4abd2fc837 [formerly 93aa24fb9f41e7bd17d9ee8594e0d0a9905e91be]]
Former-commit-id: 4abd2fc837
Former-commit-id: 31ab89f85e
2014-12-12 11:53:59 -05:00
Richard Peter
20fa07c6d3 Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: 8de1ebcb65 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]
Former-commit-id: 2457d0e6f7
Former-commit-id: 23eafaba3d
2014-12-12 10:36:04 -06:00
Juliya Dynina
b9efbd1e1d Merge "ASM #638 - Inconsistent Type for scale widget value accessed through the varDict." into asm_14.4.1
Former-commit-id: a62ee436c2 [formerly ecaaa1f9fd [formerly 63036a13a555c9a1e7fab05dd48a369221fc27b9]]
Former-commit-id: ecaaa1f9fd
Former-commit-id: 790b5a47f2
2014-12-12 11:05:02 -05:00
Ana Rivera
36b70efaa7 Merge "VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129" into field_14.4.1
Former-commit-id: 062d78a6e8 [formerly 41c487a291 [formerly 3934ea2d8dc5507899ee6942e327c7c5d8eb28cf]]
Former-commit-id: 41c487a291
Former-commit-id: b9fe58ea8b
2014-12-12 15:42:39 +00:00
Michael Gamazaychikov
1cf3ce7058 ASM #638 - Inconsistent Type for scale widget value accessed through the varDict.
Change-Id: If81102e5a3b70e224f88a351277e9c29e9f9cc91

Former-commit-id: 40f0e77f30 [formerly 94f06ccbc9 [formerly 3c1ce33424799b39db14f909d8de2946e5aca1bc]]
Former-commit-id: 94f06ccbc9
Former-commit-id: 6123ee67c1
2014-12-11 19:37:00 -05:00
Slav Korolev
c61f1676dc Omaha #3220 - Moved refreshing of table in the UI thread.
Former-commit-id: fd3a6ea199 [formerly d06882f4c9 [formerly 7454b39e71eeca348f4f167b8aa70d6ce5253004]]
Former-commit-id: d06882f4c9
Former-commit-id: 974cc09ca5
2014-12-11 15:38:47 -05:00
Steve Harris
5319a82bad Merge tag 'OB_14.3.2-8m' into tcv_14.3.2
Former-commit-id: 6d47b052c1 [formerly 1203bcc18c [formerly 4d97e95a23e55e064a654fda3d05901043158d7a]]
Former-commit-id: 1203bcc18c
Former-commit-id: eb980ff3ba
2014-12-11 10:43:57 -06:00
Joshua Watson
0d02d676b4 VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840

Former-commit-id: bca4b40eed [formerly a8f5bb480b [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]
Former-commit-id: a8f5bb480b
Former-commit-id: 0c8b629c96
2014-12-11 11:39:00 -05:00
Richard Peter
79c2bc3cb1 Merge "Omaha #3757 Added HTTPS flag" into omaha_14.4.1
Former-commit-id: 08734bb4e1 [formerly f16173803c [formerly dd6f035e86bbd4f9e86ce3b19b7b61c0b3947737]]
Former-commit-id: f16173803c
Former-commit-id: 46611ec961
2014-12-10 17:54:33 -06:00
Dave Hladky
379ba3c51d Omaha #3757 Added HTTPS flag
Former-commit-id: 337f67b136 [formerly 61d25613ab [formerly 7848dc4df9ef8faafdce556836bc71c789b74ee4]]
Former-commit-id: 61d25613ab
Former-commit-id: a69c83e534
2014-12-10 17:17:12 -06:00
Juliya Dynina
221127b445 Merge "ASM #628 - Fixed Crest time" into asm_14.4.1
Former-commit-id: ac47f1ca21 [formerly 47ddfd8c69 [formerly 909dba375f65ef5d1a9b984758f049728e1d4700]]
Former-commit-id: 47ddfd8c69
Former-commit-id: 66961409ac
2014-12-10 15:13:54 -05:00
Loubna Bousaidi
60d3e08a50 ASM #628 - Fixed Crest time
Change-Id: I5f9f58cfdb1689f331628498a781bb60f5549ac5

Former-commit-id: 2facd8c547 [formerly fb5031e5b8 [formerly cddb0ff5626f25dd3555853d578928d7b93dcacb]]
Former-commit-id: fb5031e5b8
Former-commit-id: 52364ff0eb
2014-12-10 20:01:42 +00:00
Fay.Liang
964b8fa4d4 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8a4e1ba3ef [formerly 0df83cd043 [formerly ea5b97f1f606210e70bbf616a0c9158f03f67b5e]]
Former-commit-id: 0df83cd043
Former-commit-id: ecd2b21240
2014-12-10 08:52:21 -05:00
David Friedman
68e2d390bb ASM #11982 - Print Icon in CAVE does not print (Actually fix print-to-file)
Change-Id: I89c581065424da5dbe5108e98fcc76f7381c911c

Former-commit-id: 91bc857ffc [formerly 851f67c5e7 [formerly d3b32c796f36148386120cfe46fb9b098d66a643]]
Former-commit-id: 851f67c5e7
Former-commit-id: 0f9d3f5f4f
2014-12-09 21:57:21 +00:00
Sarah Pontius
46b621c669 VLab Issue #5595 - HLS/TCV remaining task work and bug fix for 14.3.2 SwIT; fixes #5595
Change-Id: I872c55de264205ee60c369802075b32b5753fe5d

Former-commit-id: a12b79c69c [formerly 1ed6581ceb [formerly f7aeeb643ec6302e5af82838992f68ecf48ce702]]
Former-commit-id: 1ed6581ceb
Former-commit-id: 91dd50792f
2014-12-09 12:49:45 -07:00
Juliya Dynina
cbcd7f4f3b Merge "ASM #16829 - TextWS: Problem with AlarmAlertFunctions static class initialization" into asm_14.4.1
Former-commit-id: 25a4e0f868 [formerly 8e7811740e [formerly 6ec74c43a16cd6dade550b4bfc0c4163ce0f7454]]
Former-commit-id: 8e7811740e
Former-commit-id: 36b1144775
2014-12-09 14:13:30 -05:00
steve.naples
6ad381e803 ASM #16911 - Fixed issue where Hydrologic date did not advance to next day after 18Z.
Change-Id: Ie26af265d8a233e4fdf6e9dbc1e4ff6934aae4e4

Former-commit-id: 45c3852132 [formerly 42d555b6c9 [formerly b2c9cd15e1f02c8272c1d9a9d50e877470b05eb3]]
Former-commit-id: 42d555b6c9
Former-commit-id: 5e5f9bd31a
2014-12-09 19:04:17 +00:00
Mark Peters
9960f739c3 Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list
Change-Id: Ie03659376d3a035bb2acbd98b2e34a91e6b5ad57

Former-commit-id: 1880d72b9d [formerly a721ccbcac [formerly 447437edc9b14412615ff691784fa7545146a596]]
Former-commit-id: a721ccbcac
Former-commit-id: e1bf45baef
2014-12-09 11:47:22 -06:00
Juliya Dynina
dba17c86d8 Merge "ASM #634 - Missing Data not getting into HML file" into asm_14.4.1
Former-commit-id: b70186d356 [formerly 669525e06d [formerly 08bac3a76f734a7acc543069bcc73969e2c02ccd]]
Former-commit-id: 669525e06d
Former-commit-id: bc03e466ef
2014-12-09 08:04:00 -05:00
Xuezhi.Wei
f7e83f5859 ASM #634 - Missing Data not getting into HML file
Change-Id: I4f2358f28ef7d7945813cbffa6d36517e162e40b

Former-commit-id: e40018f2e1 [formerly ac19b4b08d [formerly 947f9dd3435219ff32890cc4a26d8ae5e43686cf]]
Former-commit-id: ac19b4b08d
Former-commit-id: c0a72e92bf
2014-12-08 20:48:40 +00:00
Nathan Bowler
e3727b1277 Omaha #1231 Fix selecting AWIPS ID
Change-Id: I657d723b45b9374523307a8fdbdfc21f2f31f35e

Former-commit-id: 06c94a25b7 [formerly c07d774bd0 [formerly 68e6a2fd48a062e0ca66b52098f2781a30926a80]]
Former-commit-id: c07d774bd0
Former-commit-id: 3baaa2ea5e
2014-12-08 13:07:14 -05:00
steve.naples
b14e8e0998 ASM #16889 - Fixed issue with precip station count, also added logging for Snow data file read and station edit.
Change-Id: I1b689b485a152e1c942c021ac0f778b0f299d3e3

Former-commit-id: 539b859040 [formerly 18b2de3fdf [formerly c836fb0c1f8721f81049af56cb8f7be9960a5cd6]]
Former-commit-id: 18b2de3fdf
Former-commit-id: fdc62ce4d5
2014-12-08 15:48:28 +00:00
Steve Harris
cc9614e0c7 Merge branch 'master_14.3.1' (14.3.1-36) into omaha_14.3.1
Former-commit-id: 12d20a1e6b [formerly b19ae7a6db [formerly e2a6deed98773f943def0ce9d9daf2a6a13f0eda]]
Former-commit-id: b19ae7a6db
Former-commit-id: b9081f0c0c
2014-12-07 23:13:26 -06:00
Jordan Gerth
f55ef25901 VLab Issue #5422 - Make warning polygon outline settable in bundle file
Change-Id: I3f6395fa143a9ff54b748490795ecffb2cc35979

Former-commit-id: c9eabcc1d4 [formerly 02ed7390d2 [formerly ab9de202c00d86fba4851a733c9b6977eccf73d1]]
Former-commit-id: 02ed7390d2
Former-commit-id: 763f8876c8
2014-12-05 17:10:26 -06:00
Nathan Bowler
d7cb0b4b0f Omaha #3801 Fix closing cave with new/edit dialogs open, description menu when nothing is selected, and when edit/delete buttons are enabled
Change-Id: I982e959f2c4ebe7b26ee1aa615953228b9781474

Former-commit-id: 18e1ede6a1 [formerly 59f4baa5fe [formerly 32621b600176a3afff5ee42228eb8cee2417c9c6]]
Former-commit-id: 59f4baa5fe
Former-commit-id: 907425cb04
2014-12-05 15:31:46 -05:00
Ron Anderson
93bce63af0 Merge "Omaha #3885: Merge VTEC route and request changes from VLab." into omaha_14.4.1
Former-commit-id: e0b9900a50 [formerly d7e0d21d27 [formerly 401356d7917aaf84c5ea5c8f92ca32c270d5790a]]
Former-commit-id: d7e0d21d27
Former-commit-id: c4d27803cc
2014-12-04 15:44:46 -06:00
Nate Jensen
ca2a11c31a Merge "Omaha #3848 Fix cancelling geotiff import." into omaha_14.4.1
Former-commit-id: 13bd914319 [formerly 47b8be5b09 [formerly 84412d1185073ed35278a40150b04845c8a98de3]]
Former-commit-id: 47b8be5b09
Former-commit-id: 8f0375f71e
2014-12-04 13:24:19 -06:00
Fay.Liang
7aaf379e07 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: f5095bed4e [formerly 028d6bdc33 [formerly ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963]]
Former-commit-id: 028d6bdc33
Former-commit-id: 6e9ff9e139
2014-12-04 13:47:03 -05:00
Fay.Liang
07316a588b Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 19194e0aa3 [formerly 83a4987188 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]
Former-commit-id: 83a4987188
Former-commit-id: f327b9dd5a
2014-12-04 13:46:31 -05:00
Nathan Bowler
59e20e1f02 Omaha #3848 Fix cancelling geotiff import.
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463

Former-commit-id: e1af24d84e [formerly 3e7a1993e3 [formerly 4c64044de959e709cd00da40826b916a579c44fe]]
Former-commit-id: 3e7a1993e3
Former-commit-id: a5bc553461
2014-12-04 13:24:04 -05:00
Nate Jensen
fd10e49ab8 Merge "Omaha #3709 Support foreground/background colors by user for group chats without shared display" into omaha_14.4.1
Former-commit-id: d4ce4aab6b [formerly cc41245a73 [formerly 96183baeadd2dcfdc4a1dd0e9199b728f49209bf]]
Former-commit-id: cc41245a73
Former-commit-id: 7fe0fc4cb9
2014-12-04 11:28:01 -06:00
Mark Peters
9006dbbb47 Omaha #3709 Support foreground/background colors by user for group chats without shared display
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa

Former-commit-id: 7ae71cf1dc [formerly bd3ed3935c [formerly 73d8510ef265b47d2d45f36be3609ef8f35ece12]]
Former-commit-id: bd3ed3935c
Former-commit-id: 1b30658214
2014-12-04 10:37:53 -06:00
Ron Anderson
285330ccd0 Omaha #3885: Merge VTEC route and request changes from VLab.
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.

Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9

Former-commit-id: 2417d5a2a7 [formerly 5169e7181f [formerly 16e32018de233fb128a7518415b84e032074932f]]
Former-commit-id: 5169e7181f
Former-commit-id: fd25fe9efc
2014-12-04 10:01:18 -06:00
Bruce.Hundermark
9e59b79fbb ASM #645 - GFE: CarSnowAmt smart tool can return incorrect amount
Change-Id: I8aea3ab2ccfec7e411e605ddfdfeef0a823687c2

Former-commit-id: c11898f30a [formerly 6f73b491f8 [formerly 25f4c8acdd8975d3001528212cbc7617cfd39500]]
Former-commit-id: 6f73b491f8
Former-commit-id: c4ca149d67
2014-12-04 15:56:01 +00:00
Nate Jensen
553898a1fa Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 68973ea94c [formerly 7fed5d8e25 [formerly 0a84cfa53c5565f3bf598b21aa5a7d71bc012543]]
Former-commit-id: 7fed5d8e25
Former-commit-id: c4ffdbc7e8
2014-12-04 09:00:45 -06:00