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
Nate Jensen
8536f6681a
Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1
...
Former-commit-id: 2bac6ff5e600218f61343a7dc0f540c27f291924
2014-08-27 16:27:40 -05:00
Roger Ferrel
9154ef60bb
Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
...
Former-commit-id: 474e07b299246aee4e6b214226c176c4a10aa866
2014-08-27 15:06:52 -05: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
Nate Jensen
7acf4a04b2
Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
...
Former-commit-id: bdc7d4cb7873651a4b59e0b6af9bb9dae931de77
2014-08-27 09:54:49 -05:00
Nate Jensen
1ad37de1ef
Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1
...
Former-commit-id: 93e8fb3b1b27bdce2b15397e2ee7db6f1b419a05
2014-08-27 09:54:24 -05:00
Brian Clements
f871058f67
Omaha #3539 reworked link to editor action to avoid recursion warning
...
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01
Former-commit-id: dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3
2014-08-26 17:22:20 -05:00
Nate Jensen
fdc4cc60b9
Omaha #3356 configure path manager factory before spring initialization
...
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44
Former-commit-id: 263452a82aef4756492fe02156525137b5ca09ff
2014-08-26 16:45:00 -05:00
Steve Harris
038b284066
Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
Former-commit-id: 03ba5101d6f277b55173f72c2a63869e9dc31c3f
2014-08-26 16:25:21 -05:00
Nate Jensen
b92d94d19d
Merge "Omaha #3368 - removing cave/hydro" into omaha_14.4.1
...
Former-commit-id: d5db15de813a41767a1a10b0bfa07eb88c8dff6e
2014-08-26 13:42:13 -05: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
73fec5c36a
Merge "Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job" into omaha_14.4.1
...
Former-commit-id: 2cfb44f69025ba06e85a44e481bac1f88b851834
2014-08-25 16:18:58 -05:00
Nate Jensen
1a48a8190f
Merge "Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override" into omaha_14.4.1
...
Former-commit-id: 5a0ccfe4b1effb0946e6d542c492bff45d6a904b
2014-08-25 14:14:47 -05: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
Mark Peters
6634a2df01
Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override
...
Change-Id: Ic4a3a517327944f6c6ef7b20bc1774bca6c39d0e
Former-commit-id: 449f167ce1c30a595b4b673fc4d71658500e844d
2014-08-25 13:50:27 -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
Ron Anderson
606e2b210c
Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job
...
Change-Id: Id759e14fcec25a68add1b65e9bf48d836ada14c0
Former-commit-id: 6b6213fe5b0ca48045fa59136b72efdf46f7e3f1
2014-08-25 12:39:58 -05:00
Roger Ferrel
d0779ef059
Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
...
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790
Former-commit-id: f16a8ff2c51c392957e13ef63423abe9f99b3301
2014-08-25 07:59:26 -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 Harris
9cda8755c6
Omaha #3368 - removing cave/hydro
...
Former-commit-id: a232972763ef0dcbccd5d83b3841498f1b77b7aa
2014-08-22 13:08:32 -05: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
Greg Armendariz
b951f0e4eb
Merge "Omaha #3368 - Move ohd plugin to new repository" into omaha_14.4.1
...
Former-commit-id: 24376606c4974e3b22f120dac1c81a1752771ab1
2014-08-22 08:06:13 -05:00
Steve Harris
28e88dfe7e
Omaha #3368 - Move ohd plugin to new repository
...
Former-commit-id: 56dfed379b0e41c435a3226c3f02b9bc5232b4fd
2014-08-21 11:04:08 -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
Ron Anderson
bb124e7fa2
Omaha #1664 Fixed invalid thread access in several GFE dialogs
...
Change-Id: Ib40e6928c61a0f9e4f9fad9d8e7a06a66af292e3
Former-commit-id: 93aa457f4918cd16edd21422819cda12af26250f
2014-08-21 09:25:14 -05: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
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
Nate Jensen
f14b66d040
Merge "Issue #3500 added bundle loader synchronization" into omaha_14.2.4
...
Former-commit-id: 20431b0b036c3386f0f471887ebaeac5940463e4
2014-08-19 08:37:35 -05:00
Robert Blum
5ddadc2015
Omaha #3453 Added the spell check dictionary to site level localization.
...
Former-commit-id: f561e979ad047319c6c7f12cf13633868ed9edea
2014-08-18 15:09:30 -05:00
Brian.Dyke
aa6e025b14
VLab Issue #3617 - DCS_266 Ingest & Display HRRR - LevelMappingFile.xml
...
Former-commit-id: 93c1663761e65e870262bc4fdf4028b08e20c85a
2014-08-18 14:18:05 -04:00
Nate Jensen
beade19cff
Merge "Omaha #3356 export collaboration radar package so serialization can detect it" into omaha_14.4.1
...
Former-commit-id: c2be8077792e13bedd6051fb53b51fb651ad63b9
2014-08-15 15:39:50 -05:00
Nate Jensen
82a0c85bca
Omaha #3356 export collaboration radar package so serialization can detect it
...
Change-Id: I69b49ce7ec0a616bfb91d5a4e784d889526e04ae
Former-commit-id: c989377ccd931e5414cfdffeca111a1714a7ce42
2014-08-15 15:27:22 -05:00
Brian Clements
b6106ae8cd
Omaha #3522 geotiff resources uses TileSetRenderable
...
Change-Id: I6f7bf69edb2f696847d44323511c0de219b96852
Former-commit-id: 9514da9d0aed2e2446412dad9f201642288e6aae
2014-08-15 15:19:22 -05:00
Nate Jensen
84e99f7367
Omaha #3535 bigger inset map point on time series
...
Change-Id: I61a8eba411c49144422f300cca3d2df45b4ebf02
Former-commit-id: 552b1309c5a9665db3eac75235f202245cb9a76e
2014-08-15 11:27:03 -05:00
Zihou Wang
f54da5f6ae
VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
...
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce
Former-commit-id: f61e935c0372ee19768f2080da1f8fa21fb9aeb1
2014-08-15 11:04:39 -05:00
Ana Rivera
4c585af933
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: 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2
2014-08-15 11:04:23 -05:00
Ana Rivera
9bf2df23be
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: b7815d59250a73ee587d57bd2ece84691fe8707c
2014-08-15 11:02:36 -05:00
Ana Rivera
95451b2959
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: d95450f2eebc6b3d10093bd16736b349a1d0b12b
2014-08-15 11:01:23 -05:00
Kiran.Shrestha
ca120a4106
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
...
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b
Former-commit-id: b83aef5ef55a58d9f267fd7a80184482d1e5d092
2014-08-15 11:00:19 -05:00
Loubna.Bousaidi
d41e489ced
ASM #511 changes to transmit_rfc_bias calls from MPE
...
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: a43ad03838d53d3b9688b48851f41a1af6b043f6
2014-08-15 10:54:10 -05:00
Michael Gamazaychikov
c14a5287ac
ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
...
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805
Former-commit-id: 126ec43423a864df597bd6dd745671ee0bf4fbfb
2014-08-15 11:03:23 -04:00
