Commit graph

498 commits

Author SHA1 Message Date
Shawn.Hooper
03fd6d11c5 Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 314a8497f8 [formerly 314a8497f8 [formerly 60d478ab66ac20c8434b9eb9e4d9f029390f0ba6]]
Former-commit-id: 37c89530a6
Former-commit-id: c012f464c9
2015-01-22 16:05:52 -05:00
Stephen Gilbert
c2c4a4592b VLab Issue #4078 - Add project gov.noaa.nws.ncep.viz.rtkp.
It was lost in last merge from ncep_14.2.2-n branch.

Change-Id: Ica2fcdcbc7fea944fbaca26a4c916a9d22e216d4

Former-commit-id: 31c1388d7b [formerly 31c1388d7b [formerly 65f44141c0855411255e69dd7c7bfd11c7ff74b6]]
Former-commit-id: 53eac04e52
Former-commit-id: 983891787d
2014-12-30 13:44:32 -05:00
Stephen Gilbert
8c075a5640 VLab Issue #5749 - Removed uEngine and PDO dependencies
Change-Id: I3368b5cb82b6782e3934b37c5175c9e936768815

Former-commit-id: 1cc30e4a12 [formerly 1cc30e4a12 [formerly 097f9f63433b71433f4c5503ca6a80fb8fd6a4a6]]
Former-commit-id: 79d5a192bf
Former-commit-id: 1e0869c0d7
2014-12-30 13:28:32 -05:00
Bingfan Yin
f816768786 VLab Issue #5749 - Removed try/catch for ContinuingWatch when querying database.
Change-Id: I73e4644f810c0d649a7bed61135989a9c15c1981

Former-commit-id: 3f38e3c88d [formerly 3f38e3c88d [formerly 75971fafd69e6a19a9cfd120d1a70f76f3c5fee1]]
Former-commit-id: e42212a7e0
Former-commit-id: a6671c0b47
2014-12-22 14:05:07 -05:00
Bingfan Yin
c04f056c69 VLab Issue #5749 - Replace uE with Thrift Client for ScriptCreator. Added target release.
commit 70b126baaf27a245771db06f716b0dd9e5486de1
Author: Bingfan Yin <Bingfan.Yin@noaa.gov>
Date:   Mon Dec 22 08:05:32 2014 -0500

    Replaced ScriptCreator with ThriftClient.

Change-Id: Id6c9d2f2162e71fffc06a33d95cb38058740170a

Former-commit-id: 70d2508f38 [formerly 70d2508f38 [formerly 68191b07db819d43cfd57cd7091afe1a6447ecf2]]
Former-commit-id: ee78f3c66c
Former-commit-id: cfed26e6f3
2014-12-22 10:51:09 -05:00
Bradley.Mabe
196be14989 Merge branch 'omaha_14.4.1' into ncep_14.4.1
Former-commit-id: 858bacc6ca [formerly 858bacc6ca [formerly 339e27276d6332393dabd6f94b9ea63508b87b65]]
Former-commit-id: 752d081ba6
Former-commit-id: 2eb85efac3
2014-12-18 13:15:43 -05:00
Stephen Gilbert
b6b587a86f Merge branch 'ncep_14.2.2-n' into ncep_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK1minDao.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK3hrDao.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/dao/NcUairToRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
	ncep/gov.noaa.nws.ncep.viz.gempak/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.gempak/src/gov/noaa/nws/ncep/viz/gempak/util/GempakGrid.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotImageCreator.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
	tests/.classpath

Former-commit-id: 33c9f191b4 [formerly 33c9f191b4 [formerly 09ae4e1dc5063df9f94d802f2630632d4c856fff]]
Former-commit-id: 0911e5a4ef
Former-commit-id: 93d92085ec
2014-12-16 13:06:21 -05:00
Richard Peter
bf3ddbb62b 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: 2457d0e6f7 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]
Former-commit-id: 8de1ebcb65
Former-commit-id: f7d8755ba9
2014-12-12 10:36:04 -06:00
Nate Jensen
59f8e0233e Omaha #3549 remove jdt prefs for faster builds
Change-Id: I3dc9ba8622a9312b29fb052ac0c95e87d808f9ec

Former-commit-id: a8cfb57aef [formerly a8cfb57aef [formerly 355f20818dc20b86de630e29cb18647c5878f118]]
Former-commit-id: 19cfdd12f4
Former-commit-id: 1bf02a52ae
2014-12-03 18:00:03 -06:00
Stephen Gilbert
645f0b89b0 VLab Issue #4003 - CAVE/NCP configuration updates
Change-Id: I086b4e01fcc9b61c4e4feeb56f425b74a2afe644

Former-commit-id: b179727acd [formerly b179727acd [formerly 6d03912fc5ebeb8cc32d7387065491f69349e63e]]
Former-commit-id: 946613d8ee
Former-commit-id: e7c0e58ab7
2014-12-01 17:23:08 -05:00
Stephen Gilbert
acb128eb72 VLab Issue #4003 - Mostly PGEN bug fixes
minor updates to nsharp, lat/lon overlay, ntrans, and plotdata resource

Change-Id: I2a1718ed7674edb786bceec13bcb20c29cc5d616

Former-commit-id: d9b57e6c7a [formerly d9b57e6c7a [formerly 8bdc663629050457b23d06c19bd7a925597c1288]]
Former-commit-id: 57393984d3
Former-commit-id: dc922d5112
2014-12-01 17:17:39 -05:00
Stephen Gilbert
dbf2f42af1 VLab Issue #4001 - Fix Ncuair decoder for dropsondes
Change-Id: I88646f0d3f981e8b5c1902362636f48e130c8dd3

Former-commit-id: 034f028db0 [formerly 034f028db0 [formerly 929b1977b350abc7f271ee7cd3ee8e65be4efe85]]
Former-commit-id: f87cc6e7fb
Former-commit-id: 70f60dc8b9
2014-12-01 16:06:41 -05:00
Stephen Gilbert
82c1af1da1 VLab Issue #5156 - Change Text display in NCP Point Data station model
Change-Id: Ib33c90ac5d113ade34f3c25822685220771c570e

Former-commit-id: d539f7092d [formerly d539f7092d [formerly b130dce1753c3ff691405e2edafcded8a511df59]]
Former-commit-id: d38edc9cf6
Former-commit-id: 4d0a203b4f
2014-11-25 10:59:01 -05:00
Stephen Gilbert
3adfb23074 VLab Issue #4078 - Adding RD for Day/Night Terminator Overlay
Change-Id: I2859c9193b69a6cab19256e93a59541a7c4f4e9f

Former-commit-id: c8f2b8e3bf [formerly c8f2b8e3bf [formerly 713f097be6a0ced7a0b4e5fa45e12083be8faeec]]
Former-commit-id: 54e40962af
Former-commit-id: 35a6d9ae6b
2014-11-21 10:34:29 -05:00
Stephen Gilbert
d19283fc08 VLab Issue #5398 - Fixing improper formatting of SIGMETs
This commit fixes #5398 and refs #4926

Change-Id: I64987bedec9013b9944b88bfd08bc9453cdae632

Former-commit-id: 633a2dee6f [formerly 633a2dee6f [formerly d128530f757eaaa2573c7466c9e4d09fe149289f]]
Former-commit-id: 585e5bae27
Former-commit-id: a088743a1e
2014-11-21 10:29:23 -05:00
Stephen Gilbert
2d2ded41d3 VLab Issue #4865 - MISC/ASCT latest Data string appears incorrectly
This commit fixes #4865; refs #4864

Change-Id: I024a86831425f7eae776a00b9d6cf07993e74932

Former-commit-id: b53bb2c40e [formerly b53bb2c40e [formerly 9559830d4cbcf9e77cb269403c4ac6cca8a88796]]
Former-commit-id: 8156498dda
Former-commit-id: 717629242f
2014-11-21 08:28:21 -05:00
Stephen Gilbert
63d586723b VLab Issue #4864 - Change ASCAT colorbar orientation; fixes #4864
Change-Id: I46aab7514c7fcccdbe77f5f0df0ad28402e7ab47

Former-commit-id: b2067ead8a [formerly b2067ead8a [formerly 2c48ff66fb6819af157046c4b39e5745bbe8f12b]]
Former-commit-id: 6309e62c8f
Former-commit-id: 0973fbc1e3
2014-11-19 12:15:23 -05:00
Stephen Gilbert
45cbb5c461 VLab Issue #4867 - UAIR display performance improvement
Change-Id: I2065da34f46cf396bbc167822d79aef53092aaa4

Former-commit-id: 3714f23401 [formerly 3714f23401 [formerly 7b372387492fb00f91956d83ab03a702cbc407b7]]
Former-commit-id: d0545c54c1
Former-commit-id: 490f2c7a41
2014-11-17 14:46:10 -05:00
Stephen Gilbert
a00b252fff VLab Issue #4637 - Display label changes for WCN resource
Change-Id: Ied1c62b307d9502a1fc2b4726e4bc3d39eb36758

Former-commit-id: 1e8f88310f [formerly 1e8f88310f [formerly d1e182b6701a567fcbb90a718d6c9f529c725edc]]
Former-commit-id: 7b2af4a4fc
Former-commit-id: 19fd65f99d
2014-11-17 14:40:27 -05:00
David Lovely
1953ee8470 Issue #3804 BigNsharp Binary DLL
Change-Id: Iaed7d84aeee537d884aa89942b6d0f14bb0a119d

Former-commit-id: e8a2331f46 [formerly e8a2331f46 [formerly 1e0d00304e70b89b9b2a9de96753aeebde32bb19]]
Former-commit-id: bfcc4cf523
Former-commit-id: d45c3f310d
2014-11-17 12:40:13 -06:00
Steve Harris
627ebd7dbf Merge tag 'OB_14.3.1-29m' into omaha_14.4.1
Former-commit-id: 0322884798 [formerly 0322884798 [formerly e5cd617f80e90dcfba52058b2a439fade1cfe15e]]
Former-commit-id: 0f40604bcb
Former-commit-id: 0d2cbbfe4a
2014-10-29 10:03:20 -05:00
Stephen Gilbert
6847f15b25 VLab Issue #5064 - Compare and Edit functions not working in SHARP(D2D);
fixes #5064

Change-Id: I3c9bf22b767dbc67fa70291989c694d39945d112

Former-commit-id: c94b2187f6 [formerly c94b2187f6 [formerly ee20131811fba389f001870d3274b32adfee3f28]]
Former-commit-id: 302779155f
Former-commit-id: db0806d9a4
2014-10-23 12:36:30 -04:00
Stephen Gilbert
0a03032bbe VLab Issue #5063 - NSHARP(D2D) does not load using Volume Browser; fixes
#5063

Change-Id: Idd83363e5235868939c2251239264eb73863efb7

Former-commit-id: 97bd608624 [formerly 97bd608624 [formerly b59616510517bf52d23edaf055e9d4a53b26e2dc]]
Former-commit-id: 5e1e9f6f58
Former-commit-id: 604d44817f
2014-10-23 12:33:50 -04:00
Benjamin Phillippe
3808c125b9 Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: 7845e8e40f [formerly 7845e8e40f [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]
Former-commit-id: fdd16051e8
Former-commit-id: 5eec33b078
2014-10-20 12:42:19 -05:00
Stephen Gilbert
5653213651 VLab Issue #4318 - Add a new plot parameter SGHT
Change-Id: Iaf51f6298b35b731193f89693d19043380906fea

Former-commit-id: a77b622605 [formerly a77b622605 [formerly 9029d63f0a2d10f61780d94e3f83433ebdb113c9]]
Former-commit-id: d4636d84e5
Former-commit-id: 1fa4e7be5f
2014-10-16 14:58:03 -04:00
Stephen Gilbert
09a6987e58 VLab Issue #4230 - Fix wind barb/brbk menu option in plot model dialog
Change-Id: I6c1c8a10385ab531bc4b00049a5e31c21f42ba2a

Former-commit-id: 064288886f [formerly 064288886f [formerly 14a48cc8077d1c0b2302d53a01839d7adbb533a2]]
Former-commit-id: 909a8d7342
Former-commit-id: 796e9e1901
2014-10-10 10:06:33 -04:00
Stephen Gilbert
f7516386a8 VLab Issue #4078 - Initial check in for Real Time Kp Monitor
Change-Id: I00ec615c17cb0f1de9ee156781b285ff069758ba

Former-commit-id: ea95039dbe [formerly ea95039dbe [formerly 3fe7fad9e949f70c31b709084d2ff1c4dd34435c]]
Former-commit-id: 9c531b20ec
Former-commit-id: 43c5278a4b
2014-10-10 08:58:46 -04:00
Brian Clements
8ec3f473d7 Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f

Former-commit-id: 8a4cda892f [formerly 8a4cda892f [formerly 771e06df242b0fe7b4eec1e7c3099dfd316182ce]]
Former-commit-id: 577b3a5e11
Former-commit-id: 2de14cf885
2014-10-08 16:47:10 -05:00
Nate Jensen
900768960a Omaha #3663 move features that contain primarily ncep plugins to ncep
folder

Change-Id: I5d59e1c0618fa26c1f8b3e6f340f255119a72a40

Former-commit-id: 1b51c48468 [formerly 1b51c48468 [formerly f785d88ee1c388b564921c3ecd8c931329639f04]]
Former-commit-id: 8c0a087bf0
Former-commit-id: d4793b5521
2014-09-29 17:24:34 -05:00
Steve Harris
30f0d27dfb Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: 90e08b96e1 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 6330a62e85
2014-09-29 12:58:56 -05:00
Ben Steffensmeier
fc49d0bd55 Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: f92d021e96 [formerly f92d021e96 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]
Former-commit-id: 5b10ac2f36
Former-commit-id: 107ccbf332
2014-09-29 10:49:14 -05:00
Nate Jensen
6bfa9cd589 Omaha #3663 move airep and pirep plguins to ncep features
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219

Former-commit-id: 4cf93c0acb [formerly 4cf93c0acb [formerly 8f743862722b2af08e6659ca3beb0366095bcf79]]
Former-commit-id: 36556fc48b
Former-commit-id: 98d47a8dd2
2014-09-24 15:20:17 -05:00
Brian.Dyke
8997f79ae4 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml

Former-commit-id: 4b418918d4 [formerly 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]
Former-commit-id: 87fa32d2d4
Former-commit-id: 1f09dad9e9
2014-09-24 11:05:37 -04:00
Stephen Gilbert
e87440a876 VLab Issue #4552 - Grid Resource to recognize sub-hourly forecasts
This commit fixes #4552

Change-Id: Ic7f456b03ac4d00e551d3012f5b7a6034af33266

Former-commit-id: 1a8f79820d [formerly 1a8f79820d [formerly 960e36e6fe39425be6e17b492dbf7bebf059db39]]
Former-commit-id: e024656cc7
Former-commit-id: 006bbfb872
2014-09-23 13:32:21 -04:00
Stephen Gilbert
e85f1cdc5f VLab Issue #4003 - Ntrans resource updates + PWAT
Change-Id: Ibcdf8270afd10280f5b38e5595b850de021ffca2

Former-commit-id: 405ce899f3 [formerly 405ce899f3 [formerly 05f4987f726b132b98727fc5fe0c19b8ac1ae762]]
Former-commit-id: 7b12478730
Former-commit-id: 4159341309
2014-09-18 16:51:00 -04:00
Stephen Gilbert
16ebd4fc25 VLab Issue #4001 - Correct Natl Radar Mosaic CRS
Change-Id: If72629e9c33f395d824ae450aadeaf28e8ffd9b5

Former-commit-id: 46e3af5569 [formerly 46e3af5569 [formerly 7a438074ef0aed8a2137adc3f0f32a08a21fd2b9]]
Former-commit-id: 8f61a8e832
Former-commit-id: 21dad5476d
2014-09-18 16:42:09 -04:00
Stephen Gilbert
f4e96b8134 VLab Issue #4638 - Fix cycle times in Ntrans decoder
Change-Id: I0bbf183c0cd0a22e8c8d6f49b1615c58e75d9bf9

Former-commit-id: ed1faf2593 [formerly ed1faf2593 [formerly ce241f8908f547326f0b813bf773f8d5debb33d3]]
Former-commit-id: c7586b6739
Former-commit-id: 0a3b19e323
2014-09-18 16:38:11 -04:00
Stephen Gilbert
20106062b1 VLab Issue #4637 - Fix NCP AWW display issues
Change-Id: I7df6d95cd665805046a807d0900ee934da61c18e

Former-commit-id: 2d3c8c0413 [formerly 2d3c8c0413 [formerly f31a665a587f7fa324afcfcc332eceb1518c96d6]]
Former-commit-id: 79957a312a
Former-commit-id: e4eb7de3e5
2014-09-18 14:12:12 -04:00
Stephen Gilbert
a0124cefb3 VLab Issue #4643 - Add NCP Configurable (Power) Legend capability
Change-Id: If8e83f89ef655efc96173dd12c9bb6e0fd756b84

Former-commit-id: 47487d185a [formerly 47487d185a [formerly a7bdbb3edfc024c3812ff4531560ce4954d070ac]]
Former-commit-id: 28fd9285ff
Former-commit-id: a59af6845f
2014-09-18 14:04:53 -04:00
Mark Peters
354f7b86fd Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
Change-Id: Ia10af38c4dd103b304a6d7b23d072023b2bf05b8

Former-commit-id: 47598b6967 [formerly 47598b6967 [formerly 27ec90f83560909acdb27893528e28e3dd58fd6b]]
Former-commit-id: d3620ffea7
Former-commit-id: 3ac06c97b1
2014-09-16 12:13:33 -05:00
Stephen Gilbert
a021a82ce2 VLab Issue #4003 - Minor changes for OB_14.3.1
Change-Id: Ib0430b16b08c9f27238575b4dcdbc568b43709b7

Former-commit-id: e8c8b6e1b6 [formerly e8c8b6e1b6 [formerly f4979676c4351e0d5445c95d12d8f58cf8924a66]]
Former-commit-id: 4e2ce1fe38
Former-commit-id: b0f70e0c77
2014-09-12 13:20:51 -04:00
Stephen Gilbert
32e72665a0 VLab Issue #4001 - Removed old spring config
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b

Former-commit-id: 0b873558d7 [formerly 0b873558d7 [formerly 69e7730adfee0b12daa784e0d884d1bc563356ef]]
Former-commit-id: 8d033a8433
Former-commit-id: b34dbeec55
2014-09-12 13:18:10 -04:00
Ana Rivera
29f8ade06b VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671
Change-Id: I9708b606e5a7d2c2fc9355d765fbad9113a40493

Former-commit-id: 09152bc49b [formerly 09152bc49b [formerly 94e5089beb782011d107de4aeeb8b35694f2f5c3]]
Former-commit-id: 909f4d8632
Former-commit-id: 84538be9a1
2014-09-11 21:17:43 +00:00
Stephen Gilbert
bbabe5d087 Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
	cave/build/cave/customTargets.xml
	edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
	ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
	ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
	ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.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/natives/NsharpNative.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
	ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
	ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties

Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6

Former-commit-id: 561b751e58 [formerly 561b751e58 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]
Former-commit-id: 662436c2d5
Former-commit-id: a631e61fe5
2014-09-11 11:14:33 -04:00
Stephen Gilbert
f10df38906 VLab Issue #4003 - NCEP CAVE Plugins delivery for 14.2.1-n
NSharp, Pgen, and AWW updates.

Change-Id: Iba41d0974993ffcbd31e2642de490731c2145b2c

Former-commit-id: cd743e857b [formerly cd743e857b [formerly a23938512b73efe78843d13d4f17539978ca84fe]]
Former-commit-id: 8c9a49ffa8
Former-commit-id: 7da72f9d6f
2014-09-03 15:12:48 -04:00
Stephen Gilbert
535c2a242e VLab Issue #4350 - NTRANS resource selection GUI enhancements
Change-Id: Ic4ae8c69e53b373fc7c473921af3fe286c1f2b02

Former-commit-id: fee757ff1d [formerly fee757ff1d [formerly e69657f6e114e2559f991d1b520bc57b18a3e763]]
Former-commit-id: eddd40fa96
Former-commit-id: 1670c71764
2014-09-03 14:59:30 -04:00
Stephen Gilbert
a0f6386a90 VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
AWW and Upper Air updates. Revert some RTS xml files

Change-Id: I4cc48defcea33b9008c9734c1c53a193d0ce94da

Former-commit-id: 32dffe58c8 [formerly 32dffe58c8 [formerly 72fa8af848f1452a517a62c6a54eae265a9ec8a1]]
Former-commit-id: 75277cb034
Former-commit-id: 3da185fa1a
2014-09-03 14:33:37 -04:00
Steve Harris
84edac842e Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 99ae9bdc10 [formerly 99ae9bdc10 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]
Former-commit-id: 038b284066
Former-commit-id: c8ba2b1ae6
2014-08-26 16:25:21 -05:00
Richard Peter
820fb0085e Omaha #3541 Fix request jvm startup and build
Change-Id: I6141ef1d74430fc43ea11f296c6ab95fc4276d6f

Former-commit-id: bf5f1c27a7 [formerly bf5f1c27a7 [formerly 1c698d67a2c0ed3b11f910b593b1bbbdb2f46a86]]
Former-commit-id: f478b42e61
Former-commit-id: ef45928158
2014-08-25 21:21:04 -05:00
Stephen Gilbert
f846921a9f VLab Issue #4003 - NCEP CAVE Plugins delivery for 14.2.1-n
Removed unused dependencies in gov.noaa.nws.ncep.viz.ui.display that
caused install problems.

Change-Id: I52b6c0c01823ecec6dc3e59a3f06728fe11e49a3

Former-commit-id: fd4489d119 [formerly fd4489d119 [formerly b58004e95b2b6770365577f2ccafa39632595229]]
Former-commit-id: 27e7234bd9
Former-commit-id: ac3abebbb7
2014-08-14 13:52:43 -04:00