Fay.Liang
5c5bc3a5b5
Merge branch 'field_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
...
Former-commit-id: 061ce49506ae6b538dad609a3be711aec3efae80
2015-07-31 16:53:30 -04:00
David Friedman
4bdfeb8da8
Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
...
Conflicts:
cave/build/static/linux/alertviz/alertviz.sh
cave/build/static/linux/cave/cave.sh
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226
Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
Ana Rivera
9a33597d6e
Merge branch 'omaha_16.1.1' into field_16.1.1
...
Change-Id: I9da773e70da7bb8d62253093f20aebd8aea328f6
Former-commit-id: 0c909272ebdaf4ce94195b54a021a38c1e174ff3
2015-07-20 15:56:51 +00:00
Ana Rivera
d6196390e2
Merge branch 'master_15.1.1'(OB_15.1.1-24) into field_16.1.1
...
Change-Id: I859c9a2d9be2076e9eac89b4a5a877f37ca54074
Former-commit-id: d6f0e355d72c9be4d55c5e161331e55367bdb7b8
2015-07-20 15:46:28 +00:00
Steve Harris
55b82a66ff
Merge branch 'omaha_sails_15.1.1' into omaha_16.1.1
...
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/GridLightningResource.java
Former-commit-id: b66814c4efc93113c131298b904f02675cda88ea
2015-07-13 18:39:29 -05:00
Ana Rivera
e075f22bf7
Merge branch 'omaha_16.1.1' into field_16.1.1
...
Entry for NTAT missing from omaha_16.1.1's LevelMappingFile.xml.
Change-Id: I39893e6aa748f7dfeb30bd23bcfca3853fa51e17
Former-commit-id: cc1e4ea67074c41be411c99ce979124a63c7c743
2015-07-07 19:41:48 +00:00
Roger Ferrel
17a2e9a0d8
Omaha #4537 Put back needed NTAT changes removed in 4422.
...
Former-commit-id: e2c311dc18c48d1e681c2d53aa606abc5182bd27
2015-07-06 10:22:29 -05:00
David Gillingham
79da33d7a8
Omaha #4422 : Revert "Support ingest and display of NAM12 simulated satellite data in D2D and GFE."
...
This reverts commit bbcff29843
2015-07-02 10:12:20 -05:00
Kiran.Shrestha
ae96fff89b
ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I.
...
Change-Id: Ide922832e9baf7382a7245e6a435fa14fc7215a6
Former-commit-id: a5f75df66ab88725c1f92f9a917f083cdc58fa5e
2015-06-30 18:28:58 +00:00
Darrel Kingfield
be322dafdb
VLab Issue #6772 - MRMS All-Tilts Activation for 16.1.1 v2; fixes #6772
...
Change-Id: I0d0aabbcfc61d4541696cc181c8a58de585f0276
Former-commit-id: 062acfed99fd022e0a8ca6791d0c0099551de6a8
2015-06-29 12:12:16 -05:00
Matthew Foster
aeca09eae2
VLab Issue #8856 - Fixes for Baumgardt additions; fixes #8856
...
Change-Id: I17afbe07047e4e07fa520ab8dff899b58796f53f
Former-commit-id: 64fde808f4648dd846e156baf052a65ab11ebc90
2015-06-23 16:50:21 +00:00
Joshua Watson
f6d61cc1e6
VLab Issue #8489 - Add ESTOFS Pacific basin data; fixes #8489
...
Change-Id: I033bcc8116f7d4bef4aa017fd62ea8f049372ca4
Former-commit-id: 694cbaad0bad4aae7c2e67c44ca3106a73b97d77
2015-06-22 14:37:43 -04:00
Richard Peter
5d1d0d66b5
Merge "Omaha #4422 : Support ingest and display of NAM12 simulated satellite data in D2D and GFE." into omaha_16.1.1
...
Former-commit-id: d5ad5d6ecdc3a4ca6b2b63a2e23aab24fbea806c
2015-06-15 17:17:52 -05:00
David Gillingham
bbcff29843
Omaha #4422 : Support ingest and display of NAM12 simulated satellite data in D2D and GFE.
...
Change-Id: Ic2afdc7d0d3487b5f9ee8faa4e44a0341c24eb88
Former-commit-id: 0e5a00548514123df7e2439e51878e492cdf3a6f
2015-06-15 17:02:01 -05:00
Benjamin Phillippe
187626a1e2
Omaha #4542 Added ingest/display support for PPQPF grib products
...
Change-Id: Idd68fee783e509d1095504f72975bd5bb62969f6
Former-commit-id: a29d74f03c93568683d8b1d1f49318253aa6bfdd
2015-06-11 17:12:38 -05:00
David Gillingham
cb3d76f7ae
Omaha #4421 : Add GEFS to Volume Browser Volume sources menu.
...
Change-Id: I084300b8b5a725331de6a1498b48e216a637d015
Former-commit-id: 682cf00626328a5296e69c5356a8740e25656a22
2015-06-11 12:24:25 -05:00
Steve Harris
4de63454fc
Merge tag 'OB_15.1.1-16' into omaha_16.1.1
...
15.1.1-16
Conflicts:
cave/com.raytheon.viz.gfe/build.properties
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
2015-06-05 15:38:00 -05:00
Fay.Liang
c9e484c311
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into int_15.1.1
...
Former-commit-id: f2b3a2fc2c1a5362673fed5b4841cd6d5d86ea5d
2015-05-29 15:43:59 -04:00
Fay.Liang
31496dac17
Merge tag 'OB_14.4.1-47' into int_15.1.1
...
14.4.1-47
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
2015-05-29 15:42:40 -04:00
Ana Rivera
d5da5dfff6
Merge branch 'master_15.1.1'(master_15.1.1-12) into field_15.1.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/aviation.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9c737b735af5d1066448c71e1ffc09a1129f7435
Former-commit-id: 1f5ab00d137a3e5e75a20b15a65c4b34596a9b38
2015-05-21 13:39:59 +00:00
Steve Harris
9b3d8a8443
Merge tag 'OB_15.1.1-12' into omaha_16.1.1
...
15.1.1-12
Conflicts:
build/deploy.edex.awips2/esb/bin/setup.env
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
2015-05-20 11:25:45 -05:00
Richard Peter
0a2fec0e2e
Merge "Omaha #4412 Ue all level mappings for plane names." into omaha_16.1.1
...
Former-commit-id: 592de2b3e68b2a39cad41c317f17e7780c2dd78a
2015-05-19 10:50:58 -05:00
David Lovely
80dc4c85d9
Omaha #4146 Bundled class files in a jar when unpacked.
...
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02
Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
2015-05-19 10:23:35 -05:00
Ben Steffensmeier
4fa838be70
Omaha #4412 Ue all level mappings for plane names.
...
Former-commit-id: 410f4b509f716533d3385e1fc54f288bfc315f9e
2015-05-18 16:03:01 -05:00
Ben Steffensmeier
72d601a2a7
Omaha #4079 Extract core grid and point rendering capabilities.
...
Former-commit-id: a0caefe923b18859fd89cb36749b31e3b24eecbe
2015-05-15 13:55:10 -05:00
David Gillingham
6754cf45a4
Omaha #4384 (and 4385): Fix volume browser menus for NWPS models, display vector arrows for all mag values greater than 1.0.
...
Change-Id: Ib3b5a7fcf060364c09fadf57bd5b7151a4f6828e
Former-commit-id: bc3abb1effa93ff76c8287f59b64dd73017f3ad8
2015-05-11 14:57:00 -05:00
Matthew Foster
4b06688205
VLab Issue #8088 - Volume Browser ensemble/SREF/Aviation menu file has incorrect contents; fixes #8088
...
Change-Id: Ia497e1aa8c1a954f1878283ebb527ec6233b48e7
Former-commit-id: 99a24163e22b46f20a4ec31e6f4d08c916e95152
2015-05-08 19:01:48 +00:00
Melissa Porricel
037427861a
ASM #7951 - Add RTMA menu items to Misc/Aviation VB menu
...
Change-Id: Idddde521d6c2403d8a76f3341e977d217b8469d6
Former-commit-id: 4f1ad3c4db5d5e8ec77870c34a9d66c440be2691
2015-05-08 12:51:59 -04:00
Steve Harris
23cb520937
Merge tag 'OB_15.1.1-8' into omaha_16.1.1
...
15.1.1-7
Conflicts (these files were moved to AWIPS2_baseline):
rpms/awips2.core/Installer.java/build.sh
rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh
Former-commit-id: df806c9479cb29a5f47f1511ad70e140b2bbf8ec
2015-05-05 15:24:22 -05: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
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
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
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
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
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
5accdbf2e7
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Former-commit-id: 3c4a22bf33c9f1147c6ebb263e6102294b33f65f
2015-04-08 12:27:57 -04:00
Steve Harris
f7af8ee606
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: cf70a7888a39667c54b344274c76d5106927fa30
2015-04-01 17:22:45 -05:00
Fay.Liang
a204a6210e
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Former-commit-id: 5e481a056337b7f502921886725382258c6e29d1
2015-04-01 13:04:48 -04:00
Slav Korolev
5454637848
Omaha #4297 - Ingest and display of ECMWF wave guidance
...
Former-commit-id: 06c58d85cb62fad4fe6fffdcd319fdd9356f1ff7
2015-03-26 14:19:39 -04:00
Melissa Porricel
9a2a726fb9
ASM #16905 - Implement missing RTMA/URMA parameters
...
Change-Id: I4ec616b80b6c8f85bafec46f0c840c3c43a9c527
Former-commit-id: d68078b665787d91bfd92440345d41f9fcc98b3d
2015-03-26 09:58:45 -04:00
Joshua Watson
5ad258d80d
VLab Issue #7124 - Added new HRRRFamily.xml to volume bundles. Edited Volume menu entry for HRRR model to call HRRRFamily.xml bundle; fixes #7124
...
Change-Id: I201d1c46c179d958360e9ff027fd6dfc35100403
Former-commit-id: c0d0fe36c45049e3a069ffe87bca4d8430d9f3c3
2015-03-24 15:01:55 -04:00
Fay.Liang
86a8041062
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.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Melissa Porricel
fcdcb81963
ASM #7951 - Add Capabilities for CONUS RTMA at 2.5km
...
Change-Id: Iab79fc17b3b648ffa39c8385c581392e3cf58f9c
Former-commit-id: 9c7d466213eaac3a46fddf416967d00e3446bfee
2015-03-16 17:14:56 -04:00
Melissa Porricel
2cec5c0b3c
ASM #14542 - Add HPCGuide wxType
...
Change-Id: Ie42a870c8bfede85cf00bb1d71a68f9fe4bafc1d
Former-commit-id: 1f1fe776f013990637d04f168c6c3df22aeb01fb
2015-03-09 12:48:02 -04:00
Ana Rivera
28fdf68b74
Merge branch 'master_14.4.1'(14.4.1-14m) into field_15.1.1
...
Change-Id: Ie5167c7fc48c61759032b0eb3fd9a2e88b53cc76
Former-commit-id: 38cf0f33a18d7fd399c46b60486db8bee383f1c0
2015-03-03 17:07:44 +00:00
Steve Harris
ead97f053e
Merge tag 'OB_14.4.1-14m' into omaha_15.1.1
...
14.4.1-14
Former-commit-id: cdca3c5b9eb65bed9d773019917245d1000d78dd
2015-03-02 10:58:40 -06:00
Steve Harris
78b41638b9
Merge tag 'OB_14.4.1-13m' into omaha_15.1.1
...
14.4.1-13
Former-commit-id: ea76883b615967a79e8c9d0ee16accebd210ee0b
2015-02-20 13:17:47 -06:00
