Commit graph

783 commits

Author SHA1 Message Date
Shawn.Hooper
200c59cef5 Merge remote-tracking branch 'origin/master_16.1.1' into master_16.1.2
Former-commit-id: 4afa2fe0d7abd2180b40a0737a3b372325d2621c
2015-12-08 16:11:35 -05:00
Ying-Lian.Shi
815d9f7feb ASM #13753 Revert 13753
Change-Id: I47d089fbecd8fbffb93be6ab7d689aa7e8f31313

Former-commit-id: 728a1d6381fd75678142d0e4290cdd01111f7eb6
2015-12-04 13:58:31 +00:00
Shawn.Hooper
e05677a9c7 Merge tag 'OB_16.1.1-27' into MERGE-1611-27-ASM
16.1.1-27

Change-Id: I99f3ec90e75fa89b29fda501cb53dabf3cf749c0

Former-commit-id: 9efa2034f3ba12c8209719f10d87b24ed1495b0f
2015-12-02 16:33:20 -05:00
Yun.Teng
0a86998d07 ASM #18356 - Fixed typo in DBSSClient.py
Change-Id: I6f2e024123f5ec178b5298f4b0642f1fb140d7ac

Former-commit-id: 92ac7786e962d2abcf736e762d5767e5f6086545
2015-12-02 16:55:54 +00:00
Shawn.Hooper
3bbc0622b4 Merge branch 'tcv_16.1.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.2
Former-commit-id: b1befee21578d2ee52e4ed99335042ecfdeded75
2015-11-20 12:59:00 -05:00
Sarah Pontius
917effa917 VLab Issue #12917 - TCV and HLS Improvements; fixes #12917
Change-Id: I9f9c652d32176e0e12317896001eb8613ef21c57

Former-commit-id: 2f562bdb68479d53997788b9227b7f25b972231f
2015-11-19 15:36:50 -07:00
Ron Anderson
4baa875e3b Omaha #5141 Replace commas with ellipses when forcing productst to upper case.
Change-Id: I9754cf0e22f8e3ce7d92df06456dab2c3c7451ba

Former-commit-id: fd411ce15a628efc30b63828ef5c1de1c2fce670
2015-11-19 14:56:00 -06:00
Nate Jensen
398b96ed79 Omaha #5135 fix ifpImage import of GLTargetProxy
Change-Id: Ia5dab8016458aa444a0c807d4c4f78e28f5ef90d

Former-commit-id: 38669a4a34ca9ac6b28288523599546734015802
2015-11-17 12:39:25 -06:00
Shawn.Hooper
24dd68c004 Merge branch 'tcv_16.1.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.2
Former-commit-id: f68db5906f446b6a9ad485ca478da0873ce2004a
2015-11-10 16:55:54 -05:00
Ana Rivera
79a8dee7f1 VLab Issue #9806 - DCS16913 HTI Improvements: CopyNHCProposed.py; fixes #9806
.../procedures/TCStormSurgeThreat.py (delivered with vlab 9807,DCS17369)
 .../procedures/CopyNHCProposed.py
 .../procedures/TCFloodingRainThreat.py (pending)

Change-Id: Ifad0b55a0ee0d0b292fe184fc774c185d3d0490d

Former-commit-id: 4276534d8f56da0cefb17aa528ddcfbd1b0e6ca9
2015-11-10 16:27:11 +00:00
Ana Rivera
794f0ce6a9 VLab Issue #9807 - DCS17369 HTI:TCStormSurgeThreat updates (set_2); fixes #9807
Change-Id: I32c5a91c23b79539f4c8a6d3cf6e73e3aa7f3ce8

Former-commit-id: 927e1fc6afa113a6c6a6f81ec7f942d198e4e085
2015-11-10 15:01:08 +00:00
Ana Rivera
3a4c86515b VLab Issue #9807 - DCS 17369 HTI:change StormSurgeWW_EditArea to shapefile; fixes #9807
Add map bundles: stormsurgeww.xml and nhadomain.xml
Update Maps.py, serverConfig.py and TCStormSurgeThreat.py
Remove StormSurgeWW_EditArea.xml

Change-Id: If080dc3b54bbce8e6cc33b5d9aa68d1d7473cee5

Former-commit-id: 622b9c620e073d0acd7530065f2c413cb2c0ca1d
2015-11-09 19:50:53 +00:00
Shawn.Hooper
df241afdfe Merge tag 'OB_16.1.1-18' into asm_16.1.1
16.1.1-18


Former-commit-id: 810ec254f642f9016945926c199cd3da08ea54fc
2015-10-27 16:35:25 -04:00
Shawn.Hooper
aeba8deb71 Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: b7c7cfdec3fb50edd7b9c164de6d29af465f6a8d
2015-10-26 16:14:37 -04:00
Ying-Lian.Shi
d142e9082e ASM #18244 NullPointerException in GFE when run the Formatter against the Fcst
Change-Id: Ide285a777dcbbe9cca1229a52ada0bee2755a69a

Former-commit-id: 9966a04af5084e190ace47dfd1f135eec923cd4f
2015-10-26 18:26:03 +00:00
Shawn.Hooper
eff6191e21 Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: 97b375aa7cc85db9fd1e1c9eb82da3f3d3819263
2015-10-20 14:38:16 -04:00
Rici.Yu
f1f0f52fd1 ASM #18183 - Check in David Gillingham's changes
Change-Id: If953bd531f92323130a680f901dba0d899fc9239

Former-commit-id: 5fcbb71568d72653d007f2f5c32059edfce4c895
2015-10-19 14:55:00 -04:00
Shawn.Hooper
90badd7a3e Merge tag 'OB_15.1.2-9' into master_16.1.1
15.1.2-9

Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/ContactsDataManager.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/DescriptionDataManager.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/LocationAreaManager.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: e9e9660925d0afc016f88ec73182f9eae6ab0c18
2015-10-15 17:10:19 -04:00
Shawn.Hooper
707202de1a ASM #17872 - DRT mode in D2D/CAVE allows publishing of new grids with old timestamp
Change-Id: I9a376596b4f6edaa665f86a52be1cf1e87e98964

Former-commit-id: 9ad9a29e57e8749936bd8cdc53f74ef750f417ed
2015-10-13 12:33:35 -04:00
Matthew Howard
a4c7e0b2f6 Merge "ASM #18125 Show_ISC_Info error message displayed when closing ISC Info dialog" into asm_16.1.1
Former-commit-id: 591a075b6373be7179b26d6120c6947e5172bb26
2015-10-09 07:32:44 -05:00
Bruce.Hundermark
006ea4637e ASM #18125 Show_ISC_Info error message displayed when closing ISC Info dialog
Change-Id: I52b59d7f7ca1c3763bb5c711d6f7fb2a241e85bc

Former-commit-id: 9cff7d78762288c3481b728c201f705d794c01ae
2015-10-08 20:27:17 +00:00
Juliya Dynina
75371216ad Merge "ASM #17978 fixed the hydroview display for time step" into asm_16.1.1
Former-commit-id: 82ea99a28bb9183b347c816889679bf8a8e0c27e
2015-10-08 14:41:27 -05:00
Shawn.Hooper
4a5cc197fc ASM #18120 - Changes to add tsunami advisory to GFE
Change-Id: I93205516d5111c4f4482f857adfc491e218e65c7

Former-commit-id: 64700a4ddf86de279317170e7fe90c4ccb613f40
2015-10-07 13:32:18 -04:00
Shawn.Hooper
8bb4e5b656 Merge tag 'OB_15.1.2-6' into master_16.1.1
15.1.2-6


Former-commit-id: 4667834ea5f9c4950978851f0543398a7c00c795
2015-09-30 16:35:18 -04:00
Rici.Yu
c623963b36 ASM #18141 - check in changes Ron identified
Change-Id: Idbef45bd5fa2f19a247a7abfaee22482db3e7c26

Former-commit-id: c3cba26391a4cd9c039533f756a9c3bea87ecc19
2015-09-30 15:33:17 -04:00
David Gillingham
6f9c63e110 Omaha #4858: Fix NullPointerException in ISimulatedTimeChangeListener in GFEPerspectiveManager.
Change-Id: I9129be02891d26259dc620fb38d885356ed5a638

Former-commit-id: 25fdc908f2f6e691ce3da3350252d1c3ecc52c8f
2015-09-28 11:12:03 -05:00
Shawn.Hooper
6a7cc4124e Merge tag 'OB_15.1.2-5' into master_16.1.1
15.1.2-5

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java

Former-commit-id: 1222db64b22b7188e9fc549a95a0fd9851cef0bd
2015-09-25 16:44:09 -04:00
David Gillingham
a2c9879dbc Omaha #4858: Do not allow GFE to publish grids, transmit/generate text products or use ISC mode when DRT mode is enabled for operational mode.
Change-Id: Iefe86516fa941d6043b12fa6c7cebdd0803feff6

Former-commit-id: 5461d2ce24a95372902d58c8c8d43963d93ccd36
2015-09-21 17:55:02 -05:00
Shawn.Hooper
bda1720de0 Merge tag 'OB_15.1.2-4' into master_16.1.1
15.1.2-4


Former-commit-id: 16cef2c4e589eb7e711958b86993a5091041c663
2015-09-18 14:56:50 -04:00
Shawn.Hooper
2a07aefaea Merge branch 'asm_15.1.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.2
Former-commit-id: a84506abd2b7292f4cb0d29e3778f4e1fa16cfa7
2015-09-09 17:04:58 -04:00
Yun.Teng
c24f0e7743 ASM #17970 - Do not allow GFE to open in operational mode when CAVE is not in real-time
Change-Id: Ie3015035e4e168c4a23e7cce9568b04f8aa1c936

Former-commit-id: 15e42ffd0eee9c144fdb89f7b4d592f82664789b
2015-09-03 18:24:40 +01:00
Shawn.Hooper
5c8b7b0682 Merge branch 'omaha_15.1.2' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.2
Former-commit-id: 0405a69eaa5b22801371ba70daff67a890a13e01
2015-09-01 14:28:49 -04:00
Yun.Teng
cc1b34c6de ASM #17257 - Change CheckTandTd/CheckWindGust to use selected time range and improve efficiency, and combine to make procedure CheckTTdWind
Change-Id: Iad128b841eb5b605f4ce6f551e7605ad8af42feb

Former-commit-id: 45221cf6c1da7718e4415aff339967e944691640
2015-08-28 19:27:20 +01:00
Shawn.Hooper
db4b18db3a Merge branch 'master_16.1.1' into asm_16.1.1
Former-commit-id: cf6eed082bf8d7252952225a4e6f4f155c106a67
2015-08-27 16:05:42 -04:00
Yun.Teng
004235f2e2 ASM #17257 Change CheckTandTd/CheckWindGust to use selected time range and improve efficiency, and combine to make procedure CheckTTdWind
Change-Id: Icdd688e28904b1d452ee0e72d57a7574e20e92cc

Former-commit-id: b90f826dd0c58980f599744ad80f9765750aaf0f
2015-08-26 15:32:48 +01:00
David Gillingham
44b9aaa241 Omaha #4772: Add support for DAF to GFE text formatters.
Change-Id: I8f059cfdae6d7a1a6f8abc58a5d142c3abad17d2

Former-commit-id: 426d1edc35273bc9e4136bb614491de2861436c5
2015-08-21 11:12:45 -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
Shawn.Hooper
77b4ce8a0b Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: c199e711f1d1141a00876f4c93afdb2e6a7777b2
2015-08-13 14:34:17 -04:00
Ying-Lian.Shi
4850fb93a6 ASM #13753 GFE: Incorrect time for products prepared by Product Editor/Make Correction
Change-Id: I4ca0cce5c19ddf6616f1766db4b8e7122374adc9

Former-commit-id: 3350419c4eb30891bb1ca847b99efce69116bc80
2015-08-11 12:40:09 +00:00
Ron Anderson
8931cac84a Omaha #4721 Change GFE formatter launcher to use awipsWANPil to determine mixed case transmission.
Change-Id: Ib70627526c07d0f327356901c300a8ca76510b1f

Former-commit-id: db06e308757a3bb5840c5203122d3c9a4b32469a
2015-08-10 09:56:16 -05:00
Steve Harris
7b0c814fd0 Merge tag 'OB_16.1.1-2' into omaha_16.1.1
16.1.1-2


Former-commit-id: afbe137f83e60abbabd7a38890a1d3bde5f96555
2015-08-03 16:39:02 -05:00
Fay.Liang
f185d26495 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: f83dc651e89ba0a1beaa360fd8d14eda90a5bc29
2015-07-31 09:57:28 -04:00
Fay.Liang
e0b8b2f813 Merge remote-tracking branch 'origin/master_14.4.2' into master_15.1.1
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 39babf90e69c4b8d3319cc385bb6a19bb3f93aad
2015-07-31 09:56:36 -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
Richard Peter
9952a991c1 Omaha #4500 - Fix ZoneSelectorResource
Change-Id: I27359e44e71c81ac9a31d308b9ef33d11574e9fc

Former-commit-id: db10c872cc24aed1d5c352179bb4500f8f1b606b
2015-07-30 15:38:06 -05:00
Juliya Dynina
2a7201a12a Merge "ASM #17770 GFE: MakeHazard does not decode TCPPQx and TCMCPx products correctly, Add handling for AT, EP, CP, WP, warn on invalid basinID, code clean up" into asm_15.1.1
Former-commit-id: 3d41731d91aaef542e32d257866d2b671a4d774b
2015-07-30 13:54:36 -05:00
Juliya Dynina
c63045598b Merge "ASM #17771 GFE: HLSPQx does not correctly assign the ETN for TY hazards" into asm_15.1.1
Former-commit-id: 823a1b20179ae1d54f191a4bf7046235670a5657
2015-07-30 13:54:14 -05:00
Ying-Lian.Shi
b4f2e59315 ASM #17770 GFE: MakeHazard does not decode TCPPQx and TCMCPx products correctly, Add handling for AT, EP, CP, WP, warn on invalid basinID, code clean up
Change-Id: Ia247e52e94afe3607dafacda71d3c09460b923d2

Former-commit-id: 0081fb67da6894e550591b9d13342cdc8e247116
2015-07-30 18:05:37 +00:00
Yun.Teng
b8e287d62f ASM #17777 - change Red Flag Warning CTA language
Change-Id: I50dfa8670926777de6f5d6d779b60641c658daaa

Former-commit-id: 4d6c3cf8f041cf4bb1ef97c7fd7e8104d0a1386f
2015-07-28 17:10:39 +01:00
Yun.Teng
2a3badf998 ASM #17257 - Change CheckTandTd/CheckWindGust to use selected time range and improve efficiency, and combine to make procedure CheckTTdWind
Change-Id: Ide50e3cc57fac8e5d69b398441e1c43983616d30

Former-commit-id: 1e2508936f79544ec987b682d25d0362d487e2e3
2015-07-28 16:26:25 +01:00