Richard Peter
|
e5b9aa8b3f
|
Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: 04bf8666b3 [formerly e8bc97501b] [formerly 04bf8666b3 [formerly e8bc97501b] [formerly fa15d4ff21 [formerly 157588d388b9033424ddc46a22d74ccc302eea85]]]
Former-commit-id: fa15d4ff21
Former-commit-id: baabb4a12f [formerly d97655272f]
Former-commit-id: 26ee8506f5
|
2014-10-08 12:02:17 -05:00 |
|
Mark Peters
|
dffbaa684d
|
Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: dc27d9252c [formerly 3464751716] [formerly dc27d9252c [formerly 3464751716] [formerly 5ed537572a [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]]
Former-commit-id: 5ed537572a
Former-commit-id: 82e2a2bbb5 [formerly c50ae98b5f]
Former-commit-id: c2173b1925
|
2014-10-07 11:42:44 -05:00 |
|
Roger Ferrel
|
861da21f34
|
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: 2f8d5263b9 [formerly dfbf07f377] [formerly 2f8d5263b9 [formerly dfbf07f377] [formerly d4ef865375 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]]]
Former-commit-id: d4ef865375
Former-commit-id: 05c00c7bc7 [formerly 96f484e323]
Former-commit-id: 7afe6d2df6
|
2014-10-06 15:34:30 -05:00 |
|
Steve Harris
|
afd3d3fa2d
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 06a27b2d3c [formerly 39c5e9c314] [formerly 06a27b2d3c [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]
Former-commit-id: 2db03d95b3
Former-commit-id: bcf1265a16 [formerly 3542caf090]
Former-commit-id: cfd49c8ca0
|
2014-10-06 13:57:59 -05:00 |
|
Brian.Dyke
|
e100894074
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 006bdb00ad [formerly 65ad6056b6] [formerly 006bdb00ad [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]
Former-commit-id: f3f95aabb0
Former-commit-id: d174db3b0c [formerly e77f1e126e]
Former-commit-id: 1d2dfd264a
|
2014-10-02 10:38:51 -04:00 |
|
dmsys
|
71d6e48473
|
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: f704781f4f [formerly 8c3625cfec] [formerly f704781f4f [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]
Former-commit-id: 9f4560c480
Former-commit-id: 07f84c6b26 [formerly b884e5e32d]
Former-commit-id: e00ea2d8cd
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
4c4380580f
|
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: 3598e9b5b6 [formerly 90e08b96e1] [formerly 3598e9b5b6 [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 842abaad49 [formerly 6330a62e85]
Former-commit-id: 30f0d27dfb
|
2014-09-29 12:58:56 -05:00 |
|
Brian.Dyke
|
b481c3f064
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 396f9755dc [formerly 1ac61fb612] [formerly 396f9755dc [formerly 1ac61fb612] [formerly f26fe97ec4 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]]
Former-commit-id: f26fe97ec4
Former-commit-id: f6af0dd0df [formerly 33525968e3]
Former-commit-id: 4359e8dc47
|
2014-09-26 14:19:03 -04:00 |
|
Ana Rivera
|
ab3de760b0
|
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: e55855b4ff [formerly d96f5fe229] [formerly e55855b4ff [formerly d96f5fe229] [formerly a72725f9ef [formerly 833cff4f37542078578de96b3b59723f77c31f4c]]]
Former-commit-id: a72725f9ef
Former-commit-id: 1b94e7fdb2 [formerly dd45d98a0e]
Former-commit-id: 97ae16163f
|
2014-09-25 17:46:53 +00:00 |
|
Brian.Dyke
|
c22973f909
|
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: b49b13f77e [formerly 4b418918d4] [formerly b49b13f77e [formerly 4b418918d4] [formerly 87fa32d2d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]
Former-commit-id: 87fa32d2d4
Former-commit-id: cf8f88a5b3 [formerly 1f09dad9e9]
Former-commit-id: 8997f79ae4
|
2014-09-24 11:05:37 -04:00 |
|
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 |
|
Brian.Dyke
|
caa450388a
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 813d2be68e [formerly 88d5f872ae] [formerly 813d2be68e [formerly 88d5f872ae] [formerly 9435507b27 [formerly aaae61509d743553186cdefdea0557158b139527]]]
Former-commit-id: 9435507b27
Former-commit-id: c94cc5fe38 [formerly 1b8af8379f]
Former-commit-id: ebbb7003d9
|
2014-09-19 13:14:13 -04:00 |
|
Mark Peters
|
494a7bc745
|
Omaha #3300 Merge fixes for 14.4.1
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd
Former-commit-id: e99d90307b [formerly 048e8339fd] [formerly e99d90307b [formerly 048e8339fd] [formerly 26e4f86248 [formerly 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1]]]
Former-commit-id: 26e4f86248
Former-commit-id: 16961860a8 [formerly c49df63363]
Former-commit-id: 08a3acb2d4
|
2014-09-19 12:01:07 -05:00 |
|
Darrel Kingfield
|
11fd795d32
|
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: 3eeaa8f359 [formerly 1cabae50b1] [formerly 3eeaa8f359 [formerly 1cabae50b1] [formerly 88a8dddef3 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]]]
Former-commit-id: 88a8dddef3
Former-commit-id: b5e546503c [formerly 00a056c154]
Former-commit-id: 142edfe588
|
2014-09-19 11:14:09 -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 |
|
Ana Rivera
|
2302527f91
|
VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06
Former-commit-id: 2a25376398 [formerly 9d8c08a09a] [formerly 2a25376398 [formerly 9d8c08a09a] [formerly 56f409717f [formerly 3af534fb2778268fee650c09c5aa0346df746ce8]]]
Former-commit-id: 56f409717f
Former-commit-id: 9bc42712de [formerly 030d8c45b7]
Former-commit-id: c12eb3b106
|
2014-09-19 15:17:46 +00: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 |
|
Brian.Dyke
|
ccf0104c8b
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 45e7435494 [formerly 21fedc3565] [formerly 45e7435494 [formerly 21fedc3565] [formerly 83099ee81f [formerly ab9b7ec5424512656d2fb343773fa97658c04ecd]]]
Former-commit-id: 83099ee81f
Former-commit-id: d56c30fb40 [formerly 997a7f528f]
Former-commit-id: e97f5bc086
|
2014-09-12 14:11:57 -04:00 |
|
Ana Rivera
|
3a09bf0228
|
VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671
Change-Id: I9708b606e5a7d2c2fc9355d765fbad9113a40493
Former-commit-id: b83fd7501f [formerly 09152bc49b] [formerly b83fd7501f [formerly 09152bc49b] [formerly 909f4d8632 [formerly 94e5089beb782011d107de4aeeb8b35694f2f5c3]]]
Former-commit-id: 909f4d8632
Former-commit-id: df869efb23 [formerly 84538be9a1]
Former-commit-id: 29f8ade06b
|
2014-09-11 21:17:43 +00: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 |
|
Baoyu Yin
|
7ee5c5a36c
|
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: db7c16b305 [formerly 3e39cd9bb5] [formerly db7c16b305 [formerly 3e39cd9bb5] [formerly 7008216976 [formerly 61838d538f73adb6279ba55d5fe3c5b02d3a28f4]]]
Former-commit-id: 7008216976
Former-commit-id: aaffd08d53 [formerly 340e242ee8]
Former-commit-id: b1d682a92e
|
2014-09-05 11:18:54 -04:00 |
|
Baoyu Yin
|
6a427f968c
|
VLab Issue #4608 - AWIPS2_DR_16259 Minor Typo in Volume Menu of D2D 4-PanelFamilies ; fixes #4608
Change-Id: I73a3f5a441e33dffe3dc7f3962c3fceec930ce3a
Former-commit-id: 5ad996e60e [formerly 9e110936e8] [formerly 5ad996e60e [formerly 9e110936e8] [formerly 73f7935f46 [formerly cb4e2e652ba3763725b8ec7e6d528748d2472a6b]]]
Former-commit-id: 73f7935f46
Former-commit-id: 83de62e506 [formerly 17268bb5dd]
Former-commit-id: 8a9ec04c80
|
2014-09-04 08:23:53 -04: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 |
|
Nate Jensen
|
070ef331b9
|
Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: e673ed62bd [formerly 2c209af1fa] [formerly e673ed62bd [formerly 2c209af1fa] [formerly fe457e89a7 [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]]
Former-commit-id: fe457e89a7
Former-commit-id: 675bf92355 [formerly 5661124038]
Former-commit-id: 84a107c8fa
|
2014-09-02 09:53:25 -05:00 |
|
Mark Peters
|
9cab14d5b6
|
Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9
Former-commit-id: 86b9016338 [formerly 097ce54969] [formerly 86b9016338 [formerly 097ce54969] [formerly 91f2b365a1 [formerly a0864eff6efa679cdc0f58cd408102e32145f22c]]]
Former-commit-id: 91f2b365a1
Former-commit-id: abd256ab93 [formerly 54f9a37e6c]
Former-commit-id: a3c382c0f7
|
2014-08-29 15:05:29 -05: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 |
|
Roger Ferrel
|
87b0200274
|
Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
Former-commit-id: 0147449477 [formerly fa42c4069a] [formerly 0147449477 [formerly fa42c4069a] [formerly 9154ef60bb [formerly 474e07b299246aee4e6b214226c176c4a10aa866]]]
Former-commit-id: 9154ef60bb
Former-commit-id: 17a8bd795d [formerly 63a1b2890b]
Former-commit-id: 6e695a12d1
|
2014-08-27 15:06:52 -05: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 |
|
Mark Peters
|
2d9e8e0553
|
Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override
Change-Id: Ic4a3a517327944f6c6ef7b20bc1774bca6c39d0e
Former-commit-id: c7486f3952 [formerly 7b37c4d188] [formerly c7486f3952 [formerly 7b37c4d188] [formerly 6634a2df01 [formerly 449f167ce1c30a595b4b673fc4d71658500e844d]]]
Former-commit-id: 6634a2df01
Former-commit-id: 1c0e5a7d35 [formerly f1d31723c7]
Former-commit-id: c069dd338a
|
2014-08-25 13:50:27 -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 |
|
Brian.Dyke
|
5f3b50a3c9
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR - LevelMappingFile.xml
Former-commit-id: 0c10dc2ee0 [formerly f52f2b1c25] [formerly 0c10dc2ee0 [formerly f52f2b1c25] [formerly aa6e025b14 [formerly 93c1663761e65e870262bc4fdf4028b08e20c85a]]]
Former-commit-id: aa6e025b14
Former-commit-id: 331cb68011 [formerly 02e1b34afb]
Former-commit-id: 19fa7abdc0
|
2014-08-18 14:18:05 -04: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 |
|
Mark Peters
|
cb3359b2c7
|
Omaha #3483 Split Volume Browser fields menus into multiple reusable components.
Change-Id: Iafc693449e6e73d6223667d69ecec6114e13831a
Former-commit-id: e50440d2da [formerly a53ee64723] [formerly e50440d2da [formerly a53ee64723] [formerly d793e6005f [formerly 2df45cb19e0a176190e2da8b954e67ec156acf5c]]]
Former-commit-id: d793e6005f
Former-commit-id: 4b2568df0f [formerly 153c08c9b4]
Former-commit-id: 072f47922f
|
2014-08-14 17:40:26 -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 |
|
Baoyu Yin
|
b2c76ef84e
|
VLab Issue #4395 - AWIPS2_DR_17383 Volume Browser missing 50mb and 100mb layers; closes #4395
Change-Id: I1fff3834c00c2807f3b3f286f51ba4d5b6e65ca9
Former-commit-id: 08613c1541 [formerly a480966975] [formerly 08613c1541 [formerly a480966975] [formerly ab6421ed60 [formerly 053ab9de9f5d9e6a881c8211efa02e5f659818ab]]]
Former-commit-id: ab6421ed60
Former-commit-id: 18c0d7ba47 [formerly 7c74c1e141]
Former-commit-id: c7cbed56a7
|
2014-08-08 15:18:25 -04:00 |
|
Mark Peters
|
cbc69af4f1
|
Omaha #3483 Split Volume Browser fields menus into multiple reusable components.
Change-Id: I708204d02f566c6e2ce8b7867908ea200aa07baa
Former-commit-id: 42cfd9018d [formerly 53586ec52c] [formerly 42cfd9018d [formerly 53586ec52c] [formerly f930f1032f [formerly f44418a1e872dfea47a94325306198b65e5e0214]]]
Former-commit-id: f930f1032f
Former-commit-id: cc524668f6 [formerly 8da4bc58ca]
Former-commit-id: e136d6b85d
|
2014-08-06 16:35:32 -05:00 |
|
Brian Clements
|
8a256eb228
|
Omaha #3410 changed lon/lat fields to floats in sfc and air obs location
Change-Id: I4c8d47b9f9e598e69309f1aa99bc30c022cae7af
Former-commit-id: a7d17bd490 [formerly aa991c9223] [formerly a7d17bd490 [formerly aa991c9223] [formerly 74a6c3dd20 [formerly cdb0a72fcb2345564f2b944fdecd7869fd498767]]]
Former-commit-id: 74a6c3dd20
Former-commit-id: 5977b049c1 [formerly 10ea02b936]
Former-commit-id: 053cf978a7
|
2014-07-24 13:45:58 -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
|
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 |
|
Slav Korolev
|
5395df01c9
|
Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: cd740de298 [formerly 1b870e21fc] [formerly cd740de298 [formerly 1b870e21fc] [formerly 1956077e1a [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]]]
Former-commit-id: 1956077e1a
Former-commit-id: e8811128fc [formerly 0f5a2c0233]
Former-commit-id: a78f0ea765
|
2014-06-30 09:40:32 -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 |
|
Lee Venable
|
09c582a70a
|
Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client.
Former-commit-id: 6418906d23 [formerly 2401caa24f] [formerly 6418906d23 [formerly 2401caa24f] [formerly a176a26618 [formerly 363ddb4af1075686fc5a1d80df884f59d93d7b99]]]
Former-commit-id: a176a26618
Former-commit-id: db11f9af58 [formerly ab5d8d6204]
Former-commit-id: da158b0d70
|
2014-06-23 15:37:10 -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 |
|