Steve Harris
07a7645fcd
Merge branch 'master_14.3.1' (14.3.1-19) into omaha_14.3.1
...
Former-commit-id: c72e05b87f6eb6d094bde5e7caec3cccb20476ce
2014-09-19 11:13:46 -05:00
Brian.Dyke
e1c88f287a
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f
2014-09-17 15:50:13 -04:00
Brian.Dyke
a155bbd8c1
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 0813f96fbb673fdbbdb2c0f049ec722a80b212f9
2014-09-17 15:45:27 -04:00
Ron Anderson
5c7290bf7c
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
Ana Rivera
2e66ced748
Merge "VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723 " into field_14.3.1
...
Former-commit-id: c7c530f99f8585817544db2d7be5b13d47c3e62e
2014-09-16 08:05:51 -04:00
Steve Harris
d5c0049ba2
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
Jordan Gerth
86b34a2f70
VLab Issue #4487 - Dim. DR 17313, Additional true color capabilities; fixes #4487
...
Change-Id: I701f302aa5958e89522208fd7915f5077cf97616
Former-commit-id: 1300009502bafd34fee13c8d21d65208b1069bda
2014-09-15 19:14:13 -05:00
Jordan Gerth
d6eb692733
VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723
...
Change-Id: I20b309f4e994259a54e6bdb2276bc09a6b60a885
Former-commit-id: baf75c177b595dcfb545436586c31d28080b8281
2014-09-15 16:30:22 -05:00
Ron Anderson
52e5636261
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
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
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
Baoyu Yin
2c4a9fbe7c
VLab Issue #4624 - AWIPS2_DR_17545 Volume Browser MMP units are wrong ; fixes #4624
...
Change-Id: I407cf142f9adfc7601b14e12e33223cf344b596c
Former-commit-id: 0eb76fb764113196683d8ae771d7cf37ccc86495
2014-09-05 13:35:07 -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
d7407481ef
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: c1f870d9df7579741e5a1d79cdec77293115e968
2014-09-05 10:57:14 -04:00
Ana Rivera
6d48576930
VLab Issue #4601 - Update to SMS DR #16720 ; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
...
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: 084970f8445dbb6b76bbad84b5dc986d961d2383
2014-09-05 13:27:29 +00:00
Brian.Dyke
043a95d35e
Merge branch 'master_14.2.2' into master_14.2.3
...
Former-commit-id: 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a
2014-09-03 21:14:27 -04:00
Brian.Dyke
121a2d100f
ASM #15697 - Fix Hydro Perspective Issue
...
Former-commit-id: 82d7bbe6bf005e543e1ad6772c6a18024f1b0764
2014-09-03 21:10:16 -04: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
Richard Peter
3de26efce6
Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
...
Former-commit-id: 5f9298d52d0a11775588ed3742f2c2d3f19da1d0
2014-09-03 09:42:34 -05:00
Nate Jensen
0f35426ad0
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
...
Former-commit-id: 9e0f31fc6601a39938deeaf7e1c8ed8849e43288
2014-09-02 17:34:59 -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
Benjamin Phillippe
7265bf54c7
Issue #3560 Registry objects not re-sent after fully sync
...
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0
Former-commit-id: 15e57fc58bee1045c5574e4d66a727a672ac83cb
2014-09-02 14:46:50 -05: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
Richard Peter
be2474da34
Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
...
Former-commit-id: 6789576e88de568c6014c29d099349cec40c7c74
2014-09-02 12:15:38 -05:00
Benjamin Phillippe
ab8b2ef473
Issue #3560 Fix for registry memory issue
...
Former-commit-id: a6e4a2cac4d6f9390c5181439a6c834db56a95c6
2014-09-02 10:00:35 -05:00
Dave Hladky
9c3b002990
Issue #3564 Allow for un-authenicated WFS HTTPS connections.
...
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a
Former-commit-id: 7afe5332fcf41bbc8bb2411944584405f3ba686a
2014-09-02 09:38:21 -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
Baoyu Yin
bf5bb1bacf
VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563
...
Change-Id: I5f5c55486f209b89ecf276bb38d3d42c7f60d1d1
Former-commit-id: 5189ae1c3ce12320045c431d9552036ea9272cef
2014-08-29 10:17:54 -04: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
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
Baoyu Yin
2d3589e7af
VLab Issue #4554 - AWIPS2_DR_17469 Radar Digital Vertical Integrated Liquid wrongly capped at value of >60 kg*m^-2; fixes #4554
...
Change-Id: I78b45576bd2be9e3baa1f85da5a124de60842e3b
Former-commit-id: 8d3b878a9c32b77e7bb19b087e7da8de492a4481
2014-08-28 09:50:26 -04:00
Baoyu Yin
a42c9f6bc2
VLab Issue #4553 - AWIPS2_DR_16047 Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553
...
Change-Id: I20f7aeb70828c27e1e6250c54f90f82b88390056
Former-commit-id: 3aabef4b96bfb848bb5201d8eac2681b3dc49c83
2014-08-28 08:34:34 -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
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
Roger Ferrel
c7a6040792
Issue #3537 Fixed dirPattern in category Local.
...
Former-commit-id: d40736ed992300be32ed4a62511fa436e9d167af
2014-08-25 13:23:44 -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
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
Brian.Dyke
a830b6d94c
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: b2674ef57183706feb2bb17175d730bb2e213281
2014-08-22 14:13:48 -04:00
Richard Peter
ce238544d1
Issue #3534 Update ThreadBasedAppender to extend UnsychronizedAppenderBase.
...
Change-Id: I6b01acd59f7fde5e98dcfe1f1221f8725fc0540b
Former-commit-id: 31e9cb1cfc15d79b204d4d16c1f7afa614bb9ca2
2014-08-22 10:47:05 -05: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
Brian.Dyke
14d21b336d
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 614b2bb59424f01d2608cd2db3a14dbcd77c90e6
2014-08-21 12:07:16 -04:00
Brian.Dyke
7b8fef0fa3
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag
...
Former-commit-id: 1b83b788aee082b489ce0fe5dc6d775e2f621e01
2014-08-21 11:07:02 -04:00
Ron Anderson
62236ee92a
Issue #3526 Fix bug in WECache that caused ISC grids to be removed
...
Change-Id: I49feb0d093a75c83b9a09deeed15e81cf0ed967b
Former-commit-id: edd1c5d77ec7a84b5807134d863d59147a846405
2014-08-20 11:03:03 -05:00
Zihou Wang
9b68bea7c3
VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; fixes #3990
...
Change-Id: Ib6be85a3fb40649a093c8cd5d9278f324edb3a7f
Former-commit-id: 3d305bffddf34d38b65176280e40709549f09ee5
2014-08-20 14:20:17 +00:00
Roger Ferrel
fb54b80ed5
Issue #3439 Name change per suggestions in email.
...
Former-commit-id: 44c3b86c9dc0b978acc66c5f79255270ce0acb41
2014-08-19 16:41:06 -05:00
Slav Korolev
a9bed4c6fd
Issue #2875 - Implemented HFR Surface Current Velocity.
...
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761
This reverts commit dd9d117f90
2014-08-19 10:12:36 -05:00
Brian.Dyke
9a212410b5
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: 5c9880c3179bf376798bb5658aec3666bddd7d3e
2014-08-18 11:47:38 -04:00
