Pam Johnson
9d2810402f
Merge "ASM #14802 - Fix RTMA Max/Min Temperature" into asm_16.2.2
...
Former-commit-id: 367aad8c67f62f33673da3d3917dbc210e61c928
2016-01-29 11:20:32 -05:00
Shawn.Hooper
bd27f40c6d
Merge tag 'OB_16.1.2-9' into master_16.2.1
...
16.1.2-9
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.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
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c
Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
Melissa Porricel
3fcb8eacc5
ASM #14802 - Fix RTMA Max/Min Temperature
...
Change-Id: Icadec9812609a13f5ba28530aefd89ea97612256
Former-commit-id: cc337b50fb34f78622170bf42dea47e0d5402c7c
2016-01-11 11:07:16 -05:00
Ana Rivera
2f37e221b4
VLab Issue #12577 - DR18054 Derived parameters Wave1-10 and Period1-10 displayable at extraneous levels; should be Sfc only; fixes #12577
...
Change-Id: I2d793e7bad74b7a6135dd9e3237ae14f7f4010ab
Former-commit-id: 51cfdb8f068c0568bacab02ebb7d29d6104ddf90
2015-11-13 17:55:31 +00:00
Melissa Porricel
20c182de48
ASM #18194 - Display GTG Clear Air Turbulence in D-2D
...
Change-Id: I628894d4bf7f9f813d660e36f07e0bd4979b6bb1
Former-commit-id: ade0a71ef80e63e11190b078cc3d5f5532e06ffc
2015-11-04 11:36:14 -05:00
Ben Steffensmeier
4379063069
Omaha #4931 Fix invalid xml on RH_001_perts
...
Former-commit-id: 92924c45a1471a7905afb3c40196d9a2dadf00de
2015-10-14 10:43:42 -05:00
Ben Steffensmeier
2501a15c92
Omaha #4931 Fix gather derived parameter.
...
Former-commit-id: 2ff11f33c19e0ae5c22771ed351761a2cc6b2871
2015-10-09 12:35:18 -05:00
Ben Steffensmeier
aac1f96ae5
Omaha #4914 Initialize cross section colormap only once and create cross section specific style file.
...
Former-commit-id: 953ca793ce601d22d4ce222f5326d34b07c9410d
2015-10-02 16:47:02 -05:00
Steve Harris
b0cb953346
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Former-commit-id: dcdb27bc06556bccae34817d33b7a096ebb1def4
2015-10-01 12:39:24 -05:00
Benjamin Phillippe
cfbb9cca9f
Omaha #4870 Fixed qpf grib issue
...
Former-commit-id: 57bd77decd58ca134dd6cccc58c501fc96c4739d
2015-09-23 13:47:48 -05:00
Nathan Bowler
a2bcfc008e
Omaha #4698 Register unit for Practical Salinity
...
Change-Id: I9c23cc552594d853fed057e085d8a0129758d98b
Former-commit-id: 5b92424f783089a4f83ab902e5109eaa44512f57
2015-09-22 11:20:38 -04:00
Ron Anderson
4aa5494a76
Omaha #4885 Fix units for geostrophic wind speed image.
...
Change-Id: I633ef3811d7ee5a40097aaca29034bf08288d0d8
Former-commit-id: d6a0458c28637bafb23a9ce46b3e466d1beb97a2
2015-09-15 11:00:01 -05:00
Steve Harris
4bb1dfd213
Merge tag 'OB_16.1.1-9' into omaha_16.2.1
...
16.1.1-9
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
Former-commit-id: 4ff4f4722a0fd37cf6ec75c701acd43d778ce7c2
2015-09-01 16:06:40 -05:00
Roger Ferrel
ae170f08ff
Omaha #4360 Changes to use annotatin to obtain null values to use in non-nullable fields.
...
Change-Id: Ide533d105f8a02cf88fdeb25970b99a5c6399eb2
Former-commit-id: c00e44bcae398aaa2af21d8be2e133eba41b94ff
2015-08-25 07:24:29 -05:00
Shawn.Hooper
5759470634
Merge tag 'OB_15.1.1-32' into master_16.1.1
...
15.1.1-32
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MakeHazard.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java
Former-commit-id: f925ff11b783389e5ca32a2d7cd1ec5edfa835db
2015-08-19 14:58:31 -04:00
Roger Ferrel
7e8faee168
Omaha #4360 Fix bug in the copy constructor.
...
Former-commit-id: 6c2fce8058cd60bbee19a3f903c735f0c78c43b6
2015-08-05 12:50:24 -05:00
Steve Harris
716970c597
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Former-commit-id: 2c28db21de36edb64a6a741e93803b3423f5c22c
2015-08-04 13:41:21 -05:00
Roger Ferrel
1bcd91391a
Omaha #4360 Convert DataURIs for table grid and grid_info
...
Change-Id: Ic6be0900bb00baf12ccb9a04dd70c0ce0a676fb2
Former-commit-id: f89e3671e7e45730e54da6dd4d4d81fd75458b4a
2015-08-03 15:52:59 -05:00
Melissa Porricel
b93eda8a79
ASM #17615 - Fix model run precip accum display when time steps differ
...
Change-Id: I36614b97e4ed0b9008e67731da2d426dcca7d8c7
Former-commit-id: 8e718bed73542d0d2ae900eabe2862dcc8626656
2015-07-22 15:12:45 -04: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
Slav Korolev
be64094eb1
Omaha #4298 - Ingest and display National Blend of Global Models
...
Former-commit-id: 76dbde2807f370b87b3e7e28935d647899bd48b3
2015-07-09 13:33:15 -04: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
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
Ben Steffensmeier
1ca978a0d8
Omaha #4558 merge viz derivparams back into common.
...
Former-commit-id: 710ec0364322d787d40c9304983f55da68bacb05
2015-07-01 10:55:28 -05:00
Matthew Foster
b4a4a9434c
VLab Issue #8981 - Add missing derived parameter definitions; fixes #8981
...
Change-Id: I88698a8d551260bd02df9382ca763eed08a728e4
Former-commit-id: bdbff68fe1cf1f5a7a28063ee0c7f308f70c84c3
2015-06-29 18:37:18 +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
Joshua Watson
c612c1c537
VLab Issue #8490 - Add HPC Day 6-7 QPF; fixes #8490
...
Change-Id: Iab8c7f598baa521c6fc814fe5da0287c47e2fb97
Former-commit-id: 7eb9c288e363533d55cd4c453710e2fe0da4b2ce
2015-06-25 16:26:25 -04: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
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
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
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
Shawn.Hooper
1b217fc5a8
ASM #17024 - Fix bad XML merge for d2dContourStyleRules.xml and gridImageryStyleRules.xml
...
Change-Id: I600498d43bdc146ddb873f457f73e054c6497e5e
Former-commit-id: 098391a703022ae7d0e85f6cfab11ab3d8dcdfdf
2015-04-24 16:05:57 -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
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
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
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
Fay.Liang
133a603566
Merge tag 'OB_14.4.1-20m' into master_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4
2015-03-30 14:28:30 -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
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
Steve Harris
67b3a77c4f
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
...
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
2015-03-18 09:29:01 -05: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
Steve Harris
85b687be0b
Merge tag 'OB_14.4.1-16m' into omaha_15.1.1
...
14.4.1-16m
Former-commit-id: 468600e9d5144873e5af1529ae0d38673e81bb17
2015-03-09 18:54:39 -05:00
