Commit graph

185 commits

Author SHA1 Message Date
Yun.Teng
b06426b911 ASM #17701 - Fixed bug in formatters not reporting hazards from ISC database
Change-Id: I8c49848b938528f26221a3cd0e2aff91386bee0b

Former-commit-id: 5092546ea882df4687cf526fa40886f4df54383b
2015-10-29 15:00:46 +00:00
Steve Harris
56131ac305 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/GageData.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: fa9ad9b8a3900bd5f94017f27bec9a5673ecb881
2015-10-21 09:22:00 -05: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
Ron Anderson
82e09ad9b4 Omaha #4961 Create/update procedures for using GMTED2010 terrain in GFE.
Change-Id: I6b51386be983546d0637d4f85ebdad87abcce3a4

Former-commit-id: 2ff9b807b8586bbb56880fe5f3f26505bbd5d87d
2015-10-14 17:30:50 -05:00
Ron Anderson
d126af0f85 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/FormatterlauncherAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowPublishDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSendIscGridsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java
	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/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/ingest/LocationTablesIngest.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: Ie790e3a9a0c3829655a5a798a2c8b6740d02be6c

Former-commit-id: 691ca66a6f15c3cfae1bd1c8990644951d68a46f
2015-10-14 16:31:41 -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
8afca919d6 Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: 4b8114b253583c5d0c0b7d0fe09b844a2bca0881
2015-10-05 16:47:46 -04:00
David Gillingham
00cc3b6b39 Omaha #4888: Do not allow GFE to publish grids, transmit/generate text products or use ISC mode when DRT mode is enabled for operational mode.
(cherry picked from commit a2c9879dbc [formerly 5461d2ce24a95372902d58c8c8d43963d93ccd36])

Change-Id: Iefe86516fa941d6043b12fa6c7cebdd0803feff6

Former-commit-id: d5887279883f4fc742deea6a31403f74fb6f07ae
2015-10-01 13:56:59 -05: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
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
Ron Anderson
74f5f1e46b Omaha #4871 Fix error when procedure is called with varDict=None, fix issues when calling tools/procedures with dialogs
Change-Id: I8a43c13560da9e1434c24c5b6ff1ef3e1fed8602

Former-commit-id: bc377691615626b51c7b745e3e6647116b13093e
2015-09-23 12:43:28 -05: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
Ron Anderson
0fa733755e Omaha #4871 Return modified varDict from called Tool/Procedure
Change-Id: Id02dc7c559ec3780adb969540744b32500bb2ebc

Former-commit-id: 8cbde1ecb14a9b767d3e3e91050aa99a61fc5924
2015-09-16 19:46:25 -05:00
Steve Harris
fbdce3bede Merge tag 'OB_16.1.1-11' into omaha_16.2.1
16.1.1-11

 Conflicts:
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 3104ad23039ebe9333df058e004e3c9a6cdb1a11
2015-09-15 15:43:10 -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
David Gillingham
534d43b455 Omaha #4806: Create method so GFE smart tools and procedures can transmit text products.
Change-Id: Iada380912df9cabf744eb004d1f260713a62db7b

Former-commit-id: b96f462d21b1483e34b36533abfb27e2fb9e5f74
2015-08-31 11:46:30 -05: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
David Gillingham
e16ebbae02 Omaha #4805: Allow combinations files to be saved from GFE smart tools or procedures.
Change-Id: I4a54aba8e4a797711f69a4817c2ffec33f18e6f5

Former-commit-id: 8d567bdf7fb3a74c51691229d93ba26371a76f3a
2015-08-27 14:52:28 -05:00
David Gillingham
4290fb208b Omaha #4804: Add ability to run text formatters from GFE procedures and tools.
Change-Id: I8f77334dee55b6c55d1422ca314e082926ddf9c9

Former-commit-id: 9b75a6fd19c65cdb8c0a7aa19f2b68953983d3bd
2015-08-27 12:47:43 -05:00
Ron Anderson
b226840dab Omaha #4809 Added option group parameter to editAreaList(), removed dead files, fixed tabs in procedure template
Change-Id: I579b19b35217b6a0794435dcd3da1f5d2bc09391

Former-commit-id: f0dbd233145a1de08b0b81e5cdcb881f41926d9d
2015-08-26 16:35:54 -05: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
Ron Anderson
4c9c46178e Omaha #4751 Fix regression in ISC_Utility.py
Change-Id: I0444ed8d5aef171d6e98048f74bc44ad1c03c947

Former-commit-id: 13881e353f1791878dd2490cc4c959aba5c0a11f
2015-08-24 08:35:08 -05:00
Ron Anderson
7fbefd0046 Omaha #4704 Fix more dtype issues
Change-Id: I841fab00a3f477e53b5f076139849d016155cb47

Former-commit-id: 37bd1954dda045853648500f9679b2b0a0f55f02
2015-08-24 08:34:52 -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
Ron Anderson
3a03348288 Omaha #4751 Remove use of self._empty and self._minus from baseline smartInits/smartTools/procedures
Change-Id: I3656148f97b438b40fcd94fbd3fa1daa6b69e55e

Former-commit-id: e3ac78fd1d9bcfc97cba82450c4e2a29998a8ac7
2015-08-18 17:25:08 -05:00
David Gillingham
8724737db3 Omaha #4719: Optimize use of numpy.where in GFE viz code.
Change-Id: I032e4e45e48dfc8dc191b83bcfc38583d5057aaa

Former-commit-id: 85ef6c2a7daaa2a186a58a0b5d8080a490792d35
2015-08-18 12:35:13 -05:00
Ron Anderson
dbebf862cf Omaha #4704 Add NumpyJavaEnforcer support for smartInits and procedures
Change-Id: I8be4d7b986024cbda8c3d18eb016fc1347ce81d3

Former-commit-id: bc644168fd0b776a24804447cc6bee3313b60d18
2015-08-13 19:24:54 -05:00
David Gillingham
ed30c7d60e Omaha #4263: Rewrite GFE TextProductManager so it can be initialized off main thread.
Change-Id: Ia0cc2cf0c01f6ec6573c61768cd638f45feb0893

Former-commit-id: ceed238549ff6a6a8be8aa30aef3dfaeef5ce25d
2015-08-04 13:28:30 -05:00
Steve Harris
f696d5731d Merge tag 'OB_16.1.1-2' into omaha_16.2.1
16.1.1-2

 Conflicts:
	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.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJobPool.java


Former-commit-id: 8053621c46adc8813128ecfa81c0834f670db64f
2015-08-03 17:06:31 -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
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
David Gillingham
4910c13cbf Omaha #4263: Rewrite intialization of GFE procedures to happen off UI thread, bug fixes to previous smart tool changes.
Change-Id: Ia2ef810c3e5e119ab2cf233f299386a844246c3a

Former-commit-id: 74934899d000a88bf9dfcbc1b17c4faf3c10e947
2015-07-29 16:07:12 -05: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
David Gillingham
8208400e52 Omaha #4263: Refactor GFE smart tool code to support initialization off main thread.
Change-Id: I37d1b65e91d36602833fe1d7af3f2067ea60007c

Former-commit-id: dd4b25c23662038b9d344836532d7d49e9b023a1
2015-07-23 14:50:49 -05:00
Nate Jensen
958050610d Omaha #4575 vardict now HashMap intead of String
Change-Id: Icd6042a1d9b08d8a33afd41c65a530104bf01c8c

Former-commit-id: bffc43fe836827b8cd871f037f0ede093b69a88f
2015-07-20 15:40:07 -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
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
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
Ana Rivera
92e1aba8e8 VLab Issue #8808 - DR17623 NWPS:update Run_NWPS script to prevent errors at NCO; fixes #8808
Change-Id: I66e64d0cd85609cb708884c56de1f828a5cbc42c

Former-commit-id: 7dc52f4fe4d557a99f1139e159b59578836f6443
2015-06-18 14:20:25 +00: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