Commit graph

3330 commits

Author SHA1 Message Date
Ron Anderson
19bd85af5e Issue #3592 Significantly reworked SampleSetManager and sample set dialogs to better match A1 behavior.
Change-Id: I8aef618a5091ee7acae470f5729add3c44287f30

Former-commit-id: bb859073c6ab56141434b84dc104857759a81d82
2014-09-16 13:20:40 -05:00
Steve Harris
57f0a992d9 Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
Former-commit-id: 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf
2014-09-15 21:13:56 -05:00
Slav Korolev
65d1cca6fd Issue #2757 - Removed unnecessary dialogs.
Former-commit-id: 1a906e4f7a5e7cc9e4cd8b4a717f0f2bb02cbb61
2014-09-15 17:46:10 -04:00
Roger Ferrel
28347129a1 Issue #3516 ColorMapTree change listener now only gets colormaps changes.
Change-Id: Id19d0c0e958ec64a19abc064817780d067add023

Former-commit-id: bb265611d13e6cb9812aca3966d9fe2a20990a36
2014-09-12 15:03:13 -05:00
Roger Ferrel
246bc4770f Issue #3516 - Get Color Maps for levels off the dispatch thread.
Change-Id: Icc89f4860eef0b0b404e1e5b66bb0178eedd73dc

Former-commit-id: a67a429eb2d266e66a99b6c18916193cd0d20d9d
2014-09-11 14:36:50 -05:00
Ben Steffensmeier
ed7b816989 Issue #3604 Fix NPE in Imaging Dialog.
Former-commit-id: e2043fd8034dde47963a32108b1475ee7db1ea18
2014-09-10 14:43:23 -05:00
Ron Anderson
b91141ef7b Issue #3592 Fixed several localization issue in GFE
Change-Id: I2e65649d490372b5c1738f07c79b5ed15885f8c7

Former-commit-id: a5ef55df33009948fec139e7729dd53ae4251667
2014-09-09 16:10:53 -05:00
Brian.Dyke
01dfe503f5 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
Brian.Dyke
af477df90e 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
702dd65aa7 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
a610fe6475 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
e5227e90de 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
902b6c55bd 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
87d507313b 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
afa45bf919 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
14e64881a1 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
611e036e75 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
b1dbaa0b50 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
ae13ea419e 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
434d412882 Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce

Former-commit-id: e2ecb91569c2f622d45f7301c1eb4e058a2ab641
2014-09-02 12:21:42 -05:00
Steve Harris
e7705c328e 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
Ben Steffensmeier
190893e807 Issue #3543 Fix gl datamapping of data with NaN conversions.
Former-commit-id: bc12be9bb6e8c7f63550602f51bca3448c21d4c6
2014-08-29 15:08:03 -05:00
Kiran.Shrestha
d8bd6a9c70 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
a2f66c8d97 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
cfeb16eff8 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
58a3df78a8 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
9af77831a6 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
ef5dfb1f93 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
d5c086a022 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
ca2aa8811b 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
ff52f1dc0a 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
ea9230b37c 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
a24794ca7b 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
aa83bf804f 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
b3767167c7 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
d1cd90b487 ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0

Former-commit-id: 2107976bd25c429521d4df7a92a3726a38806ba3
2014-08-26 13:30:09 +00:00
Ron Anderson
4285719a08 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
cf671dcda8 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
d66ac29640 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
0fbc5269ea 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
dd9d7133d9 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
7690281c5c 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
9f7905b58d 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
2157a4aa3b 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
a2a2a8cdf9 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
steve.naples
4be6abad1b ASM #14807 Updated snow file parser in ReadSnowData to fix parsing issues.
Change-Id: I5182f2640baebbb0f5c6d66e5a3d81da7461af69

Former-commit-id: 67e36d96d0acaa8dfdf61164a5c66fbda9dd753b
2014-08-20 17:17:14 +00:00
David Friedman
6a7638ddae ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f

Former-commit-id: 7027ff533991251f64f2e5a0deb31e2945cdde5f
2014-08-20 14:13:32 +00:00
Slav Korolev
a779c786f1 Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761

This reverts commit e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f].

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: aee044437492438381db98cc6fd3a917f6c05659
2014-08-19 10:12:36 -05:00
Brian Clements
fc2e7f52b9 Issue #3542 fixed lightning count clipping issue
Change-Id: I40aa62558542d3da9b3abd8f82de9e5d8244870b

Former-commit-id: 937c656ba2a9fc98bfa5655a5020d470f83b898f
2014-08-19 09:00:58 -05:00
Nate Jensen
7c4a57e518 Merge "Issue #3497 refactored syntax check to prevent infinite loop possibility and apply some sanity" into omaha_14.2.4
Former-commit-id: fe105be09b018efb625194f692ae9686a898981e
2014-08-19 08:37:47 -05:00