Commit graph

882 commits

Author SHA1 Message Date
Steve Harris
b36e10b33e Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: b7c8b89efdfc63fb24117a985723e7a09c900eeb
2015-07-22 07:51:43 -05: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
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
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
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
Steve Harris
4f4f417efb Merge tag 'OB_15.1.1-18' into omaha_16.1.1
15.1.1-18

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml


Former-commit-id: 383347accebb250ce3c761ad2e1cc0aaa58abde3
2015-06-16 09:35:56 -05: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
Fay.Liang
0fa6593639 Merge tag 'OB_14.4.1-50' into int_15.1.1
14.4.1-50

Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java

Former-commit-id: a2a24493e5015323a22fbce1b2cb7b28f81b9f9c
2015-06-11 17:12:14 -04:00
Rici.Yu
69a41f1a09 ASM #17487 - Fix gfeclient hanging due to lock file conflict
Change-Id: I8131c781d332135eaf9955fdf3e172b61c4e92da

Former-commit-id: d3c911a1f425a81d35ebd4184b626f256183206b
2015-06-08 16:27:47 -04:00
Nate Jensen
ab85e7a600 Omaha #4259 remove LD_PRELOAD usage
Change-Id: I978df385ae00bb4da280cb293d5b0d7f10467097

Former-commit-id: 29988362b0d24787c1b5910feb638fb8770e77d9
2015-06-08 11:10:42 -05:00
Steve Harris
4de63454fc Merge tag 'OB_15.1.1-16' into omaha_16.1.1
15.1.1-16

 Conflicts:
	cave/com.raytheon.viz.gfe/build.properties
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py


Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
2015-06-05 15:38:00 -05:00
Greg Armendariz
e6714a3e7a Omaha #4343 - Resolve merge issue, add comma to separate manifest lines
Former-commit-id: ab8b5b3ce599719c099eae62d36a6c856cb6e21f
2015-06-04 12:10:18 -05:00
Steve Harris
7e7cdd1c7a Merge tag 'OB_15.1.1-14' into omaha_16.1.1
15.1.1-14

 Conflicts:
	cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
	cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py


Former-commit-id: 92470a2ce7952ee72dbe2557ee16ee54d7ae901c
2015-06-04 11:08:19 -05:00
Fay.Liang
a9a5aa6f70 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 6c8e5f9fba2f3f080287da9931dcbe1dee2545c6
2015-06-01 08:59:15 -04:00
Fay.Liang
f754ccb426 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into int_15.1.1
Former-commit-id: 904d90b1eb028c677b6f62f9a244aa7fd061fef6
2015-05-29 16:17:18 -04:00
Fay.Liang
31496dac17 Merge tag 'OB_14.4.1-47' into int_15.1.1
14.4.1-47

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
2015-05-29 15:42:40 -04:00
Ying-Lian.Shi
aab21ae2f1 ASM #17500 GFE: Problem with CTAs for Heat Advisory (HT.Y) and Excessive Heat Warning (EH.W)
Change-Id: Ia5e8c7775deab23d689e7d9a987523536ff98e2b

Former-commit-id: e8cf281170f41e86c1d4bd643dbe92ee79b9adec
2015-05-29 18:18:08 +00:00
Ron Anderson
88d48b1360 Omaha #4467 Fix issue with unicode string from formatter
Change-Id: I4f5792953aef2bccecc7576d8282bcbd5d89671a

Former-commit-id: e95402f2b4bfef8bfb1de89b6ff58cf0e19a8daf
2015-05-27 15:28:29 -05:00
Fay.Liang
78e5fba897 Merge tag 'OB_14.3.4-2' into master_14.4.1
14.3.4-2


Former-commit-id: ab0f58ebd6b4ce61525b1ec768fb6b293098cd91
2015-05-22 14:52:28 -04:00
Ana Rivera
f7128dbcbe VLab Issue #8326 -DR17492 TCStormSurgeThreat Update 2; fixes #8326
Change-Id: Idac35a7a2465257147f9e4fb3f5e70d7e3713192

Former-commit-id: 377a104856ac009f465a534e9cec03754d5c2272
2015-05-22 18:28:22 +00:00
Ana Rivera
43be56bfec VLab Issue #8326 - DR17492 A new TCStormSurgeThreat procedure; fixes #8326
Change-Id: I70b38b4e6c21372a4522446e94e370e90e342334

Former-commit-id: bd4722e28a60504f610350ccc7c0b6eb9cd6898e
2015-05-21 23:30:28 +00:00
Ron Anderson
7d1886f84a Omaha #4027 Fixes for GFE formatter auto tests
Change-Id: Ia59e2a7794f520538d056e2b4286d53b6317ab06

Former-commit-id: 093e1d721e130f690b15e821d6bb4f12f3b62913
2015-05-21 14:32:47 -05:00
Nate Jensen
811a0c43cd Omaha #4509 added python time and dataaccess folders to include path
Change-Id: I377d742761e5043b240579ebcfb9a77b2a7118df

Former-commit-id: 846925e473072e6f5b9dcbfd2355e64c40627c4b
2015-05-20 18:19:34 -05:00
Steve Harris
9b3d8a8443 Merge tag 'OB_15.1.1-12' into omaha_16.1.1
15.1.1-12

 Conflicts:
	build/deploy.edex.awips2/esb/bin/setup.env
	cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.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


Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
2015-05-20 11:25:45 -05:00
Ron Anderson
a0a689c99d Omaha #4027 Fix case of a couple of expected results
Change-Id: I066521c707d5b3f540d3d232f450a2a082e8180d

Former-commit-id: 52343f35781f39a9ad63a72d5f709d3d93a0279f
2015-05-20 08:29:02 -05:00
Steve Harris
8ab4f18b0d Merge tag 'OB_15.1.1-12' into omaha_15.1.1
15.1.1-12


Former-commit-id: 31ae0154fe4ad36aefb84f0210ce72172a31a9c2
2015-05-19 17:00:31 -05:00
Ben Steffensmeier
bf1c165307 Omaha #4079 Move gridded image displays into core grid plugin.
Former-commit-id: 2bb93741be4be6559c4aad7027dc1935ebe264b4
2015-05-19 10:46:28 -05:00
David Lovely
80dc4c85d9 Omaha #4146 Bundled class files in a jar when unpacked.
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02

Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
2015-05-19 10:23:35 -05:00
Ben Steffensmeier
72d601a2a7 Omaha #4079 Extract core grid and point rendering capabilities.
Former-commit-id: a0caefe923b18859fd89cb36749b31e3b24eecbe
2015-05-15 13:55:10 -05:00
Ron Anderson
1fb20ebfb6 Omaha #4027 Fix Hazard_AQA formatter
Change-Id: I0ac47efce8c3023f1ddbcaefc1bcb7538cca5224

Former-commit-id: 56020a1ae788746f4a40c43d8478334a171706af
2015-05-14 17:44:14 -05:00
Ron Anderson
163ddea34e Omaha #4027 Changes to match draft mixed case guidelines from Phase I
Change-Id: I2af2a2742f99c8a97976cafd451057b7e7137efe

Former-commit-id: b9d9063e56939b558eee3f64b65ddc28f6478c38
2015-05-14 14:58:07 -05:00
Fay.Liang
8cce7a082c Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
Former-commit-id: fb0b41ff7b119e80d81e028bd8a768d6df335cf3
2015-05-13 15:11:13 -04:00
Shawn.Hooper
003c528458 ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39

Former-commit-id: 721a43ed8a1c9fdd1e5c62827869a91a20bfb416
2015-05-12 11:30:23 -04:00
Ana Rivera
153619e7ff VLab Issue #8116 - Modify WCOSS NWPS Run scripts to support a 3rd option; fixes; #8116
Change-Id: Icafd7505b59dc0bf3673c655ceff93c3fefb5176

Former-commit-id: a64386381a2543f3a01e418abc0ec36cc317fbeb
2015-05-11 18:07:25 +00:00
Ana Rivera
05090b3d96 Merge branch 'master_14.4.1'(OB_14.4.1-36) into emc_14.4.1
Change-Id: Ie153b2a36947fa999b47cde069c1915e371c3f98

Former-commit-id: 5abb5644ef50d32fe131941ea46c70f371ed9a3b
2015-05-11 16:55:58 +00:00
Fay.Liang
af1448c5d0 Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 3fa21300bc62a687cd076b709e4df8f8bf508edc
2015-05-10 00:16:32 -04:00
Ana Rivera
565fbb949c VLab Issue #8081 - Baseline NWPS Weather Element groups; fixes #8081
Change-Id: I901d43e6474cb659407b6bcf1e1798c7de2dc341

Former-commit-id: 5e749f9f2b1bddbb57d1e61d0211982db90656cd
2015-05-08 14:42:40 +00:00
Ron Anderson
6adb5f6dbc Omaha #4027 Get GFE Formatter auto tests working with mixed case
Change-Id: I55c2b34adca1c049116682be5ff40509729e16c0

Former-commit-id: c214e6cc22140b53ac8bd5514913b63a0850867a
2015-05-07 14:41:49 -05:00