15 commits

Author	SHA1	Message	Date
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	88ded4feed	VLab Issue #4152 - Enhancements to Magnetometer K calculation ... Change-Id: I266486d48a312ec2ec16e35a4a739a6bf33c3eb4 Former-commit-id: 987cfaf3ed [formerly 987cfaf3ed [formerly 4c89c2e687ad9ec529883029ab8a5d25073a1725]] Former-commit-id: 84bcdcacf6 Former-commit-id: bd8a4cddb2	2014-07-22 16:52:16 -04:00
Stephen Gilbert	adf872f445	Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1 ... Conflicts: ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0 Former-commit-id: 91d469eb90 [formerly 91d469eb90 [formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]] Former-commit-id: 7992a6b15b Former-commit-id: 7aaf3f44bc	2014-05-22 12:39:09 -04:00
Stephen Gilbert	bcc628c19f	VLab Issue #3722 - SWPC delivery for 14.3.1 ... Upgrades to Geomag and solar image processing Change-Id: Ibe33d00843419e34998274a87734f3f29d2b63dc Former-commit-id: 5da74a455d [formerly 5da74a455d [formerly c9bcc3d15adcea014696e5cd68b9688506ee07d9]] Former-commit-id: 4d2154d2de Former-commit-id: c3b1cda7c5	2014-05-15 17:24:13 -04:00
Stephen Gilbert	ecb311ac46	VLab Issue #3722 - SWPC delivery for 14.3.1 ... Upgrades to Geomag and solar image processing Change-Id: Ibe33d00843419e34998274a87734f3f29d2b63dc Former-commit-id: 7330213de5 [formerly 7330213de5 [formerly 9b470a605b1db454b9287098e84079e8438a2f2b]] Former-commit-id: 07586158c9 Former-commit-id: 226e2b5b69	2014-05-15 15:43:44 -04:00
Richard Peter	b3fd8e5480	Issue #2726: Edex graceful shutdown. ... Refactored to use inheritance and separate logic where possible. Addressed comments. Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6 Former-commit-id: dbba727f3d [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]] Former-commit-id: 17196b5dcd Former-commit-id: 8b279966d1	2014-04-14 13:10:11 -05:00
Brian.Dyke	1b359c2564	OB_14.1.1-19 baseline ... Former-commit-id: cfa4997978 [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]] Former-commit-id: 10b723647b Former-commit-id: 64044e7ce5	2014-02-21 06:50:59 -05:00
Steve Harris	647b908fed	14.1.1-7 baseline ... Former-commit-id: 3328e2dd1d [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]] Former-commit-id: 4fff87723f Former-commit-id: 48df058653	2013-11-06 14:16:14 -05:00
Steve Harris	98ae84da42	14.1.1-4 baseline ... Former-commit-id: bd95bb6a4e [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]] Former-commit-id: 99e3707c5b Former-commit-id: 7590a56e0e	2013-10-28 10:55:16 -04:00
Steve Harris	8d67ffede4	14.1.1-3 baseline ... Former-commit-id: 94f24e0d8a [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]] Former-commit-id: 5739b4f832 Former-commit-id: 4a6a209aea	2013-10-28 10:46:02 -04:00
Steve Harris	088eb89ca7	13.5.2-8 baseline ... Former-commit-id: 94aa71fcd1 [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]] Former-commit-id: 18325949fb Former-commit-id: d89fbf73d9	2013-10-04 11:30:03 -04:00
Steve Harris	4a9a91ce2e	13.5.2-1 baseline ... Former-commit-id: 73dd0f166c [formerly 73dd0f166c [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]] Former-commit-id: 542b2c3d18 Former-commit-id: 4ecb349ed8	2013-08-28 09:43:48 -04:00
Steve Harris	c183e08922	13.5.1-4 baseline ... Former-commit-id: 70e4ff30a6 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]] Former-commit-id: e197f23ce3 Former-commit-id: f658320357	2013-06-28 09:46:25 -04:00
Steve Harris	146c5e8940	13.5.1-1 baseline ... Former-commit-id: 998961612c [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]] Former-commit-id: fe872355a7 Former-commit-id: 30ba1d634e	2013-06-10 15:17:17 -04:00
Steve Harris	322036ea82	13.4.1-10 baseline ... Former-commit-id: 9a403b3615 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]] Former-commit-id: 92152778b9 Former-commit-id: b1fc4e625b	2013-05-20 10:52:47 -04:00