Fay.Liang
8f3b4cb35a
Merge tag 'OB_14.3.3-2' into master_14.4.1
...
14.3.3-2
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
Former-commit-id: 618781f10cc8962caee7
2015-04-06 15:40:31 -04:00
Rici.Yu
466b38d20d
ASM #17194 - convert SerpConfig.py from smart tool to utility
...
Change-Id: I8007ca1676de148aa42c5b15c8e3366bbe8c8e5d
Former-commit-id: 0492e66d87d47caf2552
2015-04-02 10:48:25 -04:00
Fay.Liang
af80d5b682
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 53bdc83ba4f2e952b71a
2015-03-19 17:18:52 -04:00
Paul Grell
2d17527faa
Merge "Revert "Revert "ASM #17217 - GFE: default to smart formatter types""" into asm_14.4.1
...
Former-commit-id: f47e4fdcff81c34481c1
2015-03-19 16:05:49 -05:00
Paul Grell
b36de51998
Revert "Revert "ASM #17217 - GFE: default to smart formatter types""
...
This reverts commit f31cdc69252495ce971fb1d84d29643b71d3694507491fe499
2015-03-19 16:02:22 -05:00
Fay.Liang
228e85dcb9
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 475019fb610284b3b7e9
2015-03-18 15:12:56 -04:00
Paul Grell
d0daa26bdb
Merge "Revert "ASM #17217 - GFE: default to smart formatter types"" into asm_14.4.1
...
Former-commit-id: 4b1cec4b99b28a5d5350
2015-03-18 10:44:10 -05:00
Paul Grell
f31cdc6925
Revert "ASM #17217 - GFE: default to smart formatter types"
...
This reverts commit d5ca25bb18dc489dabe270e5e24941b1d84d29642495ce971f
2015-03-18 09:36:12 -05:00
Rici.Yu
26ae2cded5
ASM #17217 - Add fullStationID entry for table products
...
Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847
Former-commit-id: 6a7fbec94272af59fcb6
2015-03-18 10:30:38 -04:00
Rici.Yu
d5ca25bb18
ASM #17217 - GFE: default to smart formatter types
...
Change-Id: Ib831998a7293e61a5b606d03ef19f47b09f2e0d5
Former-commit-id: 70e5e24941dc489dabe2
2015-03-17 11:26:37 -04:00
Fay.Liang
a9945f1981
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: 0e475cb704059eb032b1
2015-03-09 16:11:13 -04:00
Shawn.Hooper
a9a2bddc61
ASM #17178 - Update TCMWindTool to remove option for background Wind field
...
Change-Id: Ia299900784b9fe05a68ca25a74528abdc68a3f1f
Former-commit-id: 54d5553a93c0b675033a
2015-03-05 12:58:44 -05:00
Fay.Liang
07c0347c3e
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 1ed5d493faf00b3d3156
2015-03-03 14:44:31 -05:00
Fay.Liang
97be252793
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: 9a4751b60e8bfe8fb65f
2015-03-03 14:26:22 -05:00
Ana Rivera
f77e0ff965
Merge "VLab Issue #6517 - TCMWindTool Fix; fixes #6517 " into tcv_14.3.2
...
Former-commit-id: 5c19f14f0e9fb3b29048
2015-03-02 22:19:14 +00:00
Ron Anderson
9203b33ee6
Omaha #4126 Ensure transmit is properly cancelled if dialog is closed
...
Change-Id: I259089abc4f4c9ce5cdfb80892273f7c0dd1ec65
Former-commit-id: ce87addfe4a4fea90f17
2015-02-27 12:29:22 -06:00
Sarah Pontius
cda75a856f
VLab Issue #6517 - TCMWindTool Fix; fixes #6517
...
Change-Id: I986c425ecc57ab919f2b43ec6b1c4438e789cd86
Former-commit-id: 054762876e8463da45e6
2015-02-25 13:51:44 -07:00
Ron Anderson
34bc29be41
Issue #4099 Fix ETNs for products that span year-end.
...
(cherry picked from commit c7a8c9b049ae8d73ffb61765f31374e01d1d2a33)
Former-commit-id: ebb221d935e19901c6e1
2015-02-24 12:09:29 -06:00
Ana Rivera
2525e00fb2
VLab Issue #6566 - HTI: Update six scripts and one image; fixes #6566
...
Change-Id: I49052579740e22c54c0307d3787d9656bdf30bb5
Former-commit-id: d828b762ecccc338d7da
2015-02-23 17:28:29 +00:00
Fay.Liang
57d91a0794
Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
...
Former-commit-id: e0917a9f3fd15246d073
2015-02-19 16:40:21 -05:00
Rici.Yu
13f179588f
ASM #17120 - retrieve practice products in non-operational mode
...
Change-Id: I2b76edaface7d185269e6e5ea5f032eeb3d4dab0
Former-commit-id: cc44f78fcfe62413c10b
2015-02-19 10:48:19 -05:00
Sarah Pontius
d9ffd6a710
VLab Issue #6386 - HLS/TCV Beta Testing Changes; fixes #6386
...
Change-Id: Ica6e803b85c34e6d65fd268b844eaac06417909e
Former-commit-id: e4a1aa13f5564febcc4a
2015-02-13 10:12:53 -07:00
Steve Harris
e76330fac0
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
...
14.4.1-10
Former-commit-id: 9311e6f4403fe3d35339
2015-02-11 15:53:38 -06:00
Fay.Liang
e3107ce1e4
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: 43c7161dcf59f3f87190
2015-02-09 17:19:41 -05:00
Nate Jensen
ac02fc3a81
Omaha #4089 harden safety of numpy dtypes in gfe arrays
...
Change-Id: Ic77b459bc4d68930418ad66680ee86069c540c1f
Former-commit-id: ea273e14bfb42dec0e4a
2015-02-05 18:03:47 -06:00
Rici.Yu
0a489fea9c
ASM #17039 - Remove HighlightFramingCodes feature
...
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: 1188dab0f45470139b42
2015-02-04 10:23:30 -05:00
Ron Anderson
8c6c42fe43
Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
...
Former-commit-id: 933590f36af280c0ab2e
2015-02-02 15:04:51 -06:00
Ron Anderson
67443be919
Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
...
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2
Former-commit-id: 346ea417eabdc365d9c9
2015-02-02 11:26:59 -06:00
Steve Harris
1cce5ed9ef
Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
...
14.4.1-5
Former-commit-id: bc3f196d489927bac8ed
2015-01-28 12:57:55 -06:00
Ron Anderson
a7ab638203
Omaha #4018 Formatted all formatter launcher code to make later code reviews easier
...
Change-Id: Iaf415b8bdd3e8fdc46b8ea66e066b9c2ce3b6f7a
Former-commit-id: 8a86832fb25c08543da0
2015-01-27 13:43:44 -06:00
Ana Rivera
f565ef4315
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
...
Former-commit-id: dee10b3f6f171a38175c
2015-01-26 19:04:54 +00:00
Ana Rivera
654d08a588
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: 7c25945fd998ac97e397
2015-01-26 18:45:26 +00:00
Ana Rivera
de1b989253
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
...
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 44fa40c0cc705f02f2be
2015-01-23 14:21:22 +00:00
Fay.Liang
6b77894bd0
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: eed6737801c6bd5d7675
2015-01-12 13:03:31 -05:00
Sarah Pontius
3225a94aef
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
...
Change-Id: I248822f54d31eb5e0a7312171acf1d59dde7c73d
Former-commit-id: 1159e8487cc31b766be6
2015-01-09 15:13:45 -07:00
Rici.Yu
eaf241a60a
ASM #14946 - GFE: ZFP displaying time for office timezone for zones in different timezone
...
Change-Id: I082b26ffea4b228baf4f40afb019994d5fe1e7dd
Former-commit-id: 5b5d6fd5cdcd7212c689
2014-12-16 15:34:35 -05:00
Sarah Pontius
6a09b38c03
VLab Issue #5682 - HLS/TCV SwIT Changes; fixes #5682
...
Former-commit-id: 734cc8a4410bd53be339
2014-12-16 09:06:59 -07:00
Sarah Pontius
06ac198594
VLab Issue #5674 - HLS/TCV Code Cleanup; fixes #5674
...
Change-Id: If31b2979fb741f0e258ae0e3a1323981826b3158
Former-commit-id: 9b8bdc88d5ff2a0aa1b1
2014-12-15 09:54:17 -07:00
Ron Anderson
b484070ec5
VLab Issue #4953 Added support for nwrwavestcv and sending TCV files to VTEC partners
...
Change-Id: I2af1f2eaf0625ea58153ebebc1ad10bb76da52bd
Former-commit-id: 2c99ce902aeaa74da50f
2014-12-12 17:25:52 -06:00
Richard Peter
23eafaba3d
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: 8de1ebcb652457d0e6f7
2014-12-12 10:36:04 -06:00
Juliya Dynina
790b5a47f2
Merge "ASM #638 - Inconsistent Type for scale widget value accessed through the varDict." into asm_14.4.1
...
Former-commit-id: a62ee436c2ecaaa1f9fd
2014-12-12 11:05:02 -05:00
Michael Gamazaychikov
6123ee67c1
ASM #638 - Inconsistent Type for scale widget value accessed through the varDict.
...
Change-Id: If81102e5a3b70e224f88a351277e9c29e9f9cc91
Former-commit-id: 40f0e77f3094f06ccbc9
2014-12-11 19:37:00 -05:00
Steve Harris
eb980ff3ba
Merge tag 'OB_14.3.2-8m' into tcv_14.3.2
...
Former-commit-id: 6d47b052c11203bcc18c
2014-12-11 10:43:57 -06:00
Sarah Pontius
91dd50792f
VLab Issue #5595 - HLS/TCV remaining task work and bug fix for 14.3.2 SwIT; fixes #5595
...
Change-Id: I872c55de264205ee60c369802075b32b5753fe5d
Former-commit-id: a12b79c69c1ed6581ceb
2014-12-09 12:49:45 -07:00
Ron Anderson
c4d27803cc
Merge "Omaha #3885 : Merge VTEC route and request changes from VLab." into omaha_14.4.1
...
Former-commit-id: e0b9900a50d7e0d21d27
2014-12-04 15:44:46 -06:00
Fay.Liang
6e9ff9e139
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: f5095bed4e028d6bdc33
2014-12-04 13:47:03 -05:00
Fay.Liang
f327b9dd5a
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 19194e0aa383a4987188
2014-12-04 13:46:31 -05:00
Ron Anderson
fd25fe9efc
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: 2417d5a2a75169e7181f
2014-12-04 10:01:18 -06:00
Bruce.Hundermark
c4ca149d67
ASM #645 - GFE: CarSnowAmt smart tool can return incorrect amount
...
Change-Id: I8aea3ab2ccfec7e411e605ddfdfeef0a823687c2
Former-commit-id: c11898f30a6f73b491f8
2014-12-04 15:56:01 +00:00
Sarah Pontius
2b37fe2994
VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
...
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565
Former-commit-id: 5d696b412d171a802190
2014-12-03 11:19:06 -07:00
