Ben Steffensmeier
6090625040
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
...
Former-commit-id: 5b10ac2f36
[formerly 00d314b6b493bc34ccd77f731307b5039e22d844]
Former-commit-id: f92d021e96
2014-09-29 10:49:14 -05:00
Stephen Gilbert
2406f0786f
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: 662436c2d5
[formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]
Former-commit-id: 561b751e58
2014-09-11 11:14:33 -04:00
Brian Clements
27c66a5fb9
Omaha #3410 removed duplicate fields from hdf5
...
now uses database columns in point data description
Change-Id: If7cd45d0952a3c0433d04d31bc978a08112ac09b
Former-commit-id: 365126f88f
[formerly 4f945bac3c1061f13df80bdcb6427927dde2b8c4]
Former-commit-id: f8795c90c6
2014-07-31 10:23:26 -05:00
Stephen Gilbert
e518f4b2bf
VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
...
Fixes for Vors, Ncuair, and pressure change
Change-Id: I11d77f5b359e3f73317a46ecf9addf81079c1616
Former-commit-id: 11d21bbe95
[formerly a05e1a8190d28f3d09e373b8d8c5f46829bbc9e8]
Former-commit-id: 5da2ae3fa7
2014-07-08 09:51:57 -04:00
Richard Peter
e4be1f24e7
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: 17196b5dcd
[formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]
Former-commit-id: dbba727f3d
2014-04-14 13:10:11 -05:00
Brian.Dyke
779553142c
OB_14.1.1-19 baseline
...
Former-commit-id: 10b723647b
[formerly db2a591456383d8f980d33757e8c161bdcc01d3a]
Former-commit-id: cfa4997978
2014-02-21 06:50:59 -05:00
Steve Harris
80614c0e52
14.1.1-7 baseline
...
Former-commit-id: 4fff87723f
[formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]
Former-commit-id: 3328e2dd1d
2013-11-06 14:16:14 -05:00
Steve Harris
82dec19b6a
14.1.1-4 baseline
...
Former-commit-id: 99e3707c5b
[formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: bd95bb6a4e
2013-10-28 10:55:16 -04:00
Steve Harris
851f9df229
14.1.1-3 baseline
...
Former-commit-id: 5739b4f832
[formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]
Former-commit-id: 94f24e0d8a
2013-10-28 10:46:02 -04:00
Steve Harris
8ba7d392d6
13.5.2-8 baseline
...
Former-commit-id: 18325949fb
[formerly 6effdd3f5ce46910c89236306fa33499eada174f]
Former-commit-id: 94aa71fcd1
2013-10-04 11:30:03 -04:00
Steve Harris
c56be8a332
13.5.1-4 baseline
...
Former-commit-id: e197f23ce3
[formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: 70e4ff30a6
2013-06-28 09:46:25 -04:00
Steve Harris
6384018950
13.5.1-1 baseline
...
Former-commit-id: fe872355a7
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: 998961612c
2013-06-10 15:17:17 -04:00
Nate Jensen
873469f771
Issue #181 integrating ncep edex code
...
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf
Former-commit-id: a015cc136b
[formerly 71d87e07ef1d5ce2509fddce9170870a5950ba7b]
Former-commit-id: f96e6a822b
2012-01-24 09:49:27 -06:00