Commit graph

3443 commits

Author SHA1 Message Date
Sarah Pontius
46b621c669 VLab Issue #5595 - HLS/TCV remaining task work and bug fix for 14.3.2 SwIT; fixes #5595
Change-Id: I872c55de264205ee60c369802075b32b5753fe5d

Former-commit-id: a12b79c69c [formerly 1ed6581ceb [formerly f7aeeb643ec6302e5af82838992f68ecf48ce702]]
Former-commit-id: 1ed6581ceb
Former-commit-id: 91dd50792f
2014-12-09 12:49:45 -07:00
Sarah Pontius
5bc5175729 VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565

Former-commit-id: 5d696b412d [formerly 171a802190 [formerly 24c01f47449607347812e0e676f1d14849d3b47e]]
Former-commit-id: 171a802190
Former-commit-id: 2b37fe2994
2014-12-03 11:19:06 -07:00
Ana Rivera
fd10fd21a5 VLab Issue #5408 - TCV Update: TCVDictionary.py (O&M RM14468); fixes #5408
Change-Id: If7b45b6415653efe11485956755cd7aaeb49356b

Former-commit-id: 4a4e53cab1 [formerly 250ba9f14c [formerly 82e3e8e69e7ebe738a84603c6f901d619004fe8a]]
Former-commit-id: 250ba9f14c
Former-commit-id: 144d7201a3
2014-11-21 13:19:59 +00:00
Ron Anderson
b222744a68 VLab Issue #4953 Build fix and another cleanup item.
Change-Id: I5d92df3f452259c93784cd19e75cc7efd8e04dc4

Former-commit-id: 8e4f2100cb [formerly 9485f33476 [formerly 7a33861e7ac4475855778f50e0a5fca5227e5f97]]
Former-commit-id: 9485f33476
Former-commit-id: cd44c42d18
2014-11-20 17:07:58 -06:00
Shawn Hooper
7ddf3117bb VLab Issue #5395 - Update gfeConfig.py based on Pablo's email
Change-Id: I100a8d2bb79092bca2157bba018566a650c55f4a

Former-commit-id: 8376f3fce5 [formerly 31d8337c56 [formerly c5278c1a2d81d995ae9df252c461123bcc870320]]
Former-commit-id: 31d8337c56
Former-commit-id: 5773b07a29
2014-11-20 17:11:42 -05:00
Shawn Hooper
c3da295cf3 VLab Issue #5395 - Build fixes and gfeConfig.py update
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: cf72b5753d [formerly b7369c5eef [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]
Former-commit-id: b7369c5eef
Former-commit-id: fd57e5334c
2014-11-20 13:12:16 -05:00
Ana Rivera
cf2ab16b53 VLab Issue #5388 - HTI Update: replace 'MFL' references with SITE in HTI.xml (O&M RM16791); fixes #5388
Change-Id: I69ead4e0ed1103ca21728e46fa654ebaa85258a0

Former-commit-id: c8a750b063 [formerly 29ff0e472b [formerly 27d2c6133b5563614b88fa03e3e706c6da2070a4]]
Former-commit-id: 29ff0e472b
Former-commit-id: ed6514067f
2014-11-20 13:57:19 +00:00
Ana Rivera
c5366c9cd7 Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2
Former-commit-id: 40855f4ebd [formerly 7dacc070d2 [formerly a0946643e3dab3f54c9d1d7a48dbb06b82207b55]]
Former-commit-id: 7dacc070d2
Former-commit-id: 419dc9ff10
2014-11-19 16:27:03 -05:00
Ana Rivera
9881e53e34 VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df

Former-commit-id: af00fd8a98 [formerly 2c388bd379 [formerly 7d9cf7bfb3f513314608b6269f437061fc36d090]]
Former-commit-id: 2c388bd379
Former-commit-id: befcdc96f9
2014-11-19 20:29:42 +00:00
Ron Anderson
fdafc8c3b8 VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: 9104023408 [formerly bb451e58c3 [formerly e8ac81c5850b8565ea1e375857cf9dfe531848a0]]
Former-commit-id: bb451e58c3
Former-commit-id: f88fc45470
2014-11-19 11:31:49 -06:00
Ana Rivera
ba2775f167 VLab Issue #5355 - HTI Update: TCFloodingRainThreat.py (O&M RM16791); fixes #5355
Change-Id: I6461bf9294f037a361f02d3a0de83bf41147e819

Former-commit-id: f1009bccc2 [formerly ac523f4a45 [formerly 682cf4e6376265d0e590cfd1c05f7591204d0e0a]]
Former-commit-id: ac523f4a45
Former-commit-id: e125c384f5
2014-11-18 16:06:22 +00:00
Ana Rivera
a469e36107 VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: e54f3305d8 [formerly 061fd0af28 [formerly 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42]]
Former-commit-id: 061fd0af28
Former-commit-id: 499c58a253
2014-11-14 16:58:11 +00:00
Ron Anderson
0bafb89898 VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files.
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30

Former-commit-id: fe531a33e5 [formerly 04b8ffbcd2 [formerly c9d45db2fe6d4693c02b8788d0c7d44b21f5359f]]
Former-commit-id: 04b8ffbcd2
Former-commit-id: 80670c1b7a
2014-11-12 14:50:21 -06:00
Sarah Pontius
24498805c3 VLab Issue #5277 - HLS/TCV code for OPG 11-17-2014; fixes #5277
Change-Id: I258b2f8c8ddb7f45b02b1035f6fa5006b9fabe1b

Former-commit-id: 061583cd50 [formerly 1ae8fe99aa [formerly 0db3944372ecc381df4e8a918829530391d598db]]
Former-commit-id: 1ae8fe99aa
Former-commit-id: d20799e942
2014-11-10 11:20:09 -07:00
Sarah Pontius
5ad38545a0 VLab Issue #5129 - Merging code from tropical_hazard_formatters to tcv_14.3.2; fixes #5129
Change-Id: Ia7365620c5cc803faa25af4d6c32d3e394497626

Former-commit-id: 760c0d6532 [formerly d7e8bc97b6 [formerly eee97946890b5b0df941e2665a4a183eece14598]]
Former-commit-id: d7e8bc97b6
Former-commit-id: 8d3958527b
2014-10-29 13:33:24 -06:00
Sarah Pontius
87688a1e86 VLab Issue #5012 - HLS/TCV files for OPG Oct-15-2014; fixes #5012
Change-Id: Iacf701775c343077102647136272c92d08776caa

Former-commit-id: cdb47ed221 [formerly 8be0082cc2 [formerly c7b2c66316ccca08b56fe9ece8f8a24ec260207b]]
Former-commit-id: 8be0082cc2
Former-commit-id: 776886f5ea
2014-10-15 10:15:30 -06:00
Sarah Pontius
95ccd7c46f VLab Issue #5001 - HLS/TCV files for OPG Oct-2014; fixes #5001
Change-Id: I4018168e958a75ff7db3dd6cfd88a4ac17947981

Former-commit-id: 6dee51cb9f [formerly 2a96302bfb [formerly b7ccb5162f481e81dc50fcf63b200ab06a959cb8]]
Former-commit-id: 2a96302bfb
Former-commit-id: 3348a672be
2014-10-14 12:04:50 -06:00
Brian.Dyke
5da2026d2b Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 92762f46c7 [formerly f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]
Former-commit-id: f440da9c70
Former-commit-id: 85d83aefe0
2014-10-03 14:04:46 -04:00
Brian.Dyke
7390f6c3a8 Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 20dd249d2c [formerly 2a911984f0 [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]
Former-commit-id: 2a911984f0
Former-commit-id: db665d3876
2014-10-02 10:44:50 -04:00
Brian.Dyke
06f6dfc38a Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f3f95aabb0 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]
Former-commit-id: 65ad6056b6
Former-commit-id: 006bdb00ad
2014-10-02 10:38:51 -04:00
Brian.Dyke
d1c62c3542 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 2ac30f6c22 [formerly f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]
Former-commit-id: f47840e4d9
Former-commit-id: d4888adc0f
2014-10-02 10:24:04 -04:00
Steve Harris
0a8b36918a Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: cc34483b0b [formerly e201e1a493 [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]
Former-commit-id: e201e1a493
Former-commit-id: 09d8955b31
2014-10-02 08:09:02 -05:00
Brian.Dyke
64529eea01 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a4bfbea3c2 [formerly 5ed17c0e24 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]
Former-commit-id: 5ed17c0e24
Former-commit-id: 0be927be2d
2014-10-01 15:36:06 -04:00
Nate Jensen
1a4b7cc454 Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15

Former-commit-id: f2633a56c0 [formerly 482af416b3 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]
Former-commit-id: 482af416b3
Former-commit-id: fce7d5899f
2014-10-01 11:53:40 -05:00
dmsys
70cb8d81b0 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]
Former-commit-id: 8c3625cfec
Former-commit-id: f704781f4f
2014-09-30 13:45:54 -04:00
Nate Jensen
1b08756d5c Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 510d26050d [formerly 057e5eda1a [formerly 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083]]
Former-commit-id: 057e5eda1a
Former-commit-id: 6d382220a3
2014-09-29 17:50:34 -05:00
Ben Steffensmeier
ed401f7250 Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: 95b096192b [formerly c573db2918 [formerly e93157375f90c6cc2038db9a78346592e4d46b0e]]
Former-commit-id: c573db2918
Former-commit-id: b333960362
2014-09-29 11:20:33 -05:00
Steve Harris
73f0f5b364 Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: c03bc273da [formerly 46da726675 [formerly 49ad8e0e780443a0439227694a92ec8ab683b125]]
Former-commit-id: 46da726675
Former-commit-id: fdfe16985d
2014-09-29 11:14:32 -05:00
Brian.Dyke
fac7a6aaa1 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 46af1d0857 [formerly 0a497fc015 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]
Former-commit-id: 0a497fc015
Former-commit-id: fce029653d
2014-09-29 11:20:57 -04:00
Brian.Dyke
008769daef Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 142432ba5e [formerly 550ffba7b0 [formerly 93ddf672c137c7221e9595e8b5c1b279084cb451]]
Former-commit-id: 550ffba7b0
Former-commit-id: 8e459ec500
2014-09-26 16:14:06 -04:00
David Friedman
ea894ca5fc ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2

Former-commit-id: 05707d0f20 [formerly 6791e8d885 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]]
Former-commit-id: 6791e8d885
Former-commit-id: 86100b6ca8
2014-09-26 20:05:46 +00:00
Brian.Dyke
698273b551 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: f26fe97ec4 [formerly 1ac61fb612 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]
Former-commit-id: 1ac61fb612
Former-commit-id: 396f9755dc
2014-09-26 14:19:03 -04:00
Brian.Dyke
67a9c88d27 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a4f68caac6 [formerly 8245370186 [formerly 6ed90023551e25216c10d05f2568593992326900]]
Former-commit-id: 8245370186
Former-commit-id: f520ff97b6
2014-09-26 13:02:49 -04:00
Brian.Dyke
3b71fe393a Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: bd983e1932 [formerly 586a504500 [formerly d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7]]
Former-commit-id: 586a504500
Former-commit-id: 0045c3100f
2014-09-26 11:47:38 -04:00
David Friedman
52788dc473 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae

Former-commit-id: db29ec9dec [formerly 33aee54b8f [formerly c8aa2fbfc35c872e2d50de2212eaf16db9b5483d]]
Former-commit-id: 33aee54b8f
Former-commit-id: 1737d16a5c
2014-09-26 15:13:56 +00:00
David Friedman
e186ecc15f ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03

Former-commit-id: c85b0d1cfd [formerly 41820f112f [formerly 70b520c08670646047ffa753814f98c032938ff8]]
Former-commit-id: 41820f112f
Former-commit-id: cfcfc17a2b
2014-09-26 13:07:28 +00:00
David Friedman
15956c0d58 ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028

Former-commit-id: e82f96193e [formerly 5755c120d5 [formerly 117c2f072b647e353456832f2f0088d51a660d65]]
Former-commit-id: 5755c120d5
Former-commit-id: c16f5c2e7c
2014-09-25 22:10:42 +00:00
David Friedman
d8618f1419 ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0

Former-commit-id: 8ab4649312 [formerly b3025aacb0 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]]
Former-commit-id: b3025aacb0
Former-commit-id: 973d0b9a55
2014-09-25 21:07:16 +00:00
Qinglu.Lin
66aa148879 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5

Former-commit-id: ef851d0016 [formerly 94fed71091 [formerly 8b194664458246dad7509c44bcc07480cb088ddd]]
Former-commit-id: 94fed71091
Former-commit-id: 1c55b5c400
2014-09-25 15:16:42 -04:00
Ana Rivera
11fbbb65be VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8

Former-commit-id: a72725f9ef [formerly d96f5fe229 [formerly 833cff4f37542078578de96b3b59723f77c31f4c]]
Former-commit-id: d96f5fe229
Former-commit-id: e55855b4ff
2014-09-25 17:46:53 +00:00
Lee Venable
472c9775f9 Merge "Issue #2757 - Fixed problem with adding and removing zones." into omaha_14.3.1
Former-commit-id: 5efe3232a7 [formerly 77afac746c [formerly 2ec651b767555946485c8a087f891c8736f59105]]
Former-commit-id: 77afac746c
Former-commit-id: 1d52729e38
2014-09-24 16:23:23 -05:00
Ana Rivera
17f629b3b6 VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297

Former-commit-id: 9a0e9b17f4 [formerly 535f254357 [formerly 2c16492202230dcbec93cf390b47f400a77a545e]]
Former-commit-id: 535f254357
Former-commit-id: bb533d9ddd
2014-09-24 20:11:29 +00:00
Brian.Dyke
6dafb062e9 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml

Former-commit-id: 87fa32d2d4 [formerly 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]
Former-commit-id: 4b418918d4
Former-commit-id: b49b13f77e
2014-09-24 11:05:37 -04:00
Ron Anderson
9e6099c888 Issue #2729 Revert changes made to PythonPreferenceStore.java in favor changes to GfePyIncludeUtil.java made in #3500.
This reverts commit 426d0fcdd7 [formerly bd7e411653] [formerly 11c8529862] [formerly 2abfe6de77 [formerly 11c8529862 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f]]].

Change-Id: I50a580d7c038b039cc8ebf3e05dd16c4453f8355

Former-commit-id: 61baeb4bcc [formerly b1fa793541 [formerly d1c6475343160eeb02171fb8fc3b04f527203154]]
Former-commit-id: b1fa793541
Former-commit-id: 1b011f4577
2014-09-24 09:17:43 -05:00
Slav Korolev
d8f3f75c07 Issue #2757 - Fixed problem with adding and removing zones.
Former-commit-id: a4914bd85d [formerly 443c7c7482 [formerly 31ccaf218df628327fe4b27d69a4500eb1dc8d84]]
Former-commit-id: 443c7c7482
Former-commit-id: 4c209b4958
2014-09-24 09:34:43 -04:00
Ying-Lian.Shi
aa0b2544fd ASM #16693 Fix spelling checker swear words
Change-Id: I0a31429fa35a5c5a8f4d2f000021db4e4304de9e

Former-commit-id: 12c545ef7a [formerly 2a38e3eca5 [formerly 1686a947c8a740c34339d9cf17749a6b92d776ab]]
Former-commit-id: 2a38e3eca5
Former-commit-id: 8eb9aac0b9
2014-09-24 12:08:43 +00:00
Ron Anderson
ab1773e62e Issue #3648 Improve GFE error handling for getAllAvailableParms.
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf

Former-commit-id: c37618c16c [formerly 429de3224f [formerly b77b3c916b4dcc9034408220006f941cd301ed3c]]
Former-commit-id: 429de3224f
Former-commit-id: 8d0d43a437
2014-09-23 18:47:38 -05:00
David Friedman
c4d6fe5af5 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead

Former-commit-id: 2ee1ebe72d [formerly a6acf71a0a [formerly e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5]]
Former-commit-id: a6acf71a0a
Former-commit-id: 0ed1ce5726
2014-09-23 18:39:22 +00:00
Steve Harris
502bbdc81c Merge branch 'master_14.3.1' (14.3.1-20) into omaha_14.3.1
Former-commit-id: 00eda3f982 [formerly 3301300c7e [formerly 68ff0acbe3739e2fd3aa89b13ed070c39db48551]]
Former-commit-id: 3301300c7e
Former-commit-id: fa6f4c608d
2014-09-22 22:18:26 -05:00
Brian.Dyke
ccc9f4a8f3 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 7996916e36 [formerly 5d0347f589 [formerly 414a695e6423fa291936d15a999113f4a518b097]]
Former-commit-id: 5d0347f589
Former-commit-id: a1dd6b20ab
2014-09-22 16:51:47 -04:00