Fay.Liang
475019fb61
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e
2015-03-18 15:12:56 -04:00
Paul Grell
4b1cec4b99
Merge "Revert "ASM #17217 - GFE: default to smart formatter types"" into asm_14.4.1
...
Former-commit-id: 4601ad77a9e49efaf34d4563baddcdf61dbd5804
2015-03-18 10:44:10 -05:00
Paul Grell
b1d84d2964
Revert "ASM #17217 - GFE: default to smart formatter types"
...
This reverts commit 70e5e24941
2015-03-18 09:36:12 -05:00
Rici.Yu
6a7fbec942
ASM #17217 - Add fullStationID entry for table products
...
Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847
Former-commit-id: a987fe4493e4e58618271fffb37a708185ed4139
2015-03-18 10:30:38 -04:00
Rici.Yu
70e5e24941
ASM #17217 - GFE: default to smart formatter types
...
Change-Id: Ib831998a7293e61a5b606d03ef19f47b09f2e0d5
Former-commit-id: 81aea3167f21670d7b41eec5458a1f7d36edb36a
2015-03-17 11:26:37 -04:00
Fay.Liang
0e475cb704
Merge tag 'OB_14.3.2-19m' into master_14.4.1
...
14.3.2-19m
Conflicts:
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
2015-03-09 16:11:13 -04:00
Shawn.Hooper
54d5553a93
ASM #17178 - Update TCMWindTool to remove option for background Wind field
...
Change-Id: Ia299900784b9fe05a68ca25a74528abdc68a3f1f
Former-commit-id: bc4ec070e81298f7ed7312692a7f43cbd2d854ec
2015-03-05 12:58:44 -05:00
Fay.Liang
1ed5d493fa
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: c91a37257cd2882047e79200f624acc1e0312cba
2015-03-03 14:44:31 -05:00
Fay.Liang
9a4751b60e
Merge branch 'master_14.3.1.1' into master_14.3.2
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 5aa2c444583d03b442768a8e9ea462877a25bb8d
2015-03-03 14:26:22 -05:00
Ana Rivera
5c19f14f0e
Merge "VLab Issue #6517 - TCMWindTool Fix; fixes #6517 " into tcv_14.3.2
...
Former-commit-id: 7746c8ce24f444d0d9b480e756d092b482e7428a
2015-03-02 22:19:14 +00:00
Ron Anderson
ce87addfe4
Omaha #4126 Ensure transmit is properly cancelled if dialog is closed
...
Change-Id: I259089abc4f4c9ce5cdfb80892273f7c0dd1ec65
Former-commit-id: 781b6d4f32ec8e9d34d746db72aebab4d4153c56
2015-02-27 12:29:22 -06:00
Sarah Pontius
054762876e
VLab Issue #6517 - TCMWindTool Fix; fixes #6517
...
Change-Id: I986c425ecc57ab919f2b43ec6b1c4438e789cd86
Former-commit-id: 427c442c31ba87f6c20bdfe17abedceb90fb2e7a
2015-02-25 13:51:44 -07:00
Ron Anderson
ebb221d935
Issue #4099 Fix ETNs for products that span year-end.
...
(cherry picked from commit c7a8c9b049ae8d73ffb61765f31374e01d1d2a33)
Former-commit-id: 7ca4dd9ba059035e366807d4928768121fdd0712
2015-02-24 12:09:29 -06:00
Ana Rivera
d828b762ec
VLab Issue #6566 - HTI: Update six scripts and one image; fixes #6566
...
Change-Id: I49052579740e22c54c0307d3787d9656bdf30bb5
Former-commit-id: 2f9dd9b8422b899146f73da0a3d922b32b021152
2015-02-23 17:28:29 +00:00
Fay.Liang
e0917a9f3f
Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
...
Former-commit-id: 10cc507489cc2ac649242ddfbe9791aee59c8890
2015-02-19 16:40:21 -05:00
Rici.Yu
cc44f78fcf
ASM #17120 - retrieve practice products in non-operational mode
...
Change-Id: I2b76edaface7d185269e6e5ea5f032eeb3d4dab0
Former-commit-id: 16dccf94319fbb3a617cc5e2360d0b0aa1c9cc9c
2015-02-19 10:48:19 -05:00
Sarah Pontius
e4a1aa13f5
VLab Issue #6386 - HLS/TCV Beta Testing Changes; fixes #6386
...
Change-Id: Ica6e803b85c34e6d65fd268b844eaac06417909e
Former-commit-id: 5fbb83dd042795e308ca8b6aa370e4f9b0fb3291
2015-02-13 10:12:53 -07:00
Steve Harris
9311e6f440
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
...
14.4.1-10
Former-commit-id: 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2
2015-02-11 15:53:38 -06:00
Fay.Liang
43c7161dcf
Merge branch 'master_14.3.2' into master_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
2015-02-09 17:19:41 -05:00
Nate Jensen
ea273e14bf
Omaha #4089 harden safety of numpy dtypes in gfe arrays
...
Change-Id: Ic77b459bc4d68930418ad66680ee86069c540c1f
Former-commit-id: ed77ff564520c8f6ad157dd115d37d69cbfab660
2015-02-05 18:03:47 -06:00
Rici.Yu
1188dab0f4
ASM #17039 - Remove HighlightFramingCodes feature
...
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: cb047745b4a5c523bd1ca26692c758d3e72d8ddc
2015-02-04 10:23:30 -05:00
Ron Anderson
933590f36a
Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
...
Former-commit-id: 170e3149e6cf9feb7a8ab0e2ac3ed0826b9f7b6c
2015-02-02 15:04:51 -06:00
Ron Anderson
346ea417ea
Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
...
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2
Former-commit-id: 9d2f64b08acbec0567c7f29871480827ff0f6de7
2015-02-02 11:26:59 -06:00
Steve Harris
bc3f196d48
Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
...
14.4.1-5
Former-commit-id: 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021
2015-01-28 12:57:55 -06:00
Ron Anderson
8a86832fb2
Omaha #4018 Formatted all formatter launcher code to make later code reviews easier
...
Change-Id: Iaf415b8bdd3e8fdc46b8ea66e066b9c2ce3b6f7a
Former-commit-id: 99ae51d268e784461c0686a9d86d512049a501ac
2015-01-27 13:43:44 -06:00
Ana Rivera
dee10b3f6f
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
...
Former-commit-id: 6c72e1864ad5843c4ac42a558b589777af047c77
2015-01-26 19:04:54 +00:00
Ana Rivera
7c25945fd9
Merge branch 'master_14.4.1' into emc_14.4.1
...
Conflicts:
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
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
2015-01-26 18:45:26 +00:00
Ana Rivera
44fa40c0cc
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
...
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 653472d785f4af6fef8f2edd93c2e538806096ab
2015-01-23 14:21:22 +00:00
Fay.Liang
eed6737801
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
...
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Sarah Pontius
1159e8487c
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
...
Change-Id: I248822f54d31eb5e0a7312171acf1d59dde7c73d
Former-commit-id: 9cf4ca3c746accf745172bd7dc85e851da95ab6f
2015-01-09 15:13:45 -07:00
Rici.Yu
5b5d6fd5cd
ASM #14946 - GFE: ZFP displaying time for office timezone for zones in different timezone
...
Change-Id: I082b26ffea4b228baf4f40afb019994d5fe1e7dd
Former-commit-id: 18ab87670fbdd007e5027553d4ee58262ae54f22
2014-12-16 15:34:35 -05:00
Sarah Pontius
734cc8a441
VLab Issue #5682 - HLS/TCV SwIT Changes; fixes #5682
...
Former-commit-id: b5a49fa57d2168e4680b0329b99733e35381eeb9
2014-12-16 09:06:59 -07:00
Sarah Pontius
9b8bdc88d5
VLab Issue #5674 - HLS/TCV Code Cleanup; fixes #5674
...
Change-Id: If31b2979fb741f0e258ae0e3a1323981826b3158
Former-commit-id: c044f5c349b27be19c6a3ea2abcc3c2294fc07a3
2014-12-15 09:54:17 -07:00
Ron Anderson
2c99ce902a
VLab Issue #4953 Added support for nwrwavestcv and sending TCV files to VTEC partners
...
Change-Id: I2af1f2eaf0625ea58153ebebc1ad10bb76da52bd
Former-commit-id: 18ab45bdae51ae9971a0c5f4b4bde7afe82074d4
2014-12-12 17:25:52 -06:00
Richard Peter
8de1ebcb65
Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.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/textproducts/Generator.py
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java
Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5
Former-commit-id: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
2014-12-12 10:36:04 -06:00
Juliya Dynina
a62ee436c2
Merge "ASM #638 - Inconsistent Type for scale widget value accessed through the varDict." into asm_14.4.1
...
Former-commit-id: 63036a13a555c9a1e7fab05dd48a369221fc27b9
2014-12-12 11:05:02 -05:00
Michael Gamazaychikov
40f0e77f30
ASM #638 - Inconsistent Type for scale widget value accessed through the varDict.
...
Change-Id: If81102e5a3b70e224f88a351277e9c29e9f9cc91
Former-commit-id: 3c1ce33424799b39db14f909d8de2946e5aca1bc
2014-12-11 19:37:00 -05:00
Steve Harris
6d47b052c1
Merge tag 'OB_14.3.2-8m' into tcv_14.3.2
...
Former-commit-id: 4d97e95a23e55e064a654fda3d05901043158d7a
2014-12-11 10:43:57 -06:00
Sarah Pontius
a12b79c69c
VLab Issue #5595 - HLS/TCV remaining task work and bug fix for 14.3.2 SwIT; fixes #5595
...
Change-Id: I872c55de264205ee60c369802075b32b5753fe5d
Former-commit-id: f7aeeb643ec6302e5af82838992f68ecf48ce702
2014-12-09 12:49:45 -07:00
Ron Anderson
e0b9900a50
Merge "Omaha #3885 : Merge VTEC route and request changes from VLab." into omaha_14.4.1
...
Former-commit-id: 401356d7917aaf84c5ea5c8f92ca32c270d5790a
2014-12-04 15:44:46 -06:00
Fay.Liang
f5095bed4e
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963
2014-12-04 13:47:03 -05:00
Fay.Liang
19194e0aa3
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 1fcac564095b86cd4c6103a6484b25bbff2339b2
2014-12-04 13:46:31 -05:00
Ron Anderson
2417d5a2a7
Omaha #3885 : Merge VTEC route and request changes from VLab.
...
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9
Former-commit-id: 16e32018de233fb128a7518415b84e032074932f
2014-12-04 10:01:18 -06:00
Bruce.Hundermark
c11898f30a
ASM #645 - GFE: CarSnowAmt smart tool can return incorrect amount
...
Change-Id: I8aea3ab2ccfec7e411e605ddfdfeef0a823687c2
Former-commit-id: 25f4c8acdd8975d3001528212cbc7617cfd39500
2014-12-04 15:56:01 +00:00
Sarah Pontius
5d696b412d
VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
...
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565
Former-commit-id: 24c01f47449607347812e0e676f1d14849d3b47e
2014-12-03 11:19:06 -07:00
Rici.Yu
21e3e584b3
ASM #625 - modify checkGroup() to display models in multiple columns if needed
...
Change-Id: I94c5400d21b10b57cf08f4767a5160bfcc554eb9
Former-commit-id: 07c826efbcfe30dc3fc178601e550a6dbd31eb0b
2014-12-02 17:05:56 -05:00
Ron Anderson
ebeb4440ef
Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time.
...
Change-Id: I8e6f79bf6b7754924480a39f1631ba10a12bdcae
Former-commit-id: e656ec3ccf20ae4a9eae23040e1a08d7032ee42a
2014-12-02 11:45:05 -06:00
Ana Rivera
fe5bfbaa73
VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
...
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f
Former-commit-id: 6866439b0a7075f04146af4b4bdce59477269f4d
2014-12-02 15:44:07 +00:00
Ana Rivera
5abf37ea62
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
...
This reverts commit f1f5f2c717
2014-12-02 13:43:03 +00:00
Zhidong.Hao
58a27aeb75
ASM #624 GFE: default file save directory different from AWIPS 1
...
Change-Id: I71a9cc3f284ce1c05c3729afc4444362bd0ccd28
Former-commit-id: e6d7e8b2bec9c7cebdf25618897443cff909879d
2014-12-01 14:39:07 -05:00
