Commit graph

3341 commits

Author SHA1 Message Date
Qinglu.Lin
10da99d3f7 ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683

Former-commit-id: f79ed1b1867b5516a390a8f70b2141052be3eb38
2014-09-18 11:21:18 -04:00
Matthew Howard
9b7823084f Merge "ASM #529 Invalid QC message for Areal Flood Advisory" into asm_14.3.1
Former-commit-id: f08b93fb1bd32ec83a2e590d29d5e4d0fe18c0a9
2014-09-16 08:32:37 -05:00
Michael Gamazaychikov
fdaf681e8c ASM #529 Invalid QC message for Areal Flood Advisory
Change-Id: I392d32b4d7ccc94c88404a85f22f2f306d34ee33

Former-commit-id: d3247df563831f017f69faf1edbde5aea3c2a507
2014-09-16 09:12:06 -04:00
Matthew Howard
aa273ffb70 Merge "ASM #641 - Filtered cases where Areas do not match Zones." into asm_14.3.1
Former-commit-id: f33abc302597a3120c9220278e28d865d5f185b6
2014-09-15 15:03:36 -05:00
Daniel.Huffman
bacc914bd0 ASM #641 - Filtered cases where Areas do not match Zones.
Change-Id: I1207442f77aece9d79b010669755ee7fc6f82362

Former-commit-id: bf6acaafc42ba98e4257d3eb089b7a1e7adf7bd4
2014-09-15 19:18:33 +00:00
Matthew Howard
811b79d748 Merge "ASM #16693 - Fix spelling checker suggests swear words" into asm_14.3.1
Former-commit-id: 04c6dfae9b8edb836a1bad54e1b8b327c66325bb
2014-09-15 12:28:25 -05:00
Ying-Lian.Shi
11b40e167c ASM #16693 - Fix spelling checker suggests swear words
Change-Id: Ie9e5bc5c26b16655185b81cf4b4cf2f758693566

Former-commit-id: 094cb9dba5d6e0da22b32b85dcc5049fd629fe5e
2014-09-15 14:56:32 +00:00
Brian.Dyke
216f34fb25 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 8e4f6e96f7b70d6f2b7517f3f0695350506169c7
2014-09-15 10:46:25 -04:00
Matthew Howard
6e0dbf4fb5 Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7
2014-09-11 08:56:49 -05:00
Brian.Dyke
3d9a3de6e4 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
2014-09-09 11:44:30 -04:00
Qinglu.Lin
51d48a6fdc ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09

Former-commit-id: 7a75687b76584b4578fad4c31c8557d78e507f46
2014-09-09 08:07:46 -04:00
Brian.Dyke
858b91d677 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: 7b49ea6d9c45c0624017bbe7ffb1297a402ee875
2014-09-08 14:54:16 -04:00
Brian.Dyke
9e1ee22146 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 876c6fc4db3901fdcd8dd9a6fb343d2f65254569
2014-09-05 11:13:12 -04:00
Brian.Dyke
7b7ef56b04 Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: a77577595da1e2dcc8057c5a8b8643a612780339
2014-09-04 15:59:00 -04:00
Brian.Dyke
e762271240 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: ad120a9357402fbdedb350cabe88d2becf5d7361
2014-09-04 14:18:34 -04:00
Qinglu.Lin
8c28597210 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110

Former-commit-id: 33adaf353c6a4b7dc418dc86428257dae260c4c5
2014-09-04 14:09:24 -04:00
Nate Jensen
2cfbfc1dc4 Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320

Former-commit-id: 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782
2014-09-04 10:10:37 -05:00
Steve Harris
0e869fa6c1 Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4
2014-09-03 15:22:00 -05:00
Brian.Dyke
fd8ad016ef Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: bc9f03426304e3bb194fbf7f356d8dd3816cd836
2014-09-02 16:32:54 -04:00
Brian.Dyke
f0875e724f Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 40efe51cafd5589ef0a640041ad0539e454b6f8d
2014-09-02 16:30:51 -04:00
Brian.Dyke
368f80f220 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: f9daf7d6e906904e96438fabc510e24ff66536d4
2014-09-02 15:09:06 -04:00
Qinglu.Lin
2374673f8d ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05

Former-commit-id: 59890eef397f3282ef26f259ca85ffea3db7b710
2014-09-02 14:37:19 -04:00
Ron Anderson
46c62a1db6 Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce

Former-commit-id: e2ecb91569c2f622d45f7301c1eb4e058a2ab641
2014-09-02 12:21:42 -05:00
Steve Harris
3b6a003884 Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: 09b94266f1f3aeaaa7fcf622487d751097d271a4
2014-09-02 08:12:49 -05:00
Kiran.Shrestha
a285439c08 ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6

Former-commit-id: 1681bea10870df58b3f2cc0d0a59f21c596e9e95
2014-08-29 13:50:55 -04:00
Brian.Dyke
6f3d0508e4 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: f34bc4f81eb5ac92ef306f73f8c34243d3f78e31
2014-08-29 10:19:02 -04:00
Brian.Dyke
37c926973c Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: cff9bfd2697a73ccc18642d8dc057b6a27aa2991
2014-08-29 10:07:14 -04:00
Brian Clements
b352bd3944 Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: b3482522860408c2d052261e845899cf73c2ce96
2014-08-29 08:55:58 -05:00
Juliya Dynina
169dc0ba43 Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: bb260c4003b477ca51cf5fd9c8d54275af906772
2014-08-28 15:52:11 -05:00
Ana Rivera
160dabc4d1 VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1

Former-commit-id: 2df117a7aec644e6964da6c36326ab3b29b9f378
2014-08-28 18:38:26 +00:00
Roger Ferrel
6f8c6d6aa1 Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec

Former-commit-id: bcc9b0a6352151dfdf3ba75063bb87308cb162b4
2014-08-28 13:10:11 -05:00
David Friedman
de6e79f9e3 ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa

Former-commit-id: aca832a81bc18d954eadb51755ce04597cd264df
2014-08-28 18:08:23 +00:00
Daniel.Huffman
c89a7169b0 ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e

Former-commit-id: 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f
2014-08-28 17:20:30 +00:00
steve.naples
1856a05319 ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138

Former-commit-id: 2e8fb864f410b9b08ccc6de6c0d75666931da3a2
2014-08-28 16:08:17 +00:00
David Friedman
a2dfe8e8f6 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9

Former-commit-id: 6bfa1d6662b00925814be7126592bbe340651649
2014-08-28 15:43:32 +00:00
Brian.Dyke
47ae6015e5 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 3909fa46a4efffabb09303f139bc36accc064a6d
2014-08-28 11:39:48 -04:00
Brian.Dyke
e654318431 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: 7334d3991903dfe8a62728de33c21e81534fdbb6
2014-08-27 11:19:19 -04:00
Brian.Dyke
d168e371aa Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a6d5822b5cb5bb3aa62fcc95e980b08c685a3be3
2014-08-26 15:00:55 -04:00
Brian.Dyke
86f0ed23c1 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 2382e17fb6b947be89649da7c25698dc5baf5bf4
2014-08-26 13:31:34 -04:00
Daniel.Huffman
8962a069be ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0

Former-commit-id: 2107976bd25c429521d4df7a92a3726a38806ba3
2014-08-26 13:30:09 +00:00
Ron Anderson
4e6bbb4be4 Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
Former-commit-id: ae980bfccfedab3091b2708fae0dc36764dbffcb
2014-08-25 14:04:41 -05:00
Brian Clements
4314f71387 Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7

Former-commit-id: 2a0af03242692708b3e752417ca7d60d28520768
2014-08-25 13:34:36 -05:00
Nate Jensen
5e46c55a76 Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
Former-commit-id: bb08cb510dc3d774e040b7d3a164dfa1d581aa1c
2014-08-25 13:12:46 -05:00
Brian.Dyke
a4376ec79f Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: e673b3ff82b52be4cd4fbe2dab0859b98678f6ef
2014-08-22 16:40:51 -04:00
Brian.Dyke
325887e605 Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py

Former-commit-id: 65e2373d13c7d5b33d579b87d98a8265252ea391
2014-08-22 14:16:22 -04:00
steve.naples
c2bb43944c ASM #15664 Fixed issue with Tear Off menus not closing when perspective is closed, which caused an error.
Change-Id: If5fd120b7b34074686492d4cab9268ec1ac51a41

Former-commit-id: e719245823220d7b583ffdb0adc88c8b71321369
2014-08-22 15:21:35 +00:00
Brian Clements
d62db22874 Issue #3500 remove locking on osgi internals, rework gfe client startup
fixed error handling in loadConfig.py
added python to path in GfePyIncludeUtil
moved ProcedureXMLManager to overridable method in AbstractCaveComponent

Change-Id: Ie7dff55657ba216c47f7a56b3506cbed3a3f6ab2

Former-commit-id: b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684
2014-08-22 08:56:56 -05:00
Qinglu.Lin
fb92838427 ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b

Former-commit-id: b8a4741b2519e8c02a1b80ba8544be9b1c26d35c
2014-08-21 10:43:22 -04:00
Zihou Wang
3ffac397db VLab Issue #4464 - DR_17214 RADAR: NEXRAD Unit Status display problem due to the GSM change; fixes #4464
Change-Id: I0ca330e385000e04ef21142e75adfc55d4615a89

Former-commit-id: 288dc7c439995a8ab48680832b63f7d6974885b4
2014-08-21 12:04:30 +00:00
Rici.Yu
ae581dc444 ASM #15084 - check in files for DCS 25
Change-Id: I956d9f5175e8beb3d52db89035251add51973dda

Former-commit-id: eb85d059b64d9c2a41014d8f1762a61e58a5226b
2014-08-20 16:52:08 -04:00