Commit graph

6215 commits

Author SHA1 Message Date
Nate Jensen
510d26050d Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083
2014-09-29 17:50:34 -05:00
Ben Steffensmeier
95b096192b Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: e93157375f90c6cc2038db9a78346592e4d46b0e
2014-09-29 11:20:33 -05:00
Steve Harris
c03bc273da Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: 49ad8e0e780443a0439227694a92ec8ab683b125
2014-09-29 11:14:32 -05:00
Lee Venable
5efe3232a7 Merge "Issue #2757 - Fixed problem with adding and removing zones." into omaha_14.3.1
Former-commit-id: 2ec651b767555946485c8a087f891c8736f59105
2014-09-24 16:23:23 -05:00
Brian.Dyke
87fa32d2d4 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: e04ad21771ce410beb25e15fe300a34796a1a062
2014-09-24 11:05:37 -04:00
Ron Anderson
61baeb4bcc Issue #2729 Revert changes made to PythonPreferenceStore.java in favor changes to GfePyIncludeUtil.java made in #3500.
This reverts commit 2abfe6de77 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f].

Change-Id: I50a580d7c038b039cc8ebf3e05dd16c4453f8355

Former-commit-id: d1c6475343160eeb02171fb8fc3b04f527203154
2014-09-24 09:17:43 -05:00
Slav Korolev
a4914bd85d Issue #2757 - Fixed problem with adding and removing zones.
Former-commit-id: 31ccaf218df628327fe4b27d69a4500eb1dc8d84
2014-09-24 09:34:43 -04:00
Steve Harris
00eda3f982 Merge branch 'master_14.3.1' (14.3.1-20) into omaha_14.3.1
Former-commit-id: 68ff0acbe3739e2fd3aa89b13ed070c39db48551
2014-09-22 22:18:26 -05:00
Brian.Dyke
1018c65552 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 41a854146a3f4ab156b63e2ea24e60681fc586f2
2014-09-19 16:59:12 -04:00
Brian.Dyke
8d665b93b5 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8d5d8cdfd272f8000a6a21a4128998889eb2ab30
2014-09-19 16:56:50 -04:00
Slav Korolev
23ec338be0 Issue #2757 - Updated handlers for dialog buttons.
Former-commit-id: 69a82633c287bf18c9f436014bb552829dcb62ea
2014-09-19 15:02:59 -04:00
Baoyu Yin
28b7e8d6e2 VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d

Former-commit-id: f077d3cd4084faf8ad7c8865e84df53e59a5db72
2014-09-19 15:02:23 -04:00
Brian.Dyke
9c33ae6d2c Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e895f7927a95c2416c05953e131d9e0c6095beb3
2014-09-19 14:42:29 -04:00
Brian.Dyke
9435507b27 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: aaae61509d743553186cdefdea0557158b139527
2014-09-19 13:14:13 -04:00
Brian.Dyke
e601d3fa51 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 88e26cd8b378ffc81db87aee226ceca47ae58aa7
2014-09-19 13:08:06 -04:00
Steve Harris
fbab75af66 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
Ana Rivera
56f409717f VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06

Former-commit-id: 3af534fb2778268fee650c09c5aa0346df746ce8
2014-09-19 15:17:46 +00:00
Brian.Dyke
8b0603cdb8 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: de22db308f36c42d5c7e0989dbd7decfaaf3adbb
2014-09-18 12:43:01 -04:00
Chip Gobs
31efce6b8f VLab Issue #4611
Adding missing changed file.

Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e

Former-commit-id: e68f56628f035ca2a20848a0e76f6efa8bbe1e8a
2014-09-18 12:12:42 -04:00
Matthew Howard
0d0aae9234 Merge "ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use" into asm_14.3.1
Former-commit-id: 0b0c2e1ea8188cd88c92fde4d4b999670aad17dc
2014-09-18 10:36:17 -05:00
Qinglu.Lin
c2047b94b1 ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683

Former-commit-id: f79ed1b1867b5516a390a8f70b2141052be3eb38
2014-09-18 11:21:18 -04:00
Matthew Howard
bb0e06d09d Merge "ASM #537 - fix for AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: 45a5185657de4c3e3c330a5a8604078fe1ccde2a
2014-09-17 15:40:40 -05:00
Brian.Dyke
57a361073d 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
0f6b0f3d9d 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
Brian.Dyke
05145d2f0d VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so
Former-commit-id: 0448deecda7c53ac65bc66bc9751ec0e7f83eee1
2014-09-17 15:39:57 -04:00
Zhidong.Hao
396519b17a ASM #537 - fix for AvnFPS: Syntax failed to flag format error
Change-Id: I39615891fb92f876e06d13eb3232ee937ec9080a

Former-commit-id: 52d355b81fd7f7376d26f43ca6abe4d2ee744adf
2014-09-17 15:02:13 -04:00
Brian.Dyke
97fc11f099 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: dcfe2369455e6b7f27039418b090c9c577400a63
2014-09-17 14:39:56 -04:00
Brian.Dyke
97dfb04eb6 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 1f186fb314e78d93adefe03faaa71f348ee207c7
2014-09-17 13:32:25 -04:00
Qinglu.Lin
5e93999662 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5

Former-commit-id: e7ab29fbfebb1943e0b0702547dbd353367e797d
2014-09-17 10:26:25 -04:00
Ron Anderson
d8471fce1f Issue #3592 Fix issue with priority of file updates
Change-Id: I1404fc8f3c03fab7e828bf40ee01c8d03cfbda58

Former-commit-id: 554ea4118615055d4f2e0d80c58788f55c4b41e9
2014-09-16 17:25:43 -05:00
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
Brian.Dyke
aa5d314407 Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: f08b8e1a7f684c419abe7995dc3441e6d38b79ce
2014-09-16 10:53:58 -04:00
Matthew Howard
4786f2e19e Merge "ASM #529 Invalid QC message for Areal Flood Advisory" into asm_14.3.1
Former-commit-id: f08b93fb1bd32ec83a2e590d29d5e4d0fe18c0a9
2014-09-16 08:32:37 -05:00
Michael Gamazaychikov
0b245d40ae ASM #529 Invalid QC message for Areal Flood Advisory
Change-Id: I392d32b4d7ccc94c88404a85f22f2f306d34ee33

Former-commit-id: d3247df563831f017f69faf1edbde5aea3c2a507
2014-09-16 09:12:06 -04:00
Ana Rivera
536140f021 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
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
Jordan Gerth
8f5903920c 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
Slav Korolev
65d1cca6fd Issue #2757 - Removed unnecessary dialogs.
Former-commit-id: 1a906e4f7a5e7cc9e4cd8b4a717f0f2bb02cbb61
2014-09-15 17:46:10 -04:00
Jordan Gerth
0b425f94eb 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
Matthew Howard
6e0d48d840 Merge "ASM #641 - Filtered cases where Areas do not match Zones." into asm_14.3.1
Former-commit-id: f33abc302597a3120c9220278e28d865d5f185b6
2014-09-15 15:03:36 -05:00
Daniel.Huffman
0f30c0f897 ASM #641 - Filtered cases where Areas do not match Zones.
Change-Id: I1207442f77aece9d79b010669755ee7fc6f82362

Former-commit-id: bf6acaafc42ba98e4257d3eb089b7a1e7adf7bd4
2014-09-15 19:18:33 +00:00
Brian.Dyke
62af91e45c Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: ee5e58d1d65cbd78df527b801e9e3edb73a8f178
2014-09-15 15:08:03 -04:00
Xuezhi.Wei
bca2affc40 ASM #648 fix for the top of the hour issue for hourlypp
Change-Id: I794837427ee6f8dbc615cbd010aeb662ccad9896

Former-commit-id: 2d36b1b9ed31404ca9c9a4ecfdbf5f1e40c05b54
2014-09-15 18:14:54 +00:00
Matthew Howard
155df2bedc Merge "ASM #16693 - Fix spelling checker suggests swear words" into asm_14.3.1
Former-commit-id: 04c6dfae9b8edb836a1bad54e1b8b327c66325bb
2014-09-15 12:28:25 -05:00
Stephen Gilbert
440bddda4b Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3
2014-09-15 13:20:34 -04:00
Ying-Lian.Shi
6e88d5f39c ASM #16693 - Fix spelling checker suggests swear words
Change-Id: Ie9e5bc5c26b16655185b81cf4b4cf2f758693566

Former-commit-id: 094cb9dba5d6e0da22b32b85dcc5049fd629fe5e
2014-09-15 14:56:32 +00:00
Brian.Dyke
1541e4c255 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 8e4f6e96f7b70d6f2b7517f3f0695350506169c7
2014-09-15 10:46:25 -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
Brian.Dyke
83099ee81f Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: ab9b7ec5424512656d2fb343773fa97658c04ecd
2014-09-12 14:11:57 -04:00
Stephen Gilbert
4e2ce1fe38 VLab Issue #4003 - Minor changes for OB_14.3.1
Change-Id: Ib0430b16b08c9f27238575b4dcdbc568b43709b7

Former-commit-id: f4979676c4351e0d5445c95d12d8f58cf8924a66
2014-09-12 13:20:51 -04:00