Commit graph

6096 commits

Author SHA1 Message Date
Brian.Dyke
acc3321457 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: b3767167c7 [formerly 86f0ed23c1 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]
Former-commit-id: 86f0ed23c1
Former-commit-id: 489fec4b25
2014-08-26 13:31:34 -04:00
Brian.Dyke
b99d31c7e6 Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 59bacf90ac [formerly de56ccebc0 [formerly b13e744dbbcc332b9efd0799e87390bdf9bb1df3]]
Former-commit-id: de56ccebc0
Former-commit-id: 8ac44dfbd3
2014-08-26 10:56:45 -04:00
Daniel.Huffman
d7c82cf4be ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0

Former-commit-id: d1cd90b487 [formerly 8962a069be [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]]
Former-commit-id: 8962a069be
Former-commit-id: e2e132e7a5
2014-08-26 13:30:09 +00:00
Richard Peter
6396f11532 Merge "Issue #3537 Fixed dirPattern in category Local." into omaha_14.2.4
Former-commit-id: 008a3e8f80 [formerly 4ba39c5e56 [formerly 5bb3f4a1215902e867d3e9ec5ca1d122067afd7e]]
Former-commit-id: 4ba39c5e56
Former-commit-id: ab7facb903
2014-08-25 14:24:27 -05:00
Ron Anderson
dee9a699ad Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
Former-commit-id: 4285719a08 [formerly 4e6bbb4be4 [formerly ae980bfccfedab3091b2708fae0dc36764dbffcb]]
Former-commit-id: 4e6bbb4be4
Former-commit-id: 03173a9fe7
2014-08-25 14:04:41 -05:00
Brian Clements
5d794a5135 Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7

Former-commit-id: cf671dcda8 [formerly 4314f71387 [formerly 2a0af03242692708b3e752417ca7d60d28520768]]
Former-commit-id: 4314f71387
Former-commit-id: 960eb2dc29
2014-08-25 13:34:36 -05:00
Roger Ferrel
eb6992b3fa Issue #3537 Fixed dirPattern in category Local.
Former-commit-id: e451dd2814 [formerly c7a6040792 [formerly d40736ed992300be32ed4a62511fa436e9d167af]]
Former-commit-id: c7a6040792
Former-commit-id: 1ff321ce51
2014-08-25 13:23:44 -05:00
Nate Jensen
41a7e2dbcd Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
Former-commit-id: d66ac29640 [formerly 5e46c55a76 [formerly bb08cb510dc3d774e040b7d3a164dfa1d581aa1c]]
Former-commit-id: 5e46c55a76
Former-commit-id: 0852d804ba
2014-08-25 13:12:46 -05:00
Steve Harris
8a684bb351 Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
Former-commit-id: d850919303 [formerly a03b5201cb [formerly 67c81cedb7321baad8dcf5fb4cea21ac152d2dcd]]
Former-commit-id: a03b5201cb
Former-commit-id: 8aadfe944a
2014-08-25 08:19:50 -05:00
Brian.Dyke
aecf73e71a Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: 0fbc5269ea [formerly a4376ec79f [formerly e673b3ff82b52be4cd4fbe2dab0859b98678f6ef]]
Former-commit-id: a4376ec79f
Former-commit-id: a841eb53e5
2014-08-22 16:40:51 -04:00
Brian.Dyke
6402cb7d89 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: dd9d7133d9 [formerly 325887e605 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]
Former-commit-id: 325887e605
Former-commit-id: 2ddc920a4a
2014-08-22 14:16:22 -04:00
Brian.Dyke
64effd458c Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 94577a1626 [formerly a830b6d94c [formerly b2674ef57183706feb2bb17175d730bb2e213281]]
Former-commit-id: a830b6d94c
Former-commit-id: 5b2b0d2bd9
2014-08-22 14:13:48 -04:00
Richard Peter
ae3aa358e9 Issue #3534 Update ThreadBasedAppender to extend UnsychronizedAppenderBase.
Change-Id: I6b01acd59f7fde5e98dcfe1f1221f8725fc0540b

Former-commit-id: a9af2314d3 [formerly ce238544d1 [formerly 31e9cb1cfc15d79b204d4d16c1f7afa614bb9ca2]]
Former-commit-id: ce238544d1
Former-commit-id: 4cebb22560
2014-08-22 10:47:05 -05:00
steve.naples
5345a81859 ASM #15664 Fixed issue with Tear Off menus not closing when perspective is closed, which caused an error.
Change-Id: If5fd120b7b34074686492d4cab9268ec1ac51a41

Former-commit-id: 7690281c5c [formerly c2bb43944c [formerly e719245823220d7b583ffdb0adc88c8b71321369]]
Former-commit-id: c2bb43944c
Former-commit-id: 1bde9a4013
2014-08-22 15:21:35 +00:00
Brian Clements
d3f0f7dea4 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: 9f7905b58d [formerly d62db22874 [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]]
Former-commit-id: d62db22874
Former-commit-id: bcc3e405e5
2014-08-22 08:56:56 -05:00
Brian.Dyke
50765ea002 Merge branch 'master_14.2.4' into master_14.3.1
Former-commit-id: 412d44847c [formerly 88641b69f1 [formerly c4e9d3ff0cf7bd4f12c1a8d886b568eb7a8ff97a]]
Former-commit-id: 88641b69f1
Former-commit-id: 7ac47f5f03
2014-08-21 15:49:49 -04:00
Brian.Dyke
d4d26aaf75 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: aaabfa6cd0 [formerly 14d21b336d [formerly 614b2bb59424f01d2608cd2db3a14dbcd77c90e6]]
Former-commit-id: 14d21b336d
Former-commit-id: f6748f1e28
2014-08-21 12:07:16 -04:00
Brian.Dyke
e9cd8aba20 VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag
Former-commit-id: ae5656ca46 [formerly 7b8fef0fa3 [formerly 1b83b788aee082b489ce0fe5dc6d775e2f621e01]]
Former-commit-id: 7b8fef0fa3
Former-commit-id: 93be1a54c7
2014-08-21 11:07:02 -04:00
Qinglu.Lin
bd03ec7a6f ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b

Former-commit-id: 2157a4aa3b [formerly fb92838427 [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]]
Former-commit-id: fb92838427
Former-commit-id: 3cc94603a2
2014-08-21 10:43:22 -04:00
Zihou Wang
4d1413888c VLab Issue #4464 - DR_17214 RADAR: NEXRAD Unit Status display problem due to the GSM change; fixes #4464
Change-Id: I0ca330e385000e04ef21142e75adfc55d4615a89

Former-commit-id: a2a2a8cdf9 [formerly 3ffac397db [formerly 288dc7c439995a8ab48680832b63f7d6974885b4]]
Former-commit-id: 3ffac397db
Former-commit-id: dde3ee4904
2014-08-21 12:04:30 +00:00
Rici.Yu
2edc04f27e ASM #15084 - check in files for DCS 25
Change-Id: I956d9f5175e8beb3d52db89035251add51973dda

Former-commit-id: e5c4562e83 [formerly ae581dc444 [formerly eb85d059b64d9c2a41014d8f1762a61e58a5226b]]
Former-commit-id: ae581dc444
Former-commit-id: 30aaafc702
2014-08-20 16:52:08 -04:00
steve.naples
ccd7b7e2ad ASM #14807 Updated snow file parser in ReadSnowData to fix parsing issues.
Change-Id: I5182f2640baebbb0f5c6d66e5a3d81da7461af69

Former-commit-id: 4be6abad1b [formerly 179031d9b4 [formerly 67e36d96d0acaa8dfdf61164a5c66fbda9dd753b]]
Former-commit-id: 179031d9b4
Former-commit-id: 765fa2dc4e
2014-08-20 17:17:14 +00:00
Ron Anderson
07ea3be623 Issue #3526 Fix bug in WECache that caused ISC grids to be removed
Change-Id: I49feb0d093a75c83b9a09deeed15e81cf0ed967b

Former-commit-id: 8c4cb3b4ae [formerly 62236ee92a [formerly edd1c5d77ec7a84b5807134d863d59147a846405]]
Former-commit-id: 62236ee92a
Former-commit-id: a19f819e44
2014-08-20 11:03:03 -05:00
Zihou Wang
9f6cb88fb6 VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; fixes #3990
Change-Id: Ib6be85a3fb40649a093c8cd5d9278f324edb3a7f

Former-commit-id: 45d8572343 [formerly 9b68bea7c3 [formerly 3d305bffddf34d38b65176280e40709549f09ee5]]
Former-commit-id: 9b68bea7c3
Former-commit-id: 3fa6a7840e
2014-08-20 14:20:17 +00:00
David Friedman
280f4a4b64 ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f

Former-commit-id: 6a7638ddae [formerly 78ee5a56c5 [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]
Former-commit-id: 78ee5a56c5
Former-commit-id: b053e1e2ce
2014-08-20 14:13:32 +00:00
Roger Ferrel
c7cf1e9273 Issue #3439 Name change per suggestions in email.
Former-commit-id: f110ca1f3d [formerly fb54b80ed5 [formerly 44c3b86c9dc0b978acc66c5f79255270ce0acb41]]
Former-commit-id: fb54b80ed5
Former-commit-id: d76722987e
2014-08-19 16:41:06 -05:00
Steve Harris
7a8a23973c Merge branch 'master_14.2.2' (14.2.2-27,28) into omaha_14.2.2
Former-commit-id: 5dd1435a5e [formerly 0d6d3bd7f5 [formerly 8f436bd859a52374fe5788102465a6a20355fda2]]
Former-commit-id: 0d6d3bd7f5
Former-commit-id: c998370edd
2014-08-19 12:38:53 -05:00
Slav Korolev
7c336276f4 Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761

This reverts commit f4eec5a328 [formerly 55a1120bdb] [formerly dd9d117f90] [formerly e5af41fa86 [formerly dd9d117f90 [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: a779c786f1 [formerly a9bed4c6fd [formerly aee044437492438381db98cc6fd3a917f6c05659]]
Former-commit-id: b71eede7035735ce741264c7dc1f4fd70b9cb41f [formerly a9bed4c6fd]
Former-commit-id: 1c896cedab
2014-08-19 10:12:36 -05:00
Brian Clements
7ac071e0f9 Issue #3542 fixed lightning count clipping issue
Change-Id: I40aa62558542d3da9b3abd8f82de9e5d8244870b

Former-commit-id: fc2e7f52b9 [formerly 78796c3f6e [formerly 937c656ba2a9fc98bfa5655a5020d470f83b898f]]
Former-commit-id: 78796c3f6e
Former-commit-id: 9e33cf1f5f
2014-08-19 09:00:58 -05:00
Richard Peter
d8de3c2d7a Merge "Issue #2875 - re-compile grib2.so with g2clib changes" into omaha_14.2.4
Former-commit-id: 65942275df [formerly cae1c14c01 [formerly a9fef10a950d5f138088dce74b1709a25eb5cdfa]]
Former-commit-id: cae1c14c01
Former-commit-id: 31ea5b534c
2014-08-19 08:58:23 -05:00
Nate Jensen
bed1070749 Merge "Issue #3497 refactored syntax check to prevent infinite loop possibility and apply some sanity" into omaha_14.2.4
Former-commit-id: 7c4a57e518 [formerly f9036405d6 [formerly fe105be09b018efb625194f692ae9686a898981e]]
Former-commit-id: f9036405d6
Former-commit-id: 2ef19db3b7
2014-08-19 08:37:47 -05:00
Nate Jensen
41639f767e Merge "Issue #3500 added bundle loader synchronization" into omaha_14.2.4
Former-commit-id: f14b66d040 [formerly 15b7d9a39b [formerly 20431b0b036c3386f0f471887ebaeac5940463e4]]
Former-commit-id: 15b7d9a39b
Former-commit-id: 178236b9c7
2014-08-19 08:37:35 -05:00
Steve Harris
cd7b8ccb74 Issue #2875 - re-compile grib2.so with g2clib changes
This reverts commit 42418f76de [formerly 68d2d83309] [formerly 2c7e22f825] [formerly fab7989b69 [formerly 2c7e22f825 [formerly 96094af605a2a303d440f009b25dd9740194a5ca]]].


Former-commit-id: cddc961f2c [formerly 5f6a29c515 [formerly 2b1665a1d9a1314bb6b0012161a6409ca2e6ebf8]]
Former-commit-id: 5f6a29c515
Former-commit-id: 7fa6315202
2014-08-19 08:18:11 -05:00
Brian.Dyke
52a47dc75e VLab Issue #3617 - DCS_266 Ingest & Display HRRR - LevelMappingFile.xml
Former-commit-id: aa6e025b14 [formerly f52f2b1c25 [formerly 93c1663761e65e870262bc4fdf4028b08e20c85a]]
Former-commit-id: f52f2b1c25
Former-commit-id: 0c10dc2ee0
2014-08-18 14:18:05 -04:00
Brian.Dyke
a16d1d02b2 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: ca564e58ea [formerly ef9ddd0f98 [formerly 3c1db35ef591bfe9c5124ad9c4c801d6acbdb8f8]]
Former-commit-id: ef9ddd0f98
Former-commit-id: 3bba82c371
2014-08-18 13:17:13 -04:00
Brian.Dyke
867b82ca10 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: d82d58d38e [formerly 9a212410b5 [formerly 5c9880c3179bf376798bb5658aec3666bddd7d3e]]
Former-commit-id: 9a212410b5
Former-commit-id: 2054d6f844
2014-08-18 11:47:38 -04:00
Brian.Dyke
367d7d8840 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 4d47e00887 [formerly 0bdacc25f6 [formerly 7a7e030bd70bb5bfee849750f1a8e1e4238ec0ee]]
Former-commit-id: 0bdacc25f6
Former-commit-id: f33e622e9d
2014-08-18 10:20:49 -04:00
Melissa Porricel
c05a460f4d ASM #15699 - Fix Grib decoder error
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511

Former-commit-id: 7e78946ee0 [formerly 67e44f145a [formerly e8c156d166cedc1553f9ffd8867633651443872d]]
Former-commit-id: 67e44f145a
Former-commit-id: 9f20c63f97
2014-08-15 13:41:53 -04:00
Zihou Wang
d71def2617 VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce

Former-commit-id: f54da5f6ae [formerly e9f78d8f52 [formerly f61e935c0372ee19768f2080da1f8fa21fb9aeb1]]
Former-commit-id: e9f78d8f52
Former-commit-id: 2fd6278cf3
2014-08-15 11:04:39 -05:00
Ana Rivera
2f13aed851 VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e

Conflicts:
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4c585af933 [formerly 9ada9356c5 [formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]]
Former-commit-id: 9ada9356c5
Former-commit-id: 11073fdece
2014-08-15 11:04:23 -05:00
Stephen Gilbert
85fc4aafa4 VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Former-commit-id: 77fa357a15 [formerly f6225b8969 [formerly aef15e75c53666aa65dd4687725e9dbd8e6122e0]]
Former-commit-id: f6225b8969
Former-commit-id: 84c3e1ed26
2014-08-15 11:03:48 -05:00
Fay.Liang
802de9c08f ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm

Former-commit-id: 77a6ab632f [formerly f5901b8ede [formerly 89c29c1228830d301b7046ebb7d4281666c2b768]]
Former-commit-id: f5901b8ede
Former-commit-id: c2dd7c183f
2014-08-15 11:03:15 -05:00
Ana Rivera
0a812a313d VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 9bf2df23be [formerly a44d5d91db [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]]
Former-commit-id: a44d5d91db
Former-commit-id: 1daa44291e
2014-08-15 11:02:36 -05:00
David Friedman
dbcabbfa1f ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature
Change-Id: I1bf62b197f65073dc26356e9eb67d32f7f8ee45c

Former-commit-id: 62f152ad70 [formerly 913330902d [formerly b3947c58da51f964032e9539c010030c2cbe0731]]
Former-commit-id: 913330902d
Former-commit-id: 5604904fc8
2014-08-15 11:01:42 -05:00
Qinglu.Lin
dbb3a9f8b6 ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch
Change-Id: I5ef8e83c826d3fb1d5ef72d5866f882d9c97e1f5

Former-commit-id: ff551ea143 [formerly 9a9e32dc53 [formerly bafc616881af28b5397c45c5155a3c812a9c048d]]
Former-commit-id: 9a9e32dc53
Former-commit-id: 8693097b0b
2014-08-15 11:01:30 -05:00
Ana Rivera
a258f0f812 VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml

Former-commit-id: 95451b2959 [formerly a053fd5bad [formerly d95450f2eebc6b3d10093bd16736b349a1d0b12b]]
Former-commit-id: a053fd5bad
Former-commit-id: cc354742e1
2014-08-15 11:01:23 -05:00
Kiran.Shrestha
3b74de56a4 ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b

Former-commit-id: ca120a4106 [formerly e7173dd45a [formerly b83aef5ef55a58d9f267fd7a80184482d1e5d092]]
Former-commit-id: e7173dd45a
Former-commit-id: d307a6aa9c
2014-08-15 11:00:19 -05:00
Loubna.Bousaidi
281f16d700 ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: d41e489ced [formerly 8c15d1f124 [formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]]
Former-commit-id: 8c15d1f124
Former-commit-id: afae4700a6
2014-08-15 10:54:10 -05:00
Loubna.Bousaidi
70b7c5cb00 ASM #578 apply gross range check to the adjusted value
Change-Id: Ia90bc10e6e1e1baa8f3842ade56d7551ca405e34

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Former-commit-id: 213773cde4 [formerly e109528caf [formerly d1d86dd82bfa114bf181de5cf993f2bed349ada5]]
Former-commit-id: e109528caf
Former-commit-id: 8038fc4a8d
2014-08-15 10:53:47 -05:00
Brian.Dyke
a346d38358 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: d3888b16f3 [formerly 8b1b457310 [formerly bdfe1c263b8bcc0f6ebc8fd31c506e76271319ea]]
Former-commit-id: 8b1b457310
Former-commit-id: a73c8d4cda
2014-08-15 11:52:35 -04:00