xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10033 commits 31 branches 40 tags 3.8 GiB
Commit graph

393 commits

Author SHA1 Message Date
Slav Korolev
ad4bae10c9 Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series 
Former-commit-id: 2a03c64bb098a141c82aac4bab42d7d9f4a6296f
 2014-10-01 16:45:33 -04:00
Steve Harris
3b6a8a1447 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: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
 2014-09-29 12:58:56 -05:00
Ben Steffensmeier
5b10ac2f36 Omaha #3132 - merge master_14.3.1 into omaha_14.4.1 
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
 2014-09-29 10:49:14 -05:00
Steve Harris
b979960b7b Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java

Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
 2014-09-23 11:41:10 -05:00
Brian.Dyke
8d665b93b5 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 8d5d8cdfd272f8000a6a21a4128998889eb2ab30
 2014-09-19 16:56:50 -04:00
Brian.Dyke
9c33ae6d2c Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: e895f7927a95c2416c05953e131d9e0c6095beb3
 2014-09-19 14:42:29 -04:00
Darrel Kingfield
88a8dddef3 VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603 
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872

Former-commit-id: a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a
 2014-09-19 11:14:09 -05:00
Steve Harris
4c56844e29 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
 2014-09-19 10:28:57 -05:00
Brian.Dyke
57a361073d Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f
 2014-09-17 15:50:13 -04:00
Nate Jensen
b89781c419 Omaha #3356 fix ingestGrib level factory initialization order 
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985

Former-commit-id: 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2
 2014-09-16 13:24:46 -05:00
Stephen Gilbert
440bddda4b Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1 
Former-commit-id: 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3
 2014-09-15 13:20:34 -04:00
Brian.Dyke
1541e4c255 Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: 8e4f6e96f7b70d6f2b7517f3f0695350506169c7
 2014-09-15 10:46:25 -04:00
Stephen Gilbert
662436c2d5 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: 3775b0762b9d8529f5aa6630480d82e7ea62c1d8
 2014-09-11 11:14:33 -04:00
Nate Jensen
62b84b2fb3 Omaha #3356 updates for improved level lookup 
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b
 2014-09-09 15:38:53 -05:00
Brian.Dyke
01dfe503f5 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
 2014-09-09 11:44:30 -04:00
Brian.Dyke
af477df90e Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: 7b49ea6d9c45c0624017bbe7ffb1297a402ee875
 2014-09-08 14:54:16 -04:00
Brian.Dyke
9f7fabb002 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4 
Former-commit-id: c1f870d9df7579741e5a1d79cdec77293115e968
 2014-09-05 10:57:14 -04:00
Ana Rivera
a8b04b8e63 VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601 
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152

Former-commit-id: 084970f8445dbb6b76bbad84b5dc986d961d2383
 2014-09-05 13:27:29 +00:00
Stephen Gilbert
75277cb034 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: 72fa8af848f1452a517a62c6a54eae265a9ec8a1
 2014-09-03 14:33:37 -04:00
Brian.Dyke
611e036e75 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4 
Former-commit-id: 40efe51cafd5589ef0a640041ad0539e454b6f8d
 2014-09-02 16:30:51 -04:00
Steve Harris
5d58625abc Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 8793dca41f756ba812206b48391caea6e593a657
 2014-08-29 10:17:52 -05:00
Brian.Dyke
2c25f68437 Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: f34bc4f81eb5ac92ef306f73f8c34243d3f78e31
 2014-08-29 10:19:02 -04:00
Baoyu Yin
bfc550b378 VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563 
Change-Id: I5f5c55486f209b89ecf276bb38d3d42c7f60d1d1

Former-commit-id: 5189ae1c3ce12320045c431d9552036ea9272cef
 2014-08-29 10:17:54 -04:00
Ana Rivera
9af77831a6 VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617 
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1

Former-commit-id: 2df117a7aec644e6964da6c36326ab3b29b9f378
 2014-08-28 18:38:26 +00:00
Brian.Dyke
aa83bf804f Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: 7334d3991903dfe8a62728de33c21e81534fdbb6
 2014-08-27 11:19:19 -04:00
Steve Harris
038b284066 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: 03ba5101d6f277b55173f72c2a63869e9dc31c3f
 2014-08-26 16:25:21 -05:00
Brian.Dyke
175f4e67c1 Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: a6d5822b5cb5bb3aa62fcc95e980b08c685a3be3
 2014-08-26 15:00:55 -04:00
Brian.Dyke
dd9d7133d9 Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py

Former-commit-id: 65e2373d13c7d5b33d579b87d98a8265252ea391
 2014-08-22 14:16:22 -04:00
Brian.Dyke
94577a1626 Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4 
Former-commit-id: b2674ef57183706feb2bb17175d730bb2e213281
 2014-08-22 14:13:48 -04:00
Brian.Dyke
ae5656ca46 VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag 
Former-commit-id: 1b83b788aee082b489ce0fe5dc6d775e2f621e01
 2014-08-21 11:07:02 -04:00
Roger Ferrel
f110ca1f3d Issue #3439 Name change per suggestions in email. 
Former-commit-id: 44c3b86c9dc0b978acc66c5f79255270ce0acb41
 2014-08-19 16:41:06 -05:00
Slav Korolev
a779c786f1 Issue #2875 - Implemented HFR Surface Current Velocity. 
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761

This reverts commit e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f].

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: aee044437492438381db98cc6fd3a917f6c05659
 2014-08-19 10:12:36 -05:00
Melissa Porricel
7e78946ee0 ASM #15699 - Fix Grib decoder error 
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511

Former-commit-id: e8c156d166cedc1553f9ffd8867633651443872d
 2014-08-15 13:41:53 -04:00
Stephen Gilbert
77fa357a15 VLab Issue #3648 - Corrected NCEP additions for ESTOFS model 
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Former-commit-id: aef15e75c53666aa65dd4687725e9dbd8e6122e0
 2014-08-15 11:03:48 -05:00
Ana Rivera
9bf2df23be VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648 
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: b7815d59250a73ee587d57bd2ece84691fe8707c
 2014-08-15 11:02:36 -05:00
Ana Rivera
95451b2959 VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data 
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml

Former-commit-id: d95450f2eebc6b3d10093bd16736b349a1d0b12b
 2014-08-15 11:01:23 -05:00
Roger Ferrel
518ec99c00 Issue #3439 Changes to add new GFS data to Product and Volume Browser. 
Change-Id: I6314cb1a99aada35290a52e03810d4d51b224a9d

Former-commit-id: 658976d6c9485a3abe4d8a5ba759897407ec1239
 2014-08-13 14:40:13 -05:00
Steve Harris
e5af41fa86 Issue #3507 - Revert "Issue #2875 - Implemented HFR Surface Current Velocity." 
This reverts commit 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21].


Former-commit-id: e861a7dd5f517f28991530a7e46a4f5db1826d4f
 2014-08-12 10:19:12 -05:00
Slav Korolev
7ae3ca0bfc Issue #2875 - Implemented HFR Surface Current Velocity. 
Former-commit-id: f2788ef1881d66467b5aa200b849b6fcf4608b21
 2014-08-12 09:19:22 -04:00
Stephen Gilbert
af9384d8d7 VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n 
GRIB config, TCM fix, and PWAT calculation for soundings

Change-Id: Ic46db6f57da1446de27693ef3d00c664af6a7431

Former-commit-id: 598d22b0c943c5de9fc9ab3a56cde717c374fdfe
 2014-08-11 15:47:57 -04:00
Steve Harris
bf9a0fa5de Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py

Former-commit-id: f7d474895366eb23ae5eef242a4568f911435aa3
 2014-08-04 22:20:29 -05:00
Steve Harris
7a8cdaea54 Merge branch 'master_14.3.1' (14.3.1-14) into omaha_14.3.1 
Former-commit-id: f158314a854a081cb12cd15cab3f6340d5c0fb78
 2014-08-04 16:04:11 -05:00
Brian.Dyke
7fbb3b6a54 Merge branch 'master_14.3.1' into asm_14.3.1 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: f22cc09d0a6fdc7a806726d5207f6b3507972b94
 2014-08-04 16:40:02 -04:00
Brian.Dyke
270d2b0ddb Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	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
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: b209604e1f0d6e790980d0bc8f1760e38f448076
 2014-08-04 13:10:13 -04:00
Ben Steffensmeier
12f84a9427 Issue #3455 Fix gridless grib models. 
Former-commit-id: 1228b73957fc4a407e9075292faffeff3a84bdb4
 2014-07-30 16:44:07 -05:00
Ben Steffensmeier
95f16c448f Omaha #3469 Improve logging of invalid grib1 files. 
Former-commit-id: 043b5709262c5cc01a280f48c61b17fed32c4b59
 2014-07-30 16:32:57 -05:00
Stephen Gilbert
f94a3aadf4 VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n 
NcText decoder updates and other ingest config changes

Change-Id: I1dca245ff36c565c924a494eae3f1a2b834f43ac

Former-commit-id: 9e47362ce407ea03c0ede8884baa7e8129d2d646
 2014-07-23 15:51:27 -04:00
Brian Clements
a20345bf50 Omaha #3373 fixed jaxb pooling performance issues 
Change-Id: Icf7949e956f2b21ba156f4f0a19a2c41d0037681

Former-commit-id: 2ec52d8956b77aad30d46d7b4b2202c868b38a4d
 2014-07-21 17:05:29 -05:00
Ana Rivera
088ebd2ca2 VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154 
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55

Former-commit-id: 9c3460d34513dd2f54643b87cb8afd122d94ea9c
 2014-07-21 21:41:17 +00:00
Roger Ferrel
88aa28c46b Omaha #3344 Updated import for GRID_FILL_VALUE. 
Former-commit-id: d490bc82905d37ad284485d30a493c1fd7e3ed6f
 2014-07-14 17:01:32 -05:00