Commit graph

204 commits

Author SHA1 Message Date
AWIPS User
5ad9c4e049 volume browser organization
Former-commit-id: bcaa201de4
2015-04-19 23:37:37 -06:00
AWIPS User
892c265b12 merge upc development orphan branch into upc_14.4.1
Former-commit-id: c9f28fd594
2015-03-01 12:44:45 -07:00
Ana Rivera
cd2841195b 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: 98ac97e397 [formerly 98ac97e397 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]
Former-commit-id: 7c25945fd9
Former-commit-id: eae1bd317d
2015-01-26 18:45:26 +00:00
mjames-upc
ba80d4303b modified code CAVE - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: e104fc35e2
2015-01-12 14:07:28 -07:00
mjames-upc
886cd5940f Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 7eacf4dc1c
2015-01-12 14:02:58 -07: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
e53063661e Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: ec28d2f1a0 [formerly ec28d2f1a0 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 291de3f039
2014-12-03 15:47:10 -06:00
Ana Rivera
ccbb684974 VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f

Former-commit-id: 709d571947 [formerly 709d571947 [formerly 6866439b0a7075f04146af4b4bdce59477269f4d]]
Former-commit-id: fe5bfbaa73
Former-commit-id: 8eaeb7b322
2014-12-02 15:44:07 +00:00
Ana Rivera
899a9d762d VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit 227ca65a041b4cf1c6930926ce67b7f4394e1097 [formerly f1f5f2c717] [formerly c245f3a3c4 [formerly c245f3a3c4 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]].

Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685

Former-commit-id: 0e8473e91e [formerly 0e8473e91e [formerly 373acfce57d5e0044f13382b926cb2fc1f830e54]]
Former-commit-id: 5abf37ea62
Former-commit-id: 7c3dd12351
2014-12-02 13:43:03 +00:00
Roger Ferrel
975ee3aba9 Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
Former-commit-id: 9b986c7cf8 [formerly 9b986c7cf8 [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]]
Former-commit-id: 0df840602e
Former-commit-id: 4ba718da37
2014-11-25 10:01:30 -06:00
Ana Rivera
e5f6dae5bd Merge branch 'master_14.4.1' into emc_14.4.1
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb

Former-commit-id: 1645ccd9ca [formerly 1645ccd9ca [formerly c69e94f227cb908a9af2e1cd2db35b25bef28701]]
Former-commit-id: 1999049d90
Former-commit-id: 95b016ef4e
2014-11-21 14:23:49 +00:00
Roger Ferrel
77118778ae Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files.
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e

Former-commit-id: 4d06812d30 [formerly 4d06812d30 [formerly a9ce685c99dbdc1442f022cda7af09af5bdabf87]]
Former-commit-id: 71db8afbaa
Former-commit-id: a188c5443b
2014-11-20 12:25:00 -06:00
Roger Ferrel
6e58de9ef0 Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15

Former-commit-id: 90a8b262f3 [formerly 90a8b262f3 [formerly 6cb88075375e3703b5ffe559ebd5e4f57d016880]]
Former-commit-id: b88300a5fc
Former-commit-id: 83c738abd9
2014-11-18 17:42:39 -06:00
Mark Peters
5d90bf9d76 Omaha #3300 Merge fixes for volume browser menus
Change-Id: Id2d6f643f80982d7b5c4f195e21775ec5def4b43

Former-commit-id: bcff3fc981 [formerly bcff3fc981 [formerly 1694a064c9496599532e9348a5eb89e558862e60]]
Former-commit-id: 666e8d4332
Former-commit-id: e08f52cc99
2014-11-18 16:03:42 -06:00
Roger Ferrel
8f06e69f21 Omaha #3727 Place HFR and HiResW entries in sub-menus.
Change-Id: I602cf35675c6ea4255ade4cb42ebe5c97207d62e

Former-commit-id: 28041de97e [formerly 28041de97e [formerly 0456cbbaf9c694a73c9862773b0e42165114b78d]]
Former-commit-id: 739b253792
Former-commit-id: 5f53024f75
2014-11-11 16:10:48 -06:00
Brian.Dyke
54f82d7f6f Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: aae68215c8 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]
Former-commit-id: acf00264f4
Former-commit-id: 2b470ad1a1
2014-11-06 12:55:21 -05:00
Ana Rivera
ab680bc174 VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426

Former-commit-id: c245f3a3c4 [formerly c245f3a3c4 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]
Former-commit-id: f1f5f2c717
Former-commit-id: c76ed237ac
2014-10-22 17:03:07 +00:00
mjames-upc
7eeb299578 pull and merge for HRRR re-edits
Former-commit-id: 0116938d64
2014-10-09 16:14:37 -06:00
mjames-upc
a18fdadf38 HRRR menu additions for D2D and NCP
Former-commit-id: a6f311f847
2014-10-09 16:10:13 -06:00
Richard Peter
26ee8506f5 Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: e8bc97501b [formerly e8bc97501b [formerly 157588d388b9033424ddc46a22d74ccc302eea85]]
Former-commit-id: fa15d4ff21
Former-commit-id: d97655272f
2014-10-08 12:02:17 -05:00
mjames-upc
678cb6b929 HRRR resource added to D2D and NCP
Former-commit-id: b5232c09cb
2014-10-07 11:34:16 -06:00
Mark Peters
c2173b1925 Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e

Former-commit-id: 3464751716 [formerly 3464751716 [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]
Former-commit-id: 5ed537572a
Former-commit-id: c50ae98b5f
2014-10-07 11:42:44 -05:00
Roger Ferrel
7afe6d2df6 Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: dfbf07f377 [formerly dfbf07f377 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]]
Former-commit-id: d4ef865375
Former-commit-id: 96f484e323
2014-10-06 15:34:30 -05:00
Steve Harris
cfd49c8ca0 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 39c5e9c314 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 2db03d95b3
Former-commit-id: 3542caf090
2014-10-06 13:57:59 -05:00
Brian.Dyke
1d2dfd264a Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 65ad6056b6 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]
Former-commit-id: f3f95aabb0
Former-commit-id: e77f1e126e
2014-10-02 10:38:51 -04:00
Slav Korolev
f05360e224 Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
Former-commit-id: f7bcb81010 [formerly f7bcb81010 [formerly 2a03c64bb098a141c82aac4bab42d7d9f4a6296f]]
Former-commit-id: ad4bae10c9
Former-commit-id: 8fddad1cd1
2014-10-01 16:45:33 -04:00
dmsys
e00ea2d8cd Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 8c3625cfec [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]
Former-commit-id: 9f4560c480
Former-commit-id: b884e5e32d
2014-09-30 13:45:54 -04: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
Brian.Dyke
4359e8dc47 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 1ac61fb612 [formerly 1ac61fb612 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]
Former-commit-id: f26fe97ec4
Former-commit-id: 33525968e3
2014-09-26 14:19:03 -04:00
Ana Rivera
97ae16163f VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8

Former-commit-id: d96f5fe229 [formerly d96f5fe229 [formerly 833cff4f37542078578de96b3b59723f77c31f4c]]
Former-commit-id: a72725f9ef
Former-commit-id: dd45d98a0e
2014-09-25 17:46:53 +00: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
Steve Harris
f831536854 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: 7692e3f21d [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]
Former-commit-id: b979960b7b
Former-commit-id: 50d6dccd09
2014-09-23 11:41:10 -05:00
Brian.Dyke
ebbb7003d9 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 88d5f872ae [formerly 88d5f872ae [formerly aaae61509d743553186cdefdea0557158b139527]]
Former-commit-id: 9435507b27
Former-commit-id: 1b8af8379f
2014-09-19 13:14:13 -04:00
Mark Peters
08a3acb2d4 Omaha #3300 Merge fixes for 14.4.1
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd

Former-commit-id: 048e8339fd [formerly 048e8339fd [formerly 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1]]
Former-commit-id: 26e4f86248
Former-commit-id: c49df63363
2014-09-19 12:01:07 -05:00
Darrel Kingfield
142edfe588 VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872

Former-commit-id: 1cabae50b1 [formerly 1cabae50b1 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]]
Former-commit-id: 88a8dddef3
Former-commit-id: 00a056c154
2014-09-19 11:14:09 -05:00
Steve Harris
fdc523a026 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: 091555cf10 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 4c56844e29
Former-commit-id: 214b48dcb8
2014-09-19 10:28:57 -05:00
Ana Rivera
c12eb3b106 VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06

Former-commit-id: 9d8c08a09a [formerly 9d8c08a09a [formerly 3af534fb2778268fee650c09c5aa0346df746ce8]]
Former-commit-id: 56f409717f
Former-commit-id: 030d8c45b7
2014-09-19 15:17:46 +00:00
Brian.Dyke
7e53a1d558 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e1c88f287a [formerly e1c88f287a [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]
Former-commit-id: 57a361073d
Former-commit-id: 4476b9d19e
2014-09-17 15:50:13 -04:00
Brian.Dyke
e97f5bc086 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 21fedc3565 [formerly 21fedc3565 [formerly ab9b7ec5424512656d2fb343773fa97658c04ecd]]
Former-commit-id: 83099ee81f
Former-commit-id: 997a7f528f
2014-09-12 14:11:57 -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
mjames-upc
25eb7e0b69 LDM updates: data_store file/path names changed to avoid unintended subdirs in grib2 tree.
Former-commit-id: 8d2853c57c
2014-09-10 15:07:18 -06:00
Nate Jensen
eec3df9cd5 Omaha #3356 updates for improved level lookup
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: ae9cffaaea [formerly ae9cffaaea [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]
Former-commit-id: 62b84b2fb3
Former-commit-id: f5ae895143
2014-09-09 15:38:53 -05:00
Brian.Dyke
a31d3d702e 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: 3d9a3de6e4 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]
Former-commit-id: 01dfe503f5
Former-commit-id: c42733eb39
2014-09-09 11:44:30 -04:00
Brian.Dyke
66c4758f2d 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: 858b91d677 [formerly 858b91d677 [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]
Former-commit-id: af477df90e
Former-commit-id: 6c4b121752
2014-09-08 14:54:16 -04:00
Baoyu Yin
b1d682a92e VLab Issue #4623 - AWIPS2_DR_17363 LAPS freezing level height not computed prevents display of hail product; fixes #4623
Change-Id: I3b608e9024dbe70e08a549b5469c2fb09e448a9a

Former-commit-id: 3e39cd9bb5 [formerly 3e39cd9bb5 [formerly 61838d538f73adb6279ba55d5fe3c5b02d3a28f4]]
Former-commit-id: 7008216976
Former-commit-id: 340e242ee8
2014-09-05 11:18:54 -04:00
Baoyu Yin
8a9ec04c80 VLab Issue #4608 - AWIPS2_DR_16259 Minor Typo in Volume Menu of D2D 4-PanelFamilies ; fixes #4608
Change-Id: I73a3f5a441e33dffe3dc7f3962c3fceec930ce3a

Former-commit-id: 9e110936e8 [formerly 9e110936e8 [formerly cb4e2e652ba3763725b8ec7e6d528748d2472a6b]]
Former-commit-id: 73f7935f46
Former-commit-id: 17268bb5dd
2014-09-04 08:23:53 -04:00
Brian.Dyke
4425e3db61 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: f0875e724f [formerly f0875e724f [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]
Former-commit-id: 611e036e75
Former-commit-id: caf5f778e9
2014-09-02 16:30:51 -04:00
Nate Jensen
84a107c8fa Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: 2c209af1fa [formerly 2c209af1fa [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]
Former-commit-id: fe457e89a7
Former-commit-id: 5661124038
2014-09-02 09:53:25 -05:00
Mark Peters
a3c382c0f7 Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9

Former-commit-id: 097ce54969 [formerly 097ce54969 [formerly a0864eff6efa679cdc0f58cd408102e32145f22c]]
Former-commit-id: 91f2b365a1
Former-commit-id: 54f9a37e6c
2014-08-29 15:05:29 -05:00
Ana Rivera
dee335f370 VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1

Former-commit-id: 160dabc4d1 [formerly 160dabc4d1 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]
Former-commit-id: 9af77831a6
Former-commit-id: fbe4d57f6b
2014-08-28 18:38:26 +00:00