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

162 commits

Author SHA1 Message Date
Loubna.Bousaidi
a79e03654c ASM #14246 - Implemented MPE Transmit Best Estimate option 
Change-Id: If6dc3df81ecfee998ebcc4de8ee47ddc2466868e

Former-commit-id: f2476cae94 [formerly 4a769ef560 [formerly 212076c520952d0327591b79449ae09ad063adf1]]
Former-commit-id: 4a769ef560
Former-commit-id: 79ae030ca6
 2015-01-08 15:31:58 +00:00
Steve Harris
6900bb61c1 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: 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 90e08b96e1
Former-commit-id: 3598e9b5b6
 2014-09-29 12:58:56 -05:00
Steve Harris
db4aa1cebe 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: b979960b7b [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]
Former-commit-id: 7692e3f21d
Former-commit-id: 2e2072a963
 2014-09-23 11:41:10 -05:00
Brian.Dyke
32d63dff6f Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 8d665b93b5 [formerly 4db67c581c [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]]
Former-commit-id: 4db67c581c
Former-commit-id: 75f3bb31d5
 2014-09-19 16:56:50 -04:00
Steve Harris
e3a7796362 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: 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 091555cf10
Former-commit-id: da530db540
 2014-09-19 10:28:57 -05:00
Brian.Dyke
736ac16cb3 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 8b0603cdb8 [formerly c6b0adfc53 [formerly de22db308f36c42d5c7e0989dbd7decfaaf3adbb]]
Former-commit-id: c6b0adfc53
Former-commit-id: e70a9db68c
 2014-09-18 12:43:01 -04:00
Chip Gobs
bf7643c622 VLab Issue #4611 
Adding missing changed file.

Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e

Former-commit-id: 31efce6b8f [formerly 0d046a56e8 [formerly e68f56628f035ca2a20848a0e76f6efa8bbe1e8a]]
Former-commit-id: 0d046a56e8
Former-commit-id: 0e4b8d2e9b
 2014-09-18 12:12:42 -04:00
Brian.Dyke
967056afbb Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 97fc11f099 [formerly cb7a266271 [formerly dcfe2369455e6b7f27039418b090c9c577400a63]]
Former-commit-id: cb7a266271
Former-commit-id: c44811098f
 2014-09-17 14:39:56 -04:00
Brian.Dyke
eb63c3e61a Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: 1541e4c255 [formerly 216f34fb25 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]]
Former-commit-id: 216f34fb25
Former-commit-id: 54b26b3616
 2014-09-15 10:46:25 -04:00
Max Schenkelberg
740d777efc Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication 
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb

Former-commit-id: 994605c1ce [formerly 3ea9b1b4be [formerly 154c4ac7131ae8f533d4080055d9afe257bf0506]]
Former-commit-id: 3ea9b1b4be
Former-commit-id: 422ceffbdd
 2014-09-10 15:43:19 -05:00
Brian.Dyke
d8271549ff 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: 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]
Former-commit-id: 3d9a3de6e4
Former-commit-id: fe85eb9f70
 2014-09-09 11:44:30 -04:00
Chip Gobs
0ac737c5a8 Merge "VLab Issue #4612 Fix for Redmine O&M DR 283 concerning the faulty ability of a user to select filtered out stations when performing quality code operations in MPE in GroupEdit Mode." into ohd_14.3.1 
Former-commit-id: ec3ff24577 [formerly bbc346e29e [formerly 3ad2b50520a7a8fdfaa1a99a1f34570e43d0164e]]
Former-commit-id: bbc346e29e
Former-commit-id: 83e0a41593
 2014-09-08 14:29:28 -04:00
Chip Gobs
8167002c9e Merge "VLab Issue #4602 Fixes MPE Gage Table Data Reading problem introduced in a earlier 14.3.1 build, a.k.a Redmine O&M DR 16699" into ohd_14.3.1 
Former-commit-id: cf0816edce [formerly 780f484a56 [formerly 57614e9869d5a36c80b8d988e8fea4136045a982]]
Former-commit-id: 780f484a56
Former-commit-id: bc2962c9ce
 2014-09-08 14:28:33 -04:00
Chip Gobs
fdaf0ce78b VLab Issue #4612 
Fix for Redmine O&M DR 283 concerning the faulty ability of a user to select filtered out stations when
performing quality code operations in MPE in GroupEdit Mode.

Change-Id: Ib8da13cfa2085aeb6efba96e7a1789912534bddd

Former-commit-id: 874db74c54 [formerly f7624b0609 [formerly 7df28e4d5c1d8a03db5500939b0af2905d11a4aa]]
Former-commit-id: f7624b0609
Former-commit-id: a06a4667a3
 2014-09-08 12:37:20 -04:00
Chip Gobs
a465c9964c VLab Issue #4611 
Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved,
instead of after the ColorScaleManager is closed.

Change-Id: I0156612302853141392c263eab8b54a16c3be7a3

Former-commit-id: 25e4ed8d51 [formerly 8c6e70ccab [formerly 44f6bf08a72b5450d6d0db40ff49dd5123cf811c]]
Former-commit-id: 8c6e70ccab
Former-commit-id: 69450976c8
 2014-09-08 12:06:45 -04:00
Chip Gobs
fe27c0080d VLab Issue #4602 
Fixes MPE Gage Table Data Reading problem introduced in a earlier 14.3.1 build, a.k.a Redmine O&M DR 16699

Change-Id: I12b879fb873f66d43d7f735165fa4f303c026174

Former-commit-id: 4911ac1917 [formerly fc8a7d48ca [formerly 4d87ebeef93e561a303566853fd2616316c568ca]]
Former-commit-id: fc8a7d48ca
Former-commit-id: da10a7b4ac
 2014-09-08 11:44:48 -04:00
steve.naples
bf9924b0e9 ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC 
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138

Former-commit-id: ff52f1dc0a [formerly 1856a05319 [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]
Former-commit-id: 1856a05319
Former-commit-id: 4205d83452
 2014-08-28 16:08:17 +00:00
Loubna.Bousaidi
281f16d700 ASM #511 changes to transmit_rfc_bias calls from MPE 
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: d41e489ced [formerly 8c15d1f124 [formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]]
Former-commit-id: 8c15d1f124
Former-commit-id: afae4700a6
 2014-08-15 10:54:10 -05:00
Nate Jensen
d61c65787b Omaha #3356 cleanup of unnecessary register buddies and buddy policies 
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: 9b72a1399d [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]
Former-commit-id: b3083a663e
Former-commit-id: 253198b5bc
 2014-08-14 10:22:37 -05:00
Mark Peters
8231790215 Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape() 
Change-Id: Ie521a2041586825b9fb995a675e5caa550fa5313

Former-commit-id: 8e7d6964c6 [formerly 58dd0873e3 [formerly 0df04ef8a5b4eee4398a411fc02baba22f719eaf]]
Former-commit-id: 58dd0873e3
Former-commit-id: 1d0983cd4a
 2014-08-13 12:22:47 -05:00
Mark Peters
4ab3b14b30 Omaha #3504 Replace Raytheon references to IODataPreparer 
Change-Id: I376f430154996944bd49c2e72d89e57537b68084

Former-commit-id: 5b3893c56f [formerly ca0df210d9 [formerly 08621067f8046b4260e87583d16950fee1e741de]]
Former-commit-id: ca0df210d9
Former-commit-id: 70a7f2215f
 2014-08-12 12:15:35 -05:00
Steve Harris
d606269c5b 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: bf9a0fa5de [formerly 0fb743ec44 [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]
Former-commit-id: 0fb743ec44
Former-commit-id: a92dc418c6
 2014-08-04 22:20:29 -05:00
Brian.Dyke
770b56e740 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: 7fbb3b6a54 [formerly 6f6daaa249 [formerly f22cc09d0a6fdc7a806726d5207f6b3507972b94]]
Former-commit-id: 6f6daaa249
Former-commit-id: 8ea5c4f98b
 2014-08-04 16:40:02 -04:00
Mark Peters
1342f67614 Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape() 
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9

Former-commit-id: 88b334cf14 [formerly 22c077d77f [formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]]
Former-commit-id: 22c077d77f
Former-commit-id: 9be02c8dfe
 2014-08-04 13:27:45 -05:00
Brian.Dyke
590e37a8f2 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: 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]
Former-commit-id: 9abb02ea8a
Former-commit-id: 301f3094be
 2014-08-04 13:10:13 -04:00
Mark Peters
6376572795 Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine() 
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf

Former-commit-id: bac12d844b [formerly 437e127ebc [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]
Former-commit-id: 437e127ebc
Former-commit-id: 11abefd4de
 2014-07-29 11:20:53 -05:00
Nate Jensen
76d8ae8fd9 Merge "Omaha #3422 Update plug-in version number and java version for viz.hydrocommon and viz.mpe.ui" into omaha_14.4.1 
Former-commit-id: d5b929d5c1 [formerly 9ec259d7df [formerly 13ad27128cd4a29bb559d6911f870b15f447fdf5]]
Former-commit-id: 9ec259d7df
Former-commit-id: 9568761800
 2014-07-24 14:53:47 -05:00
Mark Peters
ecbed2c37e Omaha #3422 Update plug-in version number and java version for viz.hydrocommon and viz.mpe.ui 
Change-Id: I2f8799c32a11ed636f714c0bfe304c5248f48a98

Former-commit-id: 627ecd28e1 [formerly 53042a9bf7 [formerly 02b964ae1e7490cc9124dcd70d6806881396a692]]
Former-commit-id: 53042a9bf7
Former-commit-id: 5eacdbc13b
 2014-07-24 14:38:59 -05:00
Mark Peters
38a41fa367 Omaha #3422 Move HydroPointResource and HydroPointResourceData to MPE plugin 
Change-Id: I222f99b0b952d9cef91208eb27f6adca43e13669

Former-commit-id: 29bc0fae50 [formerly 92b1e9a9cf [formerly 7929e5b809d83a0f682e9f1c6953c9a090ed7310]]
Former-commit-id: 92b1e9a9cf
Former-commit-id: 85bf675f6a
 2014-07-22 14:57:35 -05:00
steve.naples
72ae26401d ASM #253 Update RadarBiasTableDialog fix issue of not saving undo. 
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88

Former-commit-id: 0bd7b6c65b [formerly 339fcbc18a [formerly 24b9a6e0801cc653062a71d86090df3836aa86a4]]
Former-commit-id: 339fcbc18a
Former-commit-id: 2ebfd61f12
 2014-07-09 15:42:51 +00:00
steve.naples
9dcf27e217 ASM #253 Update RadarBiasTableDialog fix issue of not saving. 
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673

Former-commit-id: 24b0d49a5b [formerly 75969ceec2 [formerly 9021eca6b32dd2b3859cd928c14a0e40a4907c13]]
Former-commit-id: 75969ceec2
Former-commit-id: 29ca2338b8
 2014-07-08 16:32:08 +00:00
steve.naples
e82b0ae895 ASM #253 Update RadarBiasTableDialog to remove old code. 
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f

Former-commit-id: 4e959af1b4 [formerly 66c3241bc4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]
Former-commit-id: 66c3241bc4
Former-commit-id: 3d75da3db0
 2014-07-02 15:30:48 +00:00
steve.naples
e24fdc9457 ASM #665 Updated getCv_use in DisplayFieldData class to return name 
Change-Id: I1acbe41ca6a11794ff2f3cc4234422b78a39b0d2

Former-commit-id: 6d1b26c5f4 [formerly 34956449ef [formerly 324ee4e77b4b6ff1a7f1385fde1a44c13aa86570]]
Former-commit-id: 34956449ef
Former-commit-id: c484574dd5
 2014-06-30 17:41:43 +00:00
steve.naples
e994aa9482 ASM #253 Update RadarBiasTableDialog to allow undo changes. 
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9

Former-commit-id: 90ed511478 [formerly efe877d82b [formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]
Former-commit-id: efe877d82b
Former-commit-id: 2a49bbda2f
 2014-06-24 15:52:23 +00:00
Steve Harris
2b95865dec Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so

Former-commit-id: 455eb8b39d [formerly 7fec0d039c [formerly 45250149681f057cf168f4d3cb27276279f62c05]]
Former-commit-id: 7fec0d039c
Former-commit-id: 647cd97e29
 2014-06-02 11:21:46 -05:00
Brian.Dyke
5524d6b38d Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: 3f1e12effc [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]
Former-commit-id: a8737e18f0
Former-commit-id: a0a879be7d
 2014-05-30 10:46:25 -04:00
Nate Jensen
424c3c1334 Omaha #3133 Removed dead hydro code and related dependencies 
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a

Former-commit-id: 67ac5fa242 [formerly 514c9d3a0c [formerly 13d3dc45edab66106e9aa5a1149ca05e94d144c3]]
Former-commit-id: 514c9d3a0c
Former-commit-id: a984e7ac9a
 2014-05-27 18:23:38 -05:00
brian.dyke
4d161aaf90 Merge branch 'master_14.3.1-4' into asm_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]
Former-commit-id: 011d121e4b
Former-commit-id: 9626317825
 2014-05-19 09:45:37 -04:00
Chip Gobs
a95de2211a VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) ) 
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: e42bef2a33 [formerly 65d2135ac2 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]
Former-commit-id: 65d2135ac2
Former-commit-id: 4e4d00792d
 2014-05-06 10:48:35 -04:00
steve.naples
b98b7f41b1 ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value. 
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316

Former-commit-id: 8a00348730 [formerly b58b7d3d5a [formerly 2f608451c941efcc5372f0d0870ac72409f518e3]]
Former-commit-id: b58b7d3d5a
Former-commit-id: a7092ac01d
 2014-05-02 16:15:04 +00:00
Juliya Dynina
a24fdff32a Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1 
Former-commit-id: 78bb549533 [formerly d37490acb1 [formerly a129795302a562e68638bb5e5764f54a8dcc331e]]
Former-commit-id: d37490acb1
Former-commit-id: 00bbbf32c1
 2014-04-30 07:41:27 -05:00
Loubna.Bousaidi
c064fb3ae4 ASM #511 changes to transmit_rfc_bias calls from MPE 
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: 6d526cb1ff [formerly 760ee964d6 [formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]]
Former-commit-id: 760ee964d6
Former-commit-id: 1b5bccc451
 2014-04-29 21:09:34 +00:00
Richard Peter
8b1a177110 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 44b1782461
Former-commit-id: 67683dd891
 2014-04-28 16:27:40 -05:00
brian.dyke
a43a0922ba Merge branch 'master_14.3.1' into asm_14.3.1 
Merge 14.3.1-2 into ASM


Former-commit-id: 4621d66089 [formerly 8bda882ed0 [formerly 29bcb6987ee371f128b75eee84b65574d799135f]]
Former-commit-id: 8bda882ed0
Former-commit-id: ffad42f2ef
 2014-04-28 13:25:41 -04:00
steve.naples
00c78e9047 ASM #528 Updated DrawPolygonDlg to remember location when opened and closed. 
Change-Id: I19ec2f2e1898506387d053b8ada80d2d2d67cf7c

Former-commit-id: 760fc00028 [formerly e0b6f674f3 [formerly ae0616b0b71e0d1952f2c3e8f461a4d8e79e934f]]
Former-commit-id: e0b6f674f3
Former-commit-id: 58b091e37b
 2014-04-28 13:55:21 +00:00
Brian.Dyke
362d882b40 Merge branch 'master_14.2.2' into master_14.3.1 
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	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
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: fb1f5aa593
Former-commit-id: f0b8ea5822
 2014-04-25 11:06:11 -04:00
Mike Duff
dd24e15b53 Issue #3025 - Fix incorrect sort algorithm. 
Change-Id: Ied1ec59a8703c1f7476793d3896a253ec6aa2707

Former-commit-id: b1a4f69578 [formerly 0b9f8ce7f1 [formerly 9c275288183b93ba5cac991dbbdf72bdf122ad0a]]
Former-commit-id: 0b9f8ce7f1
Former-commit-id: a17f187929
 2014-04-17 09:55:45 -05:00
Richard Peter
9b12d9ddaf Merge branch 'omaha_14.2.2' (14.2.2-3) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.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.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]
Former-commit-id: 3575d6586f
Former-commit-id: cd51f3fa87
 2014-04-11 16:23:09 -05:00
brian.dyke
c75dba32e9 Merge branch 'master_14.2.2' into asm_14.2.2 
Former-commit-id: a8d6d58f31 [formerly 6575f77fe3 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]
Former-commit-id: 6575f77fe3
Former-commit-id: 6a9ccba393
 2014-04-11 10:58:48 -04:00
steve.naples
5d7cf6c098 ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly. 
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5

Former-commit-id: 7624f7ab75 [formerly f6636a3dd7 [formerly 1c71a34944c7d823742b98dc65e19fe1f478eef0]]
Former-commit-id: f6636a3dd7
Former-commit-id: 75be620d0d
 2014-04-04 15:30:18 +00:00