Commit graph

274 commits

Author SHA1 Message Date
Steve Harris
d3169a96b0 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: 2e2072a963 [formerly 7692e3f21d] [formerly 2e2072a963 [formerly 7692e3f21d] [formerly b979960b7b [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]]
Former-commit-id: b979960b7b
Former-commit-id: e5f8a8f74f [formerly 50d6dccd09]
Former-commit-id: f831536854
2014-09-23 11:41:10 -05:00
Steve Harris
f4ea796cea 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: da530db540 [formerly 091555cf10] [formerly da530db540 [formerly 091555cf10] [formerly 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]
Former-commit-id: 4c56844e29
Former-commit-id: 84a98ec4ca [formerly 214b48dcb8]
Former-commit-id: fdc523a026
2014-09-19 10:28:57 -05:00
Brian.Dyke
c95be437eb Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 1c0d6624a3 [formerly e1c88f287a] [formerly 1c0d6624a3 [formerly e1c88f287a] [formerly 57a361073d [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]]
Former-commit-id: 57a361073d
Former-commit-id: 47feda6450 [formerly 4476b9d19e]
Former-commit-id: 7e53a1d558
2014-09-17 15:50:13 -04:00
Nate Jensen
89ea61abb0 Omaha #3356 fix ingestGrib level factory initialization order
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985

Former-commit-id: 877aab446c [formerly b516c4b8c8] [formerly 877aab446c [formerly b516c4b8c8] [formerly b89781c419 [formerly 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2]]]
Former-commit-id: b89781c419
Former-commit-id: 5d7897e9bc [formerly 57851af7d6]
Former-commit-id: 1370795313
2014-09-16 13:24:46 -05:00
Nate Jensen
3cf27fb414 Omaha #3356 updates for improved level lookup
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: 1c77f66608 [formerly ae9cffaaea] [formerly 1c77f66608 [formerly ae9cffaaea] [formerly 62b84b2fb3 [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]]
Former-commit-id: 62b84b2fb3
Former-commit-id: d397d4147c [formerly f5ae895143]
Former-commit-id: eec3df9cd5
2014-09-09 15:38:53 -05:00
Brian.Dyke
0f9fe8301a 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: fe85eb9f70 [formerly 3d9a3de6e4] [formerly fe85eb9f70 [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 29364e2b9f [formerly c42733eb39]
Former-commit-id: a31d3d702e
2014-09-09 11:44:30 -04:00
Brian.Dyke
b42aba7839 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: 5415a4939a [formerly 858b91d677] [formerly 5415a4939a [formerly 858b91d677] [formerly af477df90e [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]]
Former-commit-id: af477df90e
Former-commit-id: dde3efc567 [formerly 6c4b121752]
Former-commit-id: 66c4758f2d
2014-09-08 14:54:16 -04:00
Brian.Dyke
ea20efaf55 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: cdd1e08ee3 [formerly d7407481ef] [formerly cdd1e08ee3 [formerly d7407481ef] [formerly 9f7fabb002 [formerly c1f870d9df7579741e5a1d79cdec77293115e968]]]
Former-commit-id: 9f7fabb002
Former-commit-id: 8a3f7aa5d9 [formerly 6f4bdae843]
Former-commit-id: 86e748a02e
2014-09-05 10:57:14 -04:00
Ana Rivera
9d16e16770 VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152

Former-commit-id: c77e5412a6 [formerly 6d48576930] [formerly c77e5412a6 [formerly 6d48576930] [formerly a8b04b8e63 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]]]
Former-commit-id: a8b04b8e63
Former-commit-id: f5695a423d [formerly ac4f61813f]
Former-commit-id: 3e1039b714
2014-09-05 13:27:29 +00:00
Brian.Dyke
0d6ef0345d Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: e425e5bf8c [formerly f0875e724f] [formerly e425e5bf8c [formerly f0875e724f] [formerly 611e036e75 [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]]
Former-commit-id: 611e036e75
Former-commit-id: 3b9653ef00 [formerly caf5f778e9]
Former-commit-id: 4425e3db61
2014-09-02 16:30:51 -04:00
Steve Harris
ecf26b3ac5 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: bddf9c0f27 [formerly 793064063b] [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: 5d58625abc
Former-commit-id: 66b485c000 [formerly d984dd538f]
Former-commit-id: e681e0a457
2014-08-29 10:17:52 -05:00
Baoyu Yin
4e755d38e6 VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563
Change-Id: I5f5c55486f209b89ecf276bb38d3d42c7f60d1d1

Former-commit-id: cbc7d2813f [formerly bf5bb1bacf] [formerly cbc7d2813f [formerly bf5bb1bacf] [formerly bfc550b378 [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]]]
Former-commit-id: bfc550b378
Former-commit-id: 939e96be9b [formerly 70b265dae2]
Former-commit-id: 88e01c26db
2014-08-29 10:17:54 -04:00
Ana Rivera
aec8eba1a7 VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1

Former-commit-id: e033ed5546 [formerly 160dabc4d1] [formerly e033ed5546 [formerly 160dabc4d1] [formerly 9af77831a6 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]]
Former-commit-id: 9af77831a6
Former-commit-id: 2045699212 [formerly fbe4d57f6b]
Former-commit-id: dee335f370
2014-08-28 18:38:26 +00:00
Brian.Dyke
7e4ab705cc 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: a08db8d73d [formerly e654318431] [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: aa83bf804f
Former-commit-id: f90649d7e7 [formerly f7f16ff9eb]
Former-commit-id: c0dc594eda
2014-08-27 11:19:19 -04:00
Steve Harris
9d263bc542 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: 8c5026314c [formerly 99ae9bdc10] [formerly 8c5026314c [formerly 99ae9bdc10] [formerly 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]
Former-commit-id: 038b284066
Former-commit-id: 1da31a86dc [formerly c8ba2b1ae6]
Former-commit-id: 84edac842e
2014-08-26 16:25:21 -05:00
Brian.Dyke
27372f098c 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: 2ddc920a4a [formerly 325887e605] [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]
Former-commit-id: dd9d7133d9
Former-commit-id: c8e9153884 [formerly 1839b614df]
Former-commit-id: cd1b914f50
2014-08-22 14:16:22 -04:00
Brian.Dyke
5a878760f1 Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 5b2b0d2bd9 [formerly a830b6d94c] [formerly 5b2b0d2bd9 [formerly a830b6d94c] [formerly 94577a1626 [formerly b2674ef57183706feb2bb17175d730bb2e213281]]]
Former-commit-id: 94577a1626
Former-commit-id: 0cbbceb7e3 [formerly a0af10ff2e]
Former-commit-id: d0a2060e84
2014-08-22 14:13:48 -04:00
Brian.Dyke
aa4fad07e8 VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag
Former-commit-id: 93be1a54c7 [formerly 7b8fef0fa3] [formerly 93be1a54c7 [formerly 7b8fef0fa3] [formerly ae5656ca46 [formerly 1b83b788aee082b489ce0fe5dc6d775e2f621e01]]]
Former-commit-id: ae5656ca46
Former-commit-id: 17b9ae1418 [formerly bcf53f53da]
Former-commit-id: d5bcfff431
2014-08-21 11:07:02 -04:00
Roger Ferrel
d4db0fc5fd Issue #3439 Name change per suggestions in email.
Former-commit-id: d76722987e [formerly fb54b80ed5] [formerly d76722987e [formerly fb54b80ed5] [formerly f110ca1f3d [formerly 44c3b86c9dc0b978acc66c5f79255270ce0acb41]]]
Former-commit-id: f110ca1f3d
Former-commit-id: 09f4d1b53b [formerly 9adb8c5d35]
Former-commit-id: 4d0c25e71d
2014-08-19 16:41:06 -05:00
Slav Korolev
9d0e31155f Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761

This reverts commit fe4b0de79bdc9f7d9251320f16b6046314117f1f [formerly e5af41fa86] [formerly 55a1120bdb [formerly dd9d117f90] [formerly 55a1120bdb [formerly dd9d117f90] [formerly 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: 1c896cedab [formerly a9bed4c6fd] [formerly 1c896cedab [formerly a9bed4c6fd] [formerly a779c786f1 [formerly aee044437492438381db98cc6fd3a917f6c05659]]]
Former-commit-id: a779c786f1
Former-commit-id: d080af879e [formerly 407be3d26f]
Former-commit-id: 99a8258e86
2014-08-19 10:12:36 -05:00
Melissa Porricel
9404c0b585 ASM #15699 - Fix Grib decoder error
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511

Former-commit-id: 9f20c63f97 [formerly 67e44f145a] [formerly 9f20c63f97 [formerly 67e44f145a] [formerly 7e78946ee0 [formerly e8c156d166cedc1553f9ffd8867633651443872d]]]
Former-commit-id: 7e78946ee0
Former-commit-id: 248205a78f [formerly 356d0e04f6]
Former-commit-id: e76123c79a
2014-08-15 13:41:53 -04:00
Stephen Gilbert
8f046bbe63 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: 84c3e1ed26 [formerly f6225b8969] [formerly 84c3e1ed26 [formerly f6225b8969] [formerly 77fa357a15 [formerly aef15e75c53666aa65dd4687725e9dbd8e6122e0]]]
Former-commit-id: 77fa357a15
Former-commit-id: b20d517e3f [formerly 333f24b12f]
Former-commit-id: 33743421ee
2014-08-15 11:03:48 -05:00
Ana Rivera
0ff1ac5357 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: 1daa44291e [formerly a44d5d91db] [formerly 1daa44291e [formerly a44d5d91db] [formerly 9bf2df23be [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]]]
Former-commit-id: 9bf2df23be
Former-commit-id: c294608c37 [formerly eefe73ee51]
Former-commit-id: 4b42e52ce3
2014-08-15 11:02:36 -05:00
Ana Rivera
b626588fae 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: cc354742e1 [formerly a053fd5bad] [formerly cc354742e1 [formerly a053fd5bad] [formerly 95451b2959 [formerly d95450f2eebc6b3d10093bd16736b349a1d0b12b]]]
Former-commit-id: 95451b2959
Former-commit-id: dab9e1379a [formerly 236a089297]
Former-commit-id: c8556a8a43
2014-08-15 11:01:23 -05:00
Roger Ferrel
89363c1216 Issue #3439 Changes to add new GFS data to Product and Volume Browser.
Change-Id: I6314cb1a99aada35290a52e03810d4d51b224a9d

Former-commit-id: 2223d9500e [formerly eef17da8cd] [formerly 2223d9500e [formerly eef17da8cd] [formerly 518ec99c00 [formerly 658976d6c9485a3abe4d8a5ba759897407ec1239]]]
Former-commit-id: 518ec99c00
Former-commit-id: 07d04569ec [formerly 9e84fd27a4]
Former-commit-id: b00dcca9c4
2014-08-13 14:40:13 -05:00
Steve Harris
106e45a937 Issue #3507 - Revert "Issue #2875 - Implemented HFR Surface Current Velocity."
This reverts commit 5a3f760b6f51d0561dd605388e6b025ebe70e330 [formerly 7ae3ca0bfc] [formerly 50e93daab7 [formerly 978349e517] [formerly 50e93daab7 [formerly 978349e517] [formerly 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]]].


Former-commit-id: 55a1120bdb [formerly dd9d117f90] [formerly 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]
Former-commit-id: e5af41fa86
Former-commit-id: 8c5cbf7224 [formerly 0739666ae9]
Former-commit-id: 9ce3fc1803
2014-08-12 10:19:12 -05:00
Slav Korolev
3687b20fe7 Issue #2875 - Implemented HFR Surface Current Velocity.
Former-commit-id: 50e93daab7 [formerly 978349e517] [formerly 50e93daab7 [formerly 978349e517] [formerly 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]]
Former-commit-id: 7ae3ca0bfc
Former-commit-id: 4ef0572c2d [formerly 14cf56ec46]
Former-commit-id: a3e480a756
2014-08-12 09:19:22 -04:00
Steve Harris
a0fdc76880 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: a92dc418c6 [formerly 0fb743ec44] [formerly a92dc418c6 [formerly 0fb743ec44] [formerly bf9a0fa5de [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]
Former-commit-id: bf9a0fa5de
Former-commit-id: b848e05aa1 [formerly 46fe792d83]
Former-commit-id: 5e2f7a9f74
2014-08-04 22:20:29 -05:00
Steve Harris
c1c551dc0b Merge branch 'master_14.3.1' (14.3.1-14) into omaha_14.3.1
Former-commit-id: 3a10442f6e [formerly 941efaf857] [formerly 3a10442f6e [formerly 941efaf857] [formerly 7a8cdaea54 [formerly f158314a854a081cb12cd15cab3f6340d5c0fb78]]]
Former-commit-id: 7a8cdaea54
Former-commit-id: e875a9ded5 [formerly 1cdfc11ce4]
Former-commit-id: 038cd986eb
2014-08-04 16:04:11 -05:00
Brian.Dyke
803ceadaec 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: 301f3094be [formerly 9abb02ea8a] [formerly 301f3094be [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: bbe6ec4d50 [formerly 37aacfcb96]
Former-commit-id: b9daa26f7d
2014-08-04 13:10:13 -04:00
Ben Steffensmeier
fe12b1d419 Issue #3455 Fix gridless grib models.
Former-commit-id: 1005d4d4b1 [formerly 7341c62f40] [formerly 1005d4d4b1 [formerly 7341c62f40] [formerly 12f84a9427 [formerly 1228b73957fc4a407e9075292faffeff3a84bdb4]]]
Former-commit-id: 12f84a9427
Former-commit-id: dd7791eb00 [formerly 5c437a4be9]
Former-commit-id: 06f70271f5
2014-07-30 16:44:07 -05:00
Ben Steffensmeier
7babff850d Omaha #3469 Improve logging of invalid grib1 files.
Former-commit-id: a8dd24f7fa [formerly fa77d8afc6] [formerly a8dd24f7fa [formerly fa77d8afc6] [formerly 95f16c448f [formerly 043b5709262c5cc01a280f48c61b17fed32c4b59]]]
Former-commit-id: 95f16c448f
Former-commit-id: df7e06527c [formerly a82cd38be2]
Former-commit-id: f78328708e
2014-07-30 16:32:57 -05:00
Brian Clements
334dd1a466 Omaha #3373 fixed jaxb pooling performance issues
Change-Id: Icf7949e956f2b21ba156f4f0a19a2c41d0037681

Former-commit-id: 6d2204c33e [formerly 37d97b9e48] [formerly 6d2204c33e [formerly 37d97b9e48] [formerly a20345bf50 [formerly 2ec52d8956b77aad30d46d7b4b2202c868b38a4d]]]
Former-commit-id: a20345bf50
Former-commit-id: 44a19a5df4 [formerly 6f8dc96c3d]
Former-commit-id: 65bda7536e
2014-07-21 17:05:29 -05:00
Ana Rivera
462749040d VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55

Former-commit-id: 9670521c07 [formerly c10b50d0b2] [formerly 9670521c07 [formerly c10b50d0b2] [formerly 088ebd2ca2 [formerly 9c3460d34513dd2f54643b87cb8afd122d94ea9c]]]
Former-commit-id: 088ebd2ca2
Former-commit-id: 5a764dff66 [formerly 752bc11851]
Former-commit-id: 0eb194e2bb
2014-07-21 21:41:17 +00:00
Roger Ferrel
d2f1b81551 Omaha #3344 Updated import for GRID_FILL_VALUE.
Former-commit-id: 8fdfb4b6e2 [formerly 3ce6447418] [formerly 8fdfb4b6e2 [formerly 3ce6447418] [formerly 88aa28c46b [formerly d490bc82905d37ad284485d30a493c1fd7e3ed6f]]]
Former-commit-id: 88aa28c46b
Former-commit-id: 2ab74b9b59 [formerly 805a26bbd0]
Former-commit-id: b439bc92aa
2014-07-14 17:01:32 -05:00
Juliya Dynina
dbed262c80 Merge "ASM #15557 - Restore ability to display HPCGuide2.5" into asm_14.2.2
Former-commit-id: b9cd9042dd [formerly ac39f9cb43] [formerly b9cd9042dd [formerly ac39f9cb43] [formerly 8d967f1ecf [formerly 9826716e2a5f59826e8a3789ca8d2d8f8dc58cce]]]
Former-commit-id: 8d967f1ecf
Former-commit-id: 15eef54b93 [formerly 6b490f5881]
Former-commit-id: 08098dfebd
2014-07-11 08:37:30 -05:00
Melissa Porricel
60bae53945 ASM #15557 - Restore ability to display HPCGuide2.5
Change-Id: Ibdcdd0aa95e406b5cd886dc8f51e74a3cde54d17

Change-Id: I5594c2151026247d48e657a30c7b4f94b14f036f

Former-commit-id: 1e5bef6820 [formerly d3c29b834d] [formerly 1e5bef6820 [formerly d3c29b834d] [formerly 1f7cf4a165 [formerly 5998e7ad9690e3b87805c75dcb711d299e8f1427]]]
Former-commit-id: 1f7cf4a165
Former-commit-id: c6a7e3bf85 [formerly 055dd5133f]
Former-commit-id: 408f192088
2014-07-10 16:15:12 -04:00
Richard Peter
1399f0cd57 Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
Former-commit-id: 4219dbeec8 [formerly ba1bd20407] [formerly 4219dbeec8 [formerly ba1bd20407] [formerly 8c17e9cef2 [formerly 3bbe66d8fe2faacc90c695822b61ffad9de0041f]]]
Former-commit-id: 8c17e9cef2
Former-commit-id: 3e19911306 [formerly 741fc59f34]
Former-commit-id: b4e4629d24
2014-07-07 09:39:28 -05:00
Nate Jensen
5a7e3697e4 Omaha #3165 fix grib logging imports
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021

Former-commit-id: e101d99ba2 [formerly bd46c43240] [formerly e101d99ba2 [formerly bd46c43240] [formerly 063ccb25e6 [formerly 12665e265f8490101099f96a84240b478e6f5a5f]]]
Former-commit-id: 063ccb25e6
Former-commit-id: 4cb1e42ddb [formerly 4dc36437fa]
Former-commit-id: 998c6e4253
2014-07-03 11:07:41 -05:00
Roger Ferrel
862a065051 Omaha #3318 Changes to add GEFS to volumen browser.
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e

Former-commit-id: 2723c92167 [formerly 02d9609862] [formerly 2723c92167 [formerly 02d9609862] [formerly 1869745cce [formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]]]
Former-commit-id: 1869745cce
Former-commit-id: 37c05adfaf [formerly 7f50b8fb93]
Former-commit-id: a7daeebc77
2014-07-02 14:27:28 -05:00
Richard Peter
5e343e9cf4 Merge "Omaha #3230 Recursive search for model files." into omaha_14.4.1
Former-commit-id: 57ec1df5a5 [formerly b8f2fddd95] [formerly 57ec1df5a5 [formerly b8f2fddd95] [formerly 8dfa9696af [formerly 956c4d9672e8706774d00f58e42b848c9917eb9f]]]
Former-commit-id: 8dfa9696af
Former-commit-id: 93ef55e65e [formerly d8687baba7]
Former-commit-id: b7db53b921
2014-07-01 16:03:36 -05:00
Richard Peter
342192e967 Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	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/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py

Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61

Former-commit-id: 6636b301e5 [formerly 93bbd98cbc] [formerly 6636b301e5 [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 552ac6d640 [formerly fc27824dbc]
Former-commit-id: 0fefdc7cd6
2014-07-01 15:34:39 -05:00
Roger Ferrel
481617bff0 Omaha #3230 Recursive search for model files.
Change-Id: Ia862269ddf42127fdd3b994da9320f99a6ff1c49

Former-commit-id: 69fab4d289 [formerly cd3720035d] [formerly 69fab4d289 [formerly cd3720035d] [formerly a8c93f7783 [formerly c4009c2b4e19c5c1d65a1844c12a7e63e9366b9b]]]
Former-commit-id: a8c93f7783
Former-commit-id: bb6e08ae2f [formerly f7fe138cc1]
Former-commit-id: 84fcb66cd0
2014-07-01 15:33:30 -05:00
Steve Harris
8fb747ad27 Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 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/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: 2f2958df37 [formerly d4dc1723c1] [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 7fb4663d75 [formerly dcbab5621f]
Former-commit-id: 71357da9d2
2014-07-01 11:08:46 -04:00
Slav Korolev
a8e4449248 Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
Former-commit-id: 6e60afd8cf [formerly b72f146d95] [formerly 6e60afd8cf [formerly b72f146d95] [formerly f6e8dedfa3 [formerly 834358236059cbabd11e89b2d43f7f1c621ce2e5]]]
Former-commit-id: f6e8dedfa3
Former-commit-id: 34d57cd15e [formerly 03890f03e3]
Former-commit-id: 99fc9b951a
2014-06-27 12:29:25 -04:00
Slav Korolev
81ae177c42 Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 41e8e36b8d [formerly 900d5e8fbe] [formerly 41e8e36b8d [formerly 900d5e8fbe] [formerly 79f2c0efc6 [formerly 4dc7f664a3e96a43392eee011bd453310d8e12ab]]]
Former-commit-id: 79f2c0efc6
Former-commit-id: 90ad46ac58 [formerly 3b9ed35eb0]
Former-commit-id: 0a006483ae
2014-06-26 14:04:34 -04:00
Roger Ferrel
f954d93c5a Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df

Former-commit-id: 32ae3ba73f [formerly bd2d40faee] [formerly 32ae3ba73f [formerly bd2d40faee] [formerly ad6eac6e20 [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]]]
Former-commit-id: ad6eac6e20
Former-commit-id: 6e37a43757 [formerly 801bdc8fc7]
Former-commit-id: 7fef8ed924
2014-06-26 11:16:09 -05:00
Steve Harris
a0d17947a9 Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: 97843cf58e [formerly 9213369739] [formerly 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]
Former-commit-id: e1c8ad2611
Former-commit-id: d7cd0ac02c [formerly 362988b9d7]
Former-commit-id: 8270fd8a9f
2014-06-16 08:19:12 -05:00
Slav Korolev
d6ef83e619 Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 8175aad0bf [formerly 2b877529ce] [formerly 8175aad0bf [formerly 2b877529ce] [formerly 16ec392c12 [formerly 0172e8f27b646a965e472f969f112a4e170d9f41]]]
Former-commit-id: 16ec392c12
Former-commit-id: fec8eb4fae [formerly d8ebeb4778]
Former-commit-id: a66dd879c7
2014-06-12 12:24:34 -04:00
Brian.Dyke
1ae1410e46 Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 0f07e14bf1 [formerly f72380ad60] [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 816dcf74e4 [formerly 49cd9574d9]
Former-commit-id: a4b39dfca5
2014-06-10 13:56:03 -04:00