Commit graph

766 commits

Author SHA1 Message Date
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
Ying-Lian.Shi
924e826638 ASM #17771 GFE: HLSPQx does not correctly assign the ETN for TY hazards
Change-Id: I3cad7be2f331160a629c385ca87228126880851f

Former-commit-id: 13df1bebf4a459b6361b764ae7158163cd64d824
2015-07-27 18:08:08 +00:00
David Friedman
2121ce36d7 ASM #13849 - Use a unique Eclipse configuration directory for each CAVE/AlertViz instance
Change-Id: I98cd38b2ada1197511861841b07caf943438cfd3

Former-commit-id: 349b4665855bed697948aadb8fba23a2a761c83f
2015-07-23 21:03:06 +00:00
Ying-Lian.Shi
4cf38a9488 ASM #13753 keep Issue time unchange while update other times
Change-Id: Id8d36e484c6cd2527d35039a6c0a02f474c440bc

Former-commit-id: 654f11435e1f4a0970ec2d6bf4a7f84da8dbce91
2015-07-22 18:03:16 +00:00
Richard Peter
c3bf9eb17c Omaha #4500 - Fix ZoneSelectorResource column mapping
Change-Id: I541f9e6003e5dcd0a29078df32677ccc5dcb8c68

Former-commit-id: b7a7761543d5dbdbf6288afc45bd01fea650cb96
2015-07-21 11:45:27 -05:00
Sarah Pontius
890c650335 VLab Issue #9419 - Advisory Sorting Not Accurate and Consistent; fixes #9419
Change-Id: I15e9f32a23e1509e3473fa8c49a680dea3cbc7da

Former-commit-id: 47f8e240c94a47991ca98d1002707143f8181ebb
2015-07-16 09:05:21 -06:00
Richard Peter
47bdd9984d Omaha #4500 - Fix SQL Injection Concerns.
Change-Id: I3af5ce39d163a212f66e675d3386ae5c68b9b295

Former-commit-id: 7613c06d4351c52dcc8e49d6bc64ecb0166f72e7
2015-07-13 16:31:26 -05:00
Ron Anderson
5eac3a423a Omaha #4259 Fix error in SmartScript.getGrids that caused scalar grids to fail.
Change-Id: Ief6e27abe1824c326550837e2bc0a8ab2e276a98

Former-commit-id: 686ab4bd37aa6cc656fdb1e8622a87a84872529a
2015-07-08 12:42:54 -05:00
Ron Anderson
4626fd62a9 Omaha #4259 Remove comment from SmartScript.getLatLonGrids() as it does not apply here.
Change-Id: Id5b4663cc3cd866ac72a80f2d5bf3dfa3883c60c

Former-commit-id: 4604302350e3c09fa6770fe0d1a644bf18a65c4c
2015-07-07 13:24:21 -05:00
Ron Anderson
2853d08519 Omaha #4259 Fix lat/lon grids and ifpnetCDF parmList issues
Change-Id: Ie1437c6455a7c88a31ba0152bd56976ab6ce70c3

Former-commit-id: 26faf2500b76504bddcda0e6eb5dbe334e6cdc3f
2015-07-07 10:35:17 -05:00
Rici.Yu
632996ed0f ASM #14739 - Fix callSmartTool() to return with updated varDict
Change-Id: Id11a5abbd82ad5011b4fa614c060d2c10d0cb18c

Former-commit-id: 176777391518f6e74188c1de13415fa0b7dcecd7
2015-07-07 10:56:40 -04:00
Steve Harris
11d147911d Merge tag 'OB_15.1.1-20' into omaha_16.1.1
15.1.1-20

 Conflicts:
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py


Former-commit-id: d3fc25a0bc4136a28efcd024dd272373982b2c9d
2015-07-06 09:48:19 -05:00
Ying-Lian.Shi
2827b5b3ec ASM #13753 Update times for products in Product Editor, fixed CCA issue, thead-safe
Change-Id: I75136cce7599d1f6a61255391078af64a511823a

Former-commit-id: c11237fc4d7e55e76a28400ac74af7e4ae6ece86
2015-07-02 17:00:15 +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
Yun.Teng
e69b6ba587 ASM #14552 - Fixed HistSample.java for getMaxMode method in SampleAnalysis.py
Change-Id: Id850244250f690db6037a40ae8bdc1fcfb84fea5

Former-commit-id: 4853c75425c1fe8a04a59df6502d1a3864b9b33f
2015-07-01 14:51:32 +01:00
Ron Anderson
2e0b1f2d60 Omaha #4343 Fix merge issue in TextProductTest.py
Change-Id: I21f86ef39483a1fad5b564831ffeefc83618b939

Former-commit-id: 1905aaf6e1a8a46feacadbf296b962cdcf091025
2015-06-24 16:54:13 -05:00
Yun.Teng
755cc69127 ASM #14401 - Check for disposed widget before access
Change-Id: I04438ab7774b54e3f78baaa71de50e5a85e4d9d9

Former-commit-id: b211d1c9255fa68ac5663789f4042aee7bd44d50
2015-06-24 16:53:26 +01:00
Fay.Liang
1c7710beb3 Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into int_15.1.1
Former-commit-id: a73ad204a8cdde0a563780e16c62fb41291a4d2f
2015-06-22 16:37:17 -04:00