Shawn.Hooper
fe6159d631
ASM #17573 - TCV: additional fixes to handle default case in Hazard_TCV
...
Change-Id: Icdd2c00109caf1a9d9306b35d14f773568623a44
Former-commit-id: 012d70b27d646f893f4a8ab11ac7283450ff0695
2016-02-26 16:19:55 -05:00
Shawn.Hooper
ffa9a5603c
Merge tag 'OB_16.1.2-22' into master_16.2.1
...
16.1.2-22
Former-commit-id: 76aec34b914155d7072b994dc25fa9bb900d2c9f
2016-02-25 15:15:03 -05:00
Shawn.Hooper
528fea0e4e
Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
...
Former-commit-id: 44af64b6c2b7c08b29e21d0b2975cba0d15c5507
2016-02-25 15:12:04 -05:00
Ron Anderson
21fce01ece
Omaha #5374 Added sendWFOMessage to SmartScript
...
(cherry picked from commit bc1f577171bd61624498d0df96ac1937ec1dab60 [formerly 0cc3bbdf6ca35a99532726de9f7fd9b6149dbf97])
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
Former-commit-id: 1d4f3721d21481ed2e084cd72e95479e3e2e2bb5
2016-02-25 09:59:55 -06:00
Joshua Watson
b273056afb
VLab Issue #11629:NamDNG changes; fixes #11629
...
Change-Id: Iba3b15ba77612411e09f2f2a5dcb66461f08f31e
Former-commit-id: 2f78a8716f90ed6525455533d4b5a4d23f58a5f8
2016-02-25 09:41:07 -05:00
Ron Anderson
31ddc8e3da
Omaha #5411 Updates per latest mixed case guidelines
...
Change-Id: I6e578238e09da773489302895a7e7433d561455f
Former-commit-id: ea79be27628188bab964e3f6be31f96ceb008aca
2016-02-24 17:19:57 -06:00
Shawn.Hooper
f651a82d3b
Merge remote-tracking branch 'origin/master_16.2.1' into asm_16.2.1
...
Former-commit-id: e2d8494392a366995af0dbf7514780d0a98fc011
2016-02-24 16:17:01 -05:00
Ana Rivera
929a41677c
VLab Issue #15905 - DR17573 HLS and Hazard_TCV updates; fixes #15905
...
Change-Id: Idf4581dc82cb390377357438d25a6d6b94d2a2d7
Former-commit-id: d3b12a1226f4606ff225b71995bcb83927d7473d
2016-02-24 18:12:31 +00:00
Wen Kwock
86c6fe8830
VLab Issue #13176 - DCS18161 NBM version 2; fixes #13176
...
Change-Id: I80f9a22475e6847e41747a70de38535cb05ccff8
Former-commit-id: 15aecaf4625b83950d19d222062f0d63c249529d
2016-02-23 19:55:35 +00:00
Ana Rivera
9b97d8e4c3
Merge branch 'omaha_16.2.2' into field_16.2.2
...
Change-Id: Iaa9a1a801ee2059f5ffa5473a407ac8a7c1a4200
Former-commit-id: eb7beb890676babbbd203fc1721d48ceb067aba1
2016-02-22 20:35:27 +00:00
Steve Harris
4a865236eb
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Former-commit-id: 018f8407a70af07e72b6c1183dbc289bccd3b31c
2016-02-22 14:05:23 -06:00
Shawn.Hooper
663c44637f
Merge tag 'OB_16.1.2-20' into asm_16.2.1
...
16.1.2-20
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9ed1c12896ffa710e7995f9682b4be1de88fa077
Former-commit-id: 9e3470f2b741592182dfae3e873503eb22df4f18
2016-02-22 11:13:16 -05:00
Penghai Wang
83ae2c8a76
Merge "VLab Issue #12796 - DCS 17815. Added Wave Steepness to Volume Browser; fixes #12796 " into asdt_16.2.2
...
Former-commit-id: 77d2fa7e7d6c0b58ec0cd0c29fef781c616a2386
2016-02-22 14:27:38 +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
Andrew Moore
e57b47dd4b
VLab Issue #12789 - Various Wave models should be in 3-hour timesteps instead of 6; fixes #12789
...
Change-Id: I9d34b391b1b5b4f6172cf62811ff7324e248044e
Former-commit-id: 678d895f59e622c821be5676135ad5219281d87d
2016-02-18 15:21:51 +00:00
Andrew Moore
6c8280d912
VLab Issue #12796 - DCS 17815. Added Wave Steepness to Volume Browser; fixes #12796
...
Change-Id: I50daa9a695fa3e074cc8cb5e9c8cdaea5b3334a4
VLab Issue #12796 - DCS 17815. Added Wave Swell to all *wave*xml files for Product Browser grid menu; fixes #12796
Change-Id: Iaafb3805fa9875f83fec819a9c0daea7a59a70a2
VLab Issue #12796 - DCS 17815. Added WSTP to all *wave*xml files for Product Browser grid menu; fixes #12796
Change-Id: Idd28282e2fc2cce689408fba6c03e3eecef0bdbf
Former-commit-id: 5fc1d36892051a57ef1e11605bdad24c136093df
2016-02-17 19:11:46 +00:00
Ana Rivera
6c892b970e
Merge branch 'master_16.1.2' into tcv_16.1.2
...
Change-Id: I4d87fbc00334e1c5261f0cee14ce5d1b788aee58
Former-commit-id: c2dbcab9941d6325a602cf99153ee6b39513cc3b
2016-02-17 13:16:48 +00:00
Shawn.Hooper
6070484233
Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
...
Former-commit-id: 77fef70f5b79331f3c57cb580f0204acc1d9b64d
2016-02-16 11:10:37 -05:00
Steve Harris
4ba488bd0a
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Former-commit-id: 27f7e431d04f99ec48723c71413e9633c0d1996e
2016-02-15 10:15:20 -06:00
Sarah Pontius
4cd9308fa9
VLab Issue #15555 - HTI and Local TCV/HLS Revisions; fixes #15555
...
Change-Id: I5b8f8cd8dcedf3be427b81423bc9fc7bda794bc2
Former-commit-id: 5e055ffea9db10859d9217ebbf3a5f86999800b4
2016-02-12 14:47:40 -07:00
Ana Rivera
039658f5e7
Merge "VLab Issue #15553 - DR18623 nwpsTrkngCG0.py clean-up; fixes #15553 Remove references to 'local' and test comments in banner messages." into field_16.2.1
...
Former-commit-id: 59264a7f296e0d4c207003abc2bc0669ea6052ba
2016-02-12 12:32:46 +00:00
Tom Filiaggi
cdb44ff6f3
VLab Issue #15532 - GFE SmartInits ISC DB local parm - fixes #15532 .
...
This is a one-liner.
Change-Id: I5b3a83bde3bb9646dab2895bdbc3d2bf281d19e8
Former-commit-id: c187dedfc1e9b3d85bd1183e6bfdef5230c28782
2016-02-11 19:34:59 +00: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
David Gillingham
a902b541b4
Omaha #5183 : Add GFE display support for raw data from PWPF model.
...
Change-Id: Id9d7e3e89f68184c4c0755506885806788c521b3
Former-commit-id: a034befa9aacad88b13e8dc3514de0c5cd28c9ea
2016-02-10 13:19:48 -06:00
Ana Rivera
3eab7cb811
VLab Issue #15553 - DR18623 nwpsTrkngCG0.py clean-up; fixes #15553
...
Remove references to 'local' and test comments in banner messages.
Change-Id: Ia5a886961d83f3c49dd952a8a362c9d9847b0722
Former-commit-id: f8e2338212a4ff8605d00824a76f4ac946181263
2016-02-10 14:54:52 +00:00
Shawn.Hooper
bbb7dd00c1
Merge branch 'master_16.1.2' into asm_16.1.2
...
Former-commit-id: b8da8f8732fc6906e42396dcfce598c932bae9fe
2016-02-08 16:16:37 -05:00
Mark Ruebens
cd376f4a16
Merge "ASM #18606 - check in Maps.py change from Shannon" into asm_16.1.2
...
Former-commit-id: c410b5dbb9e526761251f68f73437d9f7b659cf5
2016-02-08 11:58:25 -05:00
Rici.Yu
347270c10d
ASM #18606 - check in Maps.py change from Shannon
...
Change-Id: Ie6c06d9d3f788004c1230de98f94aab832ca75a5
Former-commit-id: dbfb33aa6575b02212feefe31cbecb51f3da56ec
2016-02-08 11:40:07 -05:00
Shawn.Hooper
254cf29490
Merge remote-tracking branch 'omaha/omaha_16.1.2' into master_16.1.2
...
Former-commit-id: c6b290a9243b74b8324a718db4b23cba252716bd
2016-02-02 14:44:17 -05:00
Yun.Teng
3c02c9885a
ASM #13261 - Change an alertviz message in PFM formatter
...
Change-Id: Ia0f2f553076e3ca022ef13a4802163776ac26279
Former-commit-id: b88cd2dece4fed8608cf3f56998ab115ba06f6fb
2016-02-02 19:20:49 +00:00
Ana Rivera
41c9e86971
VLab Issue #14152 : Add Sky, Wind for GFSLAMPGrid to GFE (set_2:Fix typo in GFSLAMPGrid.py); fixes #14152
...
Change-Id: Idedce2d1a107ea2dc1b4b21054a6f8e09e42cc88
Former-commit-id: d7a78b8223bf9b4c4f7846da53747c0f137d601a
2016-02-02 13:57:39 +00:00
Steve Harris
85055fcc53
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 68c13f9160746f365bd5f896b1400f1a8099ebe8
2016-02-01 11:57:52 -06:00
Ana Rivera
2c55e2c73e
Merge branch 'master_16.2.1'(OB_16.2.1-8) into field_16.2.1
...
Change-Id: Iacbb253a6326aef1a6cd4d3248e70752c60a926c
Former-commit-id: ea3e5bbb881579737ec9973e6d306b3c9b6f508d
2016-02-01 15:20:44 +00:00
Ana Rivera
c10d68e689
Merge branch 'master_16.1.2' into tcv_16.1.2
...
Change-Id: I2af0dba1d21aa045890559f51cba12fcb4b0f335
Former-commit-id: 1f4c836a341afab4728dd9462139fed44e7b454c
2016-01-28 15:54:43 +00:00
Tom Gurney
147144e64f
Omaha #5237 Replace deprecated LocalizationFile method calls
...
Changed LocalizationFile.getName() to getPath() in all Raytheon edex plugins.
Also changed LocalizationFile to ILocalizationFile when it was possible to do
so without further code changes.
Change-Id: Ic066dd09a7929606f6987088b6d182a60caea1c1
Former-commit-id: 1864ce834c0c27647c4da46868d9a65e01addd9f
2016-01-27 16:52:52 -06:00
Ron Anderson
857024271a
Omaha #5290 Fix NPE in smartInits
...
Change-Id: I2673e5bcd8912262ac0e95ff2e6ff75fd2ea004c
Former-commit-id: 15af8e734b000734ad680b1d99526f3993392ff6
2016-01-27 11:22:30 -06:00
Shawn.Hooper
9efc850e4a
Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
...
Former-commit-id: fe5781c930e4cab0ece462f9ae6152b1d4f4633c
2016-01-26 17:16:15 -05:00
Sarah Pontius
da545043c9
VLab Issue #15111 - TCV and HLS Revisions; fixes #15111
...
Change-Id: I013d6f23d30fb7471923fe1ad3883f4329b77cbf
Former-commit-id: fc7322a5615887e12ddd5364ed593b7d3595b967
2016-01-26 11:40:15 -07:00
Shawn.Hooper
2861d7abd7
Merge tag 'OB_16.1.2-14' into master_16.2.1
...
16.1.2-14
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: If4483610b92d4c2ef975c3ac75403e12a70d612c
Former-commit-id: 66d3cd35731e59996c34f003e42cbb2a41010717
2016-01-25 14:32:31 -05:00
Ana Rivera
e42a5384a3
Merge branch 'master_16.2.1'(OB_16.2.1-6) into field_16.2.1
...
Fixed serverConfig.py conflict in History comment.
Change-Id: I3b5348aa8f73deb29163c4c06fb94da0318c415b
Former-commit-id: 4e26e38a9e0cb8b24d8d9f722e35592a8a991ab0
2016-01-22 13:53:50 +00:00
Ron Anderson
380a0a1f09
Omaha #5237 Fix localization file saving issues
...
Change-Id: Ifea80fad92ab5eb460d82ba773656a5f0065473d
Former-commit-id: 774060dddae225eab8dd7efe61bc658091dc4c9b
2016-01-21 15:26:02 -06:00
Shawn.Hooper
3f05c3da44
Merge remote-tracking branch 'vlab/field_16.2.1' into master_16.2.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I279d046dc8a054563c9ddabd92350f8d97222355
Former-commit-id: f9ff90f121eff9ae632b8bcc47c3500d9f647d00
2016-01-20 16:49:53 -05:00
Steve Harris
11a5db155d
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java
Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
2016-01-20 15:23:43 -06:00
Ana Rivera
35b00be61e
Merge branch 'master_16.2.1' into field_16.2.1
...
Change-Id: I197477fc4ceeb0efbd47335a98df7a2bedb703e0
Former-commit-id: 521d1a43251c5c8a697eccd7d09965dee58fd50b
2016-01-15 16:09:14 +00:00
Sean.Webb
35f0bc8145
ASM #18502 - Added Wind Gust entry to NationalBlend parameterInfo file
...
Change-Id: I4fca77ef9cc82923b197102f47938b7552975542
Former-commit-id: 8ba976eb2516b81da37966db2fdd7319d93ed027
2016-01-15 10:23:35 -05:00
Tom Gurney
76bdbc2084
Omaha #5237 : Replace calls to deprecated LocalizationFile methods
...
Change-Id: I81bd2c7fcf29db4b9dea4164b826b8880e707686
Former-commit-id: 843e2b439ea1609dff0583e8eaa25feeb3c6f3cb
2016-01-14 12:27:08 -06:00
Steve Harris
25cee1be8c
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 58b1a82b5cf59525bf266416bc8c3ca6c0dea4ad
2016-01-13 09:20:51 -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
Shawn.Hooper
221d0396b2
ASM #18056 - Fix merge issues for serverConfig.py found in 16.2.1-5
...
Change-Id: Id36309a56d4e13093c4073256bba9aa5521e929d
Former-commit-id: ab99fdc554ed8da307b88c463fb9302476def68b
2016-01-06 13:58:41 -05:00
Steve Harris
8a07970ba6
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java
Former-commit-id: d9745246c0f81ec088b3f4108b30e02c33f6a9ae
2016-01-06 11:55:00 -06:00
