Commit graph

4071 commits

Author SHA1 Message Date
Shawn.Hooper
eb14ea888c Merge branch 'master_15.1.1' into asm_15.1.1
Former-commit-id: a11fce758ca741e4f300444f08c609875f722264
2015-04-24 15:57:40 -04:00
Shawn.Hooper
c03499c025 Merge branch 'master_15.1.1' into asm_15.1.1
Merges up to 15.1.1-7 back into the asm_15.1.1 branch.

Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: Ica098ffb233837e4fcb718e9c75a78de443eb267

Former-commit-id: 78b3f7a15c5d2ab60235f40f5236bbbbe58d28ce
2015-04-24 15:44:14 -04:00
Fay.Liang
56788f19aa Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: f6e078c4124945a1169f992c6e0051569d3c5450
2015-04-23 15:55:45 -04:00
Ron Anderson
233bbf78a5 Omaha #4383 Improved logging in iscMosaic and iscDataRec
Change-Id: I2a93a46e6bb0db447ab722265f2cc14e3c957a69

Former-commit-id: 28e7b70e9b8e495e22de71881ef9aa2932e8accf
2015-04-23 13:13:40 -05:00
Jason Burks
eba4333d02 VLab Issue #7704 - Fixed problem with LMADecoder decoding single level files. Added optional colormaps that would be useful for some users; Changed scaling on few parameters in image style rules; fixes #7704
Change-Id: If8599b7bf64c788063aa63e3bfc07c84a55654fd

Former-commit-id: d747cb5700e68997f6b7b579d9d8f9d9698fbd8a
2015-04-23 10:53:53 -05:00
Melissa Porricel
18e305efea ASM #16923 - Fix METAR decoder extra whitespace problem
Change-Id: I55ca60148f4079237876c74279ef7cb528eb6c12

Former-commit-id: c4ce7f8bd1bbf8e971b80f8291f67f5f7af09d46
2015-04-23 10:21:52 -04:00
David Lovely
f2a6c66c50 Omaha #4392 Fixed broker address substitution
Change-Id: Ib7ea0577e8d020ad2d94aa7ddbaa08459c9fa433

Former-commit-id: 6043b5052225fee426940fa8f32f54d8a265fba2
2015-04-22 12:04:54 -05:00
Ana Rivera
cf6bcd2d8f VLab Issue #7664 - Update VTECTable.py Winter Hazard coding; fixes #7664
Change-Id: Ieafa23f3cbc9e8810a1477caa85a42223fd1c157

Former-commit-id: 6941ac08c5bafb9c0cc7cec382a4339d740adff0
2015-04-22 15:47:17 +00:00
Dave Hladky
7e93129324 Omaha #4260 Updated gridproduct URI string, URI's were wrong and never matched.
Change-Id: I9940d4118f783debb12db0758e7c54e96f02ac68

Former-commit-id: e53a51ad872e1476f3a4a9e517f20ddaedd625fa
2015-04-22 09:54:38 -05:00
Baoyu Yin
1e06dda47a VLab Issue #7716 - DR17315 dupCounties.vm not working in WarnGen and DR17318 Independent Cities outside of VA not locked in WarnGen; fixes #7716
Change-Id: I2b7f68ba663c261cf0b4284972792af0804d2d0f

Former-commit-id: 25aa467c5732d26c40fb7dad6e7f372051b0e1ec
2015-04-22 08:36:28 -04:00
Michael Gamazaychikov
5bf5ce4bbe ASM #17250 - EDEX scripts: import of A1 mile markers .id files to A2 database failed.
Change-Id: Idca93f26c05d1d3fc73f0f4c7c3b24a736bc01c0

Former-commit-id: c815d87b1e4c30f9be0406c622c0df27f389a050
2015-04-21 15:04:16 -04:00
Slav Korolev
b2bcc8f79e Omaha #4298 - Ingest and display National Blend of Global Models
Former-commit-id: ec1f5aa2da4c404b75eccf917845b653fd5eca4d
2015-04-21 14:35:05 -04:00
Ron Anderson
b34c50594f Merge "Omaha #4027 More GFE changes for Mixed Case WA" into omaha_15.1.1
Former-commit-id: 8c02aa8eba027eedb9ec8994f520c315c57ed150
2015-04-21 08:30:03 -05:00
Ron Anderson
0edd237aa7 Omaha #4027 More GFE changes for Mixed Case WA
Change-Id: Ia1b65979d442246984b1e281c902c9f078fa4848

Former-commit-id: 0eef8697e269644ec36c1c7f7b09610778beb4a1
2015-04-20 17:17:08 -05:00
Fay.Liang
ff11d4f55a Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: efff4511cb01552b757678fb2ac64dca2da6f9c0
2015-04-20 15:38:33 -04:00
Ana Rivera
0f2e031c70 Merge branch 'master_15.1.1' into field_15.1.1
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml was removed.
"Visibility Anl Uncertainty" entry in .../fields/planview-timeseries/other.xml was added to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/aviation.xml

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/misc.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml

Change-Id: I4cac5e1ee29119569cb19c235ec5d1664eb08b8c

Former-commit-id: 4dad0cb77e2101fc8ec2d46924b6c64dcc0d12cb
2015-04-20 19:14:43 +00:00
David Gillingham
740938ee59 Omaha #4414: Fix display of nwpsTrkngCG0 D2D and smart init data for GFE.
Change-Id: I466dd123c9a438b8c0d012c66a1ed1af042964fb

Former-commit-id: 467a37cb5da18eafb8c5aa1fe0a3851cf10ff0be
2015-04-20 14:05:35 -05:00
Nate Jensen
ee3f787ceb Merge "Omaha #4388 Support signed/unsigned conversion of fill value." into omaha_15.1.1
Former-commit-id: 3f1b69372ece35cc2ea543a60334fb8dbe584e9b
2015-04-20 11:44:13 -05:00
Ben Steffensmeier
5fd74b67ea Omaha #4388 Support signed/unsigned conversion of fill value.
Former-commit-id: 75959a30f26ea8f323d232d3b118e93539904ad1
2015-04-20 11:08:03 -05:00
Steve Harris
5932df4786 Merge tag 'OB_15.1.1-6' into omaha_16.1.1
15.1.1-5

 Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF


Former-commit-id: 97efa605a593b2ce6c9a9a97192ecc5223511e88
2015-04-20 08:09:45 -05:00
Steve Harris
4055d9135b Merge tag 'OB_15.1.1-6' into omaha_15.1.1
15.1.1-5

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py


Former-commit-id: 830ba31d4a66ea4e3994ba136b5bed0f03a9d246
2015-04-20 08:00:07 -05:00
Fay.Liang
0cff7c362f Merge branch 'master_14.4.1' into asm_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: bce50b8501f52597f5dc66b767a3c9fd241fe256
2015-04-17 16:59:06 -04:00
Michael Gamazaychikov
289b526abc ASM #17250 - EDEX scripts: import of A1 mile markers .id files to A2 database failed.
Change-Id: I2f4b04804c65ed0de14957880b6f57d3308e5889

Former-commit-id: 52371f5e58004f059a4fdb569948c5320ad9d57c
2015-04-17 07:42:02 -04:00
Fay.Liang
6dd4acc2c2 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 03e663afae6eb0998892e2921566652f42196e1f
2015-04-16 23:06:25 -04:00
Yun.Teng
dd5fd66fa5 ASM #17383 - Fixed error that time constraint being off
Change-Id: I7b00a4b0d1bd7822cd3f751264badfa62afc3bcb

Former-commit-id: d0e8d057f765d95c65ef121e784152d05bd1187c
2015-04-16 17:57:45 +01:00
Ron Anderson
8e49444a3a Omaha #4406 Moved iscDataRec back where it belongs
Change-Id: I37c0689cf98d7a0e9dcfcfbedaac31e5fda55bd4

Former-commit-id: cbfde57cd9a69199834c6357de2a36ea38ced7df
2015-04-15 17:27:42 -05:00
Ben Steffensmeier
bc1f20c899 Merge "Omaha #4388 Use the record fill value in satellite resource." into omaha_15.1.1
Former-commit-id: de2a2619072395bc71d6cac779d9dc6a97f51815
2015-04-15 14:46:02 -05:00
Ben Steffensmeier
60c93552a3 Omaha #4388 Use the record fill value in satellite resource.
Former-commit-id: d13b4cfda688ecec9dfa0563787ff6370c980443
2015-04-15 14:44:49 -05:00
Ben Steffensmeier
c6295db321 Omaha #4399 Update viirs to handle NCC.
Former-commit-id: ccc2036b1671cecc74a8d74b2b916c2ba1ddcb83
2015-04-15 10:54:17 -05:00
David Gillingham
5d208bb120 Omaha #4383: Fix ReferenceMgr to work in multi-domain setups.
Change-Id: I5ee8810949c014a936dd01293d14c003445e18a8

Former-commit-id: b49ec6d3f2b714904db0ba0aeecd1c8d32b0f708
2015-04-14 12:33:43 -05:00
Steve Harris
7ec7cdf232 Merge tag 'OB_15.1.1-4' into omaha_16.1.1
15.1.1-4


Former-commit-id: c9f9bc2c612dae6d355fb3c5de313aa7274adc8b
2015-04-13 12:22:22 -05:00
Steve Harris
0db5e1ec86 Merge tag 'OB_15.1.1-4' into omaha_15.1.1
15.1.1-4

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py


Former-commit-id: 8e57da4bb70fda78c3aaa91add874cd403286939
2015-04-13 12:13:02 -05:00
Fay.Liang
6cd66bff93 Merge tag 'OB_14.4.1-25' into master_15.1.1
This merge includes all changes in 14.4.1-22, -23, -24, and -25

Conflicts:
	cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt

Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
2015-04-13 13:02:24 -04:00
Matthew Foster
c3793908cf VLab Issue #7570 - Remove duplicate derived parameter definitions from dataplugin.grid project; fixes #7570
Change-Id: Id1849c0482b3b170c7fe0a247146b239e6c84cf2

Former-commit-id: be185a7b314348400b9b275eff4d8550ae0e6b91
2015-04-13 13:08:51 +00:00
Fay.Liang
88d6e796f5 Merge tag 'OB_14.3.3-5' into master_14.4.1
Merges 14.3.3-3, 14.3.3-4, and 14.3.3-5


Former-commit-id: 66eb429aee1d602cf216f1509e780afdbd1cbd23
2015-04-10 13:49:22 -04:00
Shawn.Hooper
4cf9697067 ASM #17222 - Redbook – SPC 4-8 Day Convective Outlook products display on menu but do not update in redbookFcstMap.xml"
Change-Id: Iac21d5f7a3595f95058a05d2c9c9f5b5a77170be

Former-commit-id: d76e74e667e7847a57c9100cc4007dfc6d22ba06
2015-04-10 13:20:35 -04:00
Fay.Liang
6a9a1daef6 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9
2015-04-10 12:13:31 -04:00
David Gillingham
6393c83261 Omaha #4383: EDEX support for alternate ISC databases with non-standard masking.
Change-Id: Ife4cae92aa1b097f2606396f9e11a7d17dc06d2a

Former-commit-id: aac0b3bd84a1753e816bd102cec8336e32aa0db9
2015-04-10 11:02:22 -05:00
David Gillingham
1d2fb3c135 Omaha #4385: add nwpsCG1 model to Volume Browser.
Change-Id: Id069d07c5dfffaf1952042611f35a2221d8d639b

Former-commit-id: 20d76ae4ed226d19ea6ddbb408224ace8519787b
2015-04-09 15:13:48 -05:00
Matthew Foster
8d56aabf36 VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688
Change-Id: Iea8f52d8ba1cf78848dc95bf0792f0f220d4dd08

Former-commit-id: 382e01a6b5b93697efa2016a21cc2cdd1ececc5f
2015-04-09 13:53:58 -05:00
David Gillingham
c01694607f Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser.
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6

Former-commit-id: 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb
2015-04-09 13:26:52 -05:00
Ana Rivera
388e4a3d8c Merge branch 'master_15.1.1'(master_15.1.1-2m) into field_15.1.1
Change-Id: If8fdc78136ac00065a7c1f9a3b45e814a58c815e

Former-commit-id: 87043a26d3e1aa32f693ff0f48d4357ac416e6d9
2015-04-09 15:13:54 +00:00
Fay.Liang
8b31206de4 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: ff79e4fdaf62c76f39b0e1948d33e0b84df77011
2015-04-09 10:18:40 -04:00
Fay.Liang
1579e023ea Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 6608975224ad22f454a243c919d498a5a2369e32
2015-04-08 12:24:58 -04:00
Fay.Liang
7349df3d27 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config

Former-commit-id: 9742125df2b54fe54e1e06dba554de21db52f5a0
2015-04-08 12:22:27 -04:00
Fay.Liang
c681804958 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 690e16f2101481202c67622cc745079465261ae9
2015-04-06 15:42:01 -04:00
Fay.Liang
618781f10c Merge tag 'OB_14.3.3-2' into master_14.4.1
14.3.3-2

Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java

Former-commit-id: f5fad51061f568aea4ea581a099ef8353758add6
2015-04-06 15:40:31 -04:00
Steve Harris
19be21406f Merge branch 'omaha_15.1.1' into omaha_16.1.1
Former-commit-id: 2333d5fa9277d727aae1136df25eda1bf316393a
2015-04-06 11:11:59 -05:00
Greg Armendariz
4623588cc5 Omaha #4330 - Fix developer build
Change-Id: Ic818ca89f44049a3d31583d0499d9e0756673eb2

Former-commit-id: d205922ba432e4f4b3c411ea798ee68c1563cd66
2015-04-06 10:47:23 -05:00
Ron Anderson
b191e48681 Merge "Omaha #4367: Revert baseline time constraints for WindGust back to 1 hr." into omaha_14.4.1
Former-commit-id: bc410201332feaced47f12645528fcb36c09adc6
2015-04-06 09:39:38 -05:00