Commit graph

168 commits

Author SHA1 Message Date
Shawn.Hooper
449307b46c Merge tag 'OB_16.2.1-22' into master_16.2.2
16.2.1-22


Former-commit-id: 102f706a27808f2627f3d9ed8c6be11e0dc978ee
2016-04-12 14:28:16 -04:00
Penghai Wang
1ff00e7088 Merge branch 'master_16.2.2' into asdt_16.2.2
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml

Former-commit-id: 51bcd1df67c24bce021a89b8708e48306dd0691e
2016-04-12 16:45:34 +00:00
Shawn.Hooper
563e2fbb4a Merge remote-tracking branch 'vlab/mdl_16.2.2' into master_16.2.2
Former-commit-id: c849fcfe6bbb76fcf17632e9ae9539211766111d
2016-04-07 16:01:56 -04:00
Shawn.Hooper
850ec358bf ASM #18528 - "Merge tag 'OB_16.2.2-1' into DCS-18528"
16.2.2-1

Change-Id: I7ac65cae4efe4e38b2c059aec6d4808f97f1bf77

Former-commit-id: 8173420a5e472738d4c9255d2ed32e55927c8d07
2016-03-28 15:47:44 -04:00
Shawn.Hooper
90220c0fd7 ASM #18748 - Updates to allow for proper storage and display of some PQPF/PPQPF data
Change-Id: Ia566f84a2311ee54b06f1101ce2fb47dfc76c9d8

Former-commit-id: 4fb2feee8ca09f499fecf0df047c63a0ea280c92
2016-03-22 16:15:24 -04:00
Melissa Porricel
67f37154e6 ASM #18446 - Fix image display for some winter params (Tdend,CritT,SnowT)
Change-Id: I113e455941f66297aced808a183011447925e779

Former-commit-id: 7cb9c32a79158d9a098b1ddaca91f98f7ffc468b
2016-03-10 16:13:58 -05:00
Kenneth Sperow
aa038d9bd2 Merge remote-tracking branch 'origin/master_16.2.1' into mdl_16.2.2
Former-commit-id: 4315dc9cf3900225db8482e90719398bae06adb1
2016-03-01 09:11:17 -08:00
David Friedman
d7ac171705 ASM #18528 - Merge remote branch 'origin/master_16.2.2' into HEAD
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Change-Id: Ie8a4ab8afd5eb80b714f0739bc8ac99fe0552be4

Former-commit-id: 95d232da9522aa1bc9bf738b027c32042eea797e
2016-02-29 20:35:54 +00:00
Steve Harris
c2b471a870 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/TCVDictionary.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: a7340c2bf23cbc3d27ca52fbf2ccd9c7d1cb09c2
2016-02-29 13:39:42 -06:00
Shawn.Hooper
fa274710fd ASM #18695 - Add 72 hour Percentile PQPF data to the Volume Browser
Change-Id: I5cff8f37a163f1521fbe85db74faf8a94a5f9cd6

Former-commit-id: 98b2da26e07a024ee6e44184d13274eb2cf7da35
2016-02-24 16:19:18 -05:00
Melissa Porricel
3bcda66074 ASM #17308 - Correct lifted index units
Change-Id: I872a48255c137d7221b6cd2be7f70e9d2171d617

Former-commit-id: 3b5ddbed8f115eba688e0b48893a910e1f036972
2016-02-24 13:43:08 -05:00
Penghai Wang
1d34a7ab13 Merge "VLab Issue #14007 - DR17787 Fix Speed Current display unit; fixes #14007" into asdt_16.2.2
Former-commit-id: 5d259528415511961c538cf8b3f8b44d971fdc51
2016-02-20 17:04:52 +00:00
Shawn.Hooper
d2c142b7bf Merge branch 'master_16.2.2' into asm_16.2.2
Former-commit-id: 97a9c6a6ec0845c1ea823c0374365d3b0cd1bc14
2016-02-19 16:44:43 -05:00
Nathan Bowler
87ac557aa0 Omaha #5244 Replace deprecated LocalizationFile methods.
Change-Id: Iea447bd018d203cf9c6a59fc9ed66e00e2b265a7

Former-commit-id: 580b44fedef93778e24af685d0e7d7e03810b6fa
2016-02-16 10:28:39 -05:00
Darrel Kingfield
f8d536f1fe VLab Issue #14927 MRMS v11 display code check-in v2; fixes #14927.
Change-Id: I0a4c5df11b8c9d86b19c64c5dc8715feb91d5620

Former-commit-id: 8c37c2d39624adc23a6cdb0e4cca4bad318d009f
2016-02-15 21:57:31 -08:00
Nathan Bowler
063c473391 Omaha #5283 Remove support for discontinued NGM data
Change-Id: I9c3fcf3bff03ed78cf77a8fdcd8b95da4d470dae

Former-commit-id: 0867569ae733dee3632e31bc216a06d356530e24
2016-02-11 12:20:32 -05:00
Wen Kwock
37124b90ee VLab Issue #14007 - DR17787 Fix Speed Current display unit; fixes #14007
Change-Id: Icd56cf5877a7b31339023bb00bb72f2f76381714

Former-commit-id: 4468c53dfd52ce25aebe0d9e9bf7f0b61d4d2223
2016-02-05 16:13:30 +00:00
Nathan Bowler
5412705591 Omaha #5183 Fix PWPF parameters, off by 0.5-1 error in colormap, and add to ingest.
Change-Id: I1cff6aa2138bd4d3234a7133cdf10470236dce1c

Former-commit-id: 8674b01f48fd4b5069778e7026919041f67e7011
2016-01-29 14:27:15 -05:00
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
Nathan Bowler
03f7c1d700 Omaha #5183 Add PWPF data.
Change-Id: Ib37670d67534f457dd15e9ac912f076f9093e7c9

Former-commit-id: 7aeb4ae1c85f837eef279e224cdf1323dadc0569
2016-01-21 16:34:59 -05:00
Shawn.Hooper
da0ff43173 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java

Change-Id: I123674540179ec5fd35a953cb652f613a3400ed5

Former-commit-id: 9f821c69fc8c198fc44529e2e00ecaa13b286e6f
2016-01-20 16:48:34 -05:00
Steve Harris
dfcc52e766 Merge tag 'OB_16.2.1-6' into omaha_16.2.1
16.2.1-6


Former-commit-id: 29a43c58b69086667c47e86c4a0bb1c849ad4367
2016-01-20 13:29:19 -06: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
Steve Harris
77e9dd0e31 Merge tag 'OB_16.2.1-4' into omaha_16.2.1
16.2.1-4

 Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java


Former-commit-id: 8cf6955bc2f007b352bea3b2ffea1927f549caec
2016-01-04 19:43:07 -06:00
Richard Peter
c3dbc10158 Omaha #5178 - Fix style rules for MxT and MnT
Change-Id: I7f0a34c93c4f48809f26ccf43c8c3c423d1764e4

Former-commit-id: 34a7a2f737c0802ee55b314b097a9d4f88eef331
2015-12-18 11:08:34 -06: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 [formerly 0e5a00548514123df7e2439e51878e492cdf3a6f].

Change-Id: I36995a9c432f6d6462d29d3c3aea5c45d69dfcd6

Former-commit-id: 72a841a8c93a66ac8c8c768fe230b81960efa733
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