Steve Harris
10752cbc42
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: 6900bb61c13598e9b5b690e08b96e16900bb61c13598e9b5b690e08b96e13b6a8a144790e08b96e13b6a8a1447e9774e46ea842abaad496330a62e8530f0d27dfb4c4380580f
2014-09-29 12:58:56 -05:00
Steve Harris
07c7b38a12
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: db4aa1cebe2e2072a9637692e3f21ddb4aa1cebe2e2072a9637692e3f21db979960b7b7692e3f21db979960b7b4c7af33eeee5f8a8f74f50d6dccd09f831536854d3169a96b0
2014-09-23 11:41:10 -05:00
Brian.Dyke
c193a1f5fa
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 32d63dff6f75f3bb31d54db67c581c32d63dff6f75f3bb31d54db67c581c8d665b93b54db67c581c8d665b93b5bcc56046bf12bf31b5bab83e12da28c4d7c97897763439c814
2014-09-19 16:56:50 -04:00
Steve Harris
b316e73f24
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: e3a7796362da530db540091555cf10e3a7796362da530db540091555cf104c56844e29091555cf104c56844e29a1bf8ecdb184a98ec4ca214b48dcb8fdc523a026f4ea796cea
2014-09-19 10:28:57 -05:00
Brian.Dyke
9a174527da
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 736ac16cb3e70a9db68cc6b0adfc53736ac16cb3e70a9db68cc6b0adfc538b0603cdb8c6b0adfc538b0603cdb84e12c6c6b387dfb0e978d5f57cd98e37ffb37db664435ea860
2014-09-18 12:43:01 -04:00
Chip Gobs
2480df5ca0
VLab Issue #4611
...
Adding missing changed file.
Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e
Former-commit-id: bf7643c6220e4b8d2e9b0d046a56e8bf7643c6220e4b8d2e9b0d046a56e831efce6b8f0d046a56e831efce6b8fe8d6084ce5aa838b2230a287a95ef9552430bda035439f3173
2014-09-18 12:12:42 -04:00
Brian.Dyke
cbe3c68b5b
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 967056afbbc44811098fcb7a266271967056afbbc44811098fcb7a26627197fc11f099cb7a26627197fc11f09919b21d9ccb050fb83ec8e8e25492848f0d1e9dc5484ebfd9c9
2014-09-17 14:39:56 -04:00
Brian.Dyke
c8f3fbfa22
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: eb63c3e61a54b26b3616216f34fb25eb63c3e61a54b26b3616216f34fb251541e4c255216f34fb251541e4c255f2750cb31f5115becdefffa56ef95026b193881355a25f2525
2014-09-15 10:46:25 -04:00
Max Schenkelberg
2ded35ed7c
Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
...
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb
Former-commit-id: 740d777efc422ceffbdd3ea9b1b4be740d777efc422ceffbdd3ea9b1b4be994605c1ce3ea9b1b4be994605c1ce2bbd8ed131165583b1443b1a3f84fd144e042b42a2e7d1324f
2014-09-10 15:43:19 -05:00
Brian.Dyke
74f3dd287f
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: d8271549fffe85eb9f703d9a3de6e4d8271549fffe85eb9f703d9a3de6e401dfe503f53d9a3de6e401dfe503f5331985388629364e2b9fc42733eb39a31d3d702e0f9fe8301a
2014-09-09 11:44:30 -04:00
Chip Gobs
54ed1f28ff
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: 0ac737c5a883e0a41593bbc346e29e0ac737c5a883e0a41593bbc346e29eec3ff24577bbc346e29eec3ff245778e3f815f9e1af9261db2272690ed5ad0810673a4cbbe589afe
2014-09-08 14:29:28 -04:00
Chip Gobs
2aed9e6bc3
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: 8167002c9ebc2962c9ce780f484a568167002c9ebc2962c9ce780f484a56cf0816edce780f484a56cf0816edce20830b955fb41aef6d84edef86ba43d00048b40fe37cf3ecf7
2014-09-08 14:28:33 -04:00
Chip Gobs
a2e01e8d55
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: fdaf0ce78ba06a4667a3f7624b0609fdaf0ce78ba06a4667a3f7624b0609874db74c54f7624b0609874db74c547473ccce7e7bda177305ee70ab2956b2319cd60a07ce013d2c
2014-09-08 12:37:20 -04:00
Chip Gobs
1b51729356
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: a465c9964c69450976c88c6e70ccaba465c9964c69450976c88c6e70ccab25e4ed8d518c6e70ccab25e4ed8d5113eebb6672689ccd9fcf215f1dfaa19bf30e3dbdb2f957c4d4
2014-09-08 12:06:45 -04:00
Chip Gobs
337c8f9237
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: fe27c0080dda10a7b4acfc8a7d48cafe27c0080dda10a7b4acfc8a7d48ca4911ac1917fc8a7d48ca4911ac191712ea1be41c6d5926df357c6f9b3ad9f50b09855f3e23c79eea
2014-09-08 11:44:48 -04:00
steve.naples
33e95d1e49
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
...
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: bf9924b0e94205d834521856a05319bf9924b0e94205d834521856a05319ff52f1dc0a1856a05319ff52f1dc0a899ff325481532c683a1211e9f75463f11e8277203f50a48f1
2014-08-28 16:08:17 +00:00
Loubna.Bousaidi
54c46422a5
ASM #511 changes to transmit_rfc_bias calls from MPE
...
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: 281f16d700afae4700a68c15d1f124281f16d700afae4700a68c15d1f124d41e489ced8c15d1f124d41e489cedea83b54df2d9be7127bc5cc9b0889065cfa4e033af004872fd
2014-08-15 10:54:10 -05:00
Nate Jensen
f7ae70ac02
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
...
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: d61c65787b253198b5bcb3083a663ed61c65787b253198b5bcb3083a663e9b72a1399db3083a663e9b72a1399de7b11aaf8858a4cb95c1d67083655a951feab33d7336692b85
2014-08-14 10:22:37 -05:00
Mark Peters
d3e09d5479
Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape()
...
Change-Id: Ie521a2041586825b9fb995a675e5caa550fa5313
Former-commit-id: 82317902151d0983cd4a58dd0873e382317902151d0983cd4a58dd0873e38e7d6964c658dd0873e38e7d6964c63f943645374ca6e07182c823ff5bc3824ebff454019a89bcaf
2014-08-13 12:22:47 -05:00
Mark Peters
ad25464a52
Omaha #3504 Replace Raytheon references to IODataPreparer
...
Change-Id: I376f430154996944bd49c2e72d89e57537b68084
Former-commit-id: 4ab3b14b3070a7f2215fca0df210d94ab3b14b3070a7f2215fca0df210d95b3893c56fca0df210d95b3893c56f7a20ac041a4140e1cc8c1ae1220e4a02814f3400ac75dda420
2014-08-12 12:15:35 -05:00
Steve Harris
8bce1903ec
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: d606269c5ba92dc418c60fb743ec44d606269c5ba92dc418c60fb743ec44bf9a0fa5de0fb743ec44bf9a0fa5de386dfebe65b848e05aa146fe792d835e2f7a9f74a0fdc76880
2014-08-04 22:20:29 -05:00
Brian.Dyke
2e18cc1022
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: 770b56e7408ea5c4f98b6f6daaa249770b56e7408ea5c4f98b6f6daaa2497fbb3b6a546f6daaa2497fbb3b6a5405a368a3e13e56f7e40345cfe1aa9c861a40ce5a4be2bcf64a
2014-08-04 16:40:02 -04:00
Mark Peters
8d1732d0cf
Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()
...
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9
Former-commit-id: 1342f676149be02c8dfe22c077d77f1342f676149be02c8dfe22c077d77f88b334cf1422c077d77f88b334cf148ccec2e2c8469f73cb43666c988f64ca4003ca7f7a4c25190e
2014-08-04 13:27:45 -05:00
Brian.Dyke
1d9494a502
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: 590e37a8f2301f3094be9abb02ea8a590e37a8f2301f3094be9abb02ea8a270d2b0ddb9abb02ea8a270d2b0ddbb9da27608cbbe6ec4d5037aacfcb96b9daa26f7d803ceadaec
2014-08-04 13:10:13 -04:00
Mark Peters
5cbe006dc9
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
...
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf
Former-commit-id: 637657279511abefd4de437e127ebc637657279511abefd4de437e127ebcbac12d844b437e127ebcbac12d844b88edbdafea95886b5ded6edd39cc9ebaecaaaca0011ef40360
2014-07-29 11:20:53 -05:00
Nate Jensen
815dcd396a
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: 76d8ae8fd995687618009ec259d7df76d8ae8fd995687618009ec259d7dfd5b929d5c19ec259d7dfd5b929d5c12ab40b2e4ebc2e75a7a99969273949ba49569911b01f9947cd
2014-07-24 14:53:47 -05:00
Mark Peters
8225fd1b55
Omaha #3422 Update plug-in version number and java version for viz.hydrocommon and viz.mpe.ui
...
Change-Id: I2f8799c32a11ed636f714c0bfe304c5248f48a98
Former-commit-id: ecbed2c37e5eacdbc13b53042a9bf7ecbed2c37e5eacdbc13b53042a9bf7627ecd28e153042a9bf7627ecd28e1fbbe39f9697087f360983293e61ae0d804243d0fe08b81c8d9
2014-07-24 14:38:59 -05:00
Mark Peters
795f1ec074
Omaha #3422 Move HydroPointResource and HydroPointResourceData to MPE plugin
...
Change-Id: I222f99b0b952d9cef91208eb27f6adca43e13669
Former-commit-id: 38a41fa36785bf675f6a92b1e9a9cf38a41fa36785bf675f6a92b1e9a9cf29bc0fae5092b1e9a9cf29bc0fae5008519bf28c034616b4b76727654e2da87ed6f7af0a1e272abb
2014-07-22 14:57:35 -05:00
steve.naples
afe17e2857
ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
...
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88
Former-commit-id: 72ae26401d2ebfd61f12339fcbc18a72ae26401d2ebfd61f12339fcbc18a0bd7b6c65b339fcbc18a0bd7b6c65b04208dc8376b58fb2509aa8c11d134458dd1fe8fdb04c1a2ec
2014-07-09 15:42:51 +00:00
steve.naples
0bf2f3eed5
ASM #253 Update RadarBiasTableDialog fix issue of not saving.
...
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673
Former-commit-id: 9dcf27e21729ca2338b875969ceec29dcf27e21729ca2338b875969ceec224b0d49a5b75969ceec224b0d49a5bbd3e8973d294e246b619ea071e81f523ff3f3fe710e2eaa6ed
2014-07-08 16:32:08 +00:00
steve.naples
0f4f7230ef
ASM #253 Update RadarBiasTableDialog to remove old code.
...
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: e82b0ae8953d75da3db066c3241bc4e82b0ae8953d75da3db066c3241bc44e959af1b466c3241bc44e959af1b4dbd231a099f1c92f1e353cfabd29bc93c8f822cc9f52699bd2
2014-07-02 15:30:48 +00:00
steve.naples
c8e3452751
ASM #665 Updated getCv_use in DisplayFieldData class to return name
...
Change-Id: I1acbe41ca6a11794ff2f3cc4234422b78a39b0d2
Former-commit-id: e24fdc9457c484574dd534956449efe24fdc9457c484574dd534956449ef6d1b26c5f434956449ef6d1b26c5f444f69b3e22630f6ccf9f96b54075cd815e17be506fc0dad1d4
2014-06-30 17:41:43 +00:00
steve.naples
d7ff8a2638
ASM #253 Update RadarBiasTableDialog to allow undo changes.
...
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: e994aa94822a49bbda2fefe877d82be994aa94822a49bbda2fefe877d82b90ed511478efe877d82b90ed511478b8d5f833ec2e77b74c44362e1ce8805dcda5cabc3638879057
2014-06-24 15:52:23 +00:00
Steve Harris
cbd6f7c310
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: 2b95865dec647cd97e297fec0d039c2b95865dec647cd97e297fec0d039c455eb8b39d7fec0d039c455eb8b39db1f34a5dd0373c816e6aec743199f1cbceb4ea627eabeb7ad6
2014-06-02 11:21:46 -05:00
Brian.Dyke
408ecfa5c0
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: 5524d6b38da0a879be7da8737e18f05524d6b38da0a879be7da8737e18f03f1e12effca8737e18f03f1e12effcc76d6df69d3961c75ecd66aacd6578a23d3715229351315fd6
2014-05-30 10:46:25 -04:00
Nate Jensen
2bdb8b5c7d
Omaha #3133 Removed dead hydro code and related dependencies
...
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a
Former-commit-id: 424c3c1334a984e7ac9a514c9d3a0c424c3c1334a984e7ac9a514c9d3a0c67ac5fa242514c9d3a0c67ac5fa242d158b501d1a25a8b69ebc2f78a688811899e65e2caf433d525
2014-05-27 18:23:38 -05:00
brian.dyke
5c9495ee04
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: 4d161aaf909626317825011d121e4b4d161aaf909626317825011d121e4b58683ad040011d121e4b58683ad040a2add518802e105c1d5dbc4649765ab42011fc76b2e3c50ec0
2014-05-19 09:45:37 -04:00
Chip Gobs
172481a6aa
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: a95de2211a4e4d00792d65d2135ac2a95de2211a4e4d00792d65d2135ac2e42bef2a3365d2135ac2e42bef2a335045e9fa66c075175e8e593b36d7221b7f76261747068a7939
2014-05-06 10:48:35 -04:00
steve.naples
35892201f7
ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
...
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316
Former-commit-id: b98b7f41b1a7092ac01db58b7d3d5ab98b7f41b1a7092ac01db58b7d3d5a8a00348730b58b7d3d5a8a003487302e4c970c7e452cbdcc4ed079dbcb7c39437970c718c51dac23
2014-05-02 16:15:04 +00:00
Juliya Dynina
a6c74661f5
Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1
...
Former-commit-id: a24fdff32a00bbbf32c1d37490acb1a24fdff32a00bbbf32c1d37490acb178bb549533d37490acb178bb549533c6a70b3861b28bb8e3acd5290b8bbfa4073b805e18c84c47bc
2014-04-30 07:41:27 -05:00
Loubna.Bousaidi
a141c9fa13
ASM #511 changes to transmit_rfc_bias calls from MPE
...
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: c064fb3ae41b5bccc451760ee964d6c064fb3ae41b5bccc451760ee964d66d526cb1ff760ee964d66d526cb1ff967156413e93a6523f46e28ec3469d84640a8936ecbad2efac
2014-04-29 21:09:34 +00:00
Richard Peter
e748b7c1e5
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: 8b1a17711067683dd89144b17824618b1a17711067683dd89144b178246132957285fc44b178246132957285fc0dfa8cc4c66966b7924680d415387824a3fe1466938e39a0fc
2014-04-28 16:27:40 -05:00
brian.dyke
787c64e3cb
Merge branch 'master_14.3.1' into asm_14.3.1
...
Merge 14.3.1-2 into ASM
Former-commit-id: a43a0922baffad42f2ef8bda882ed0a43a0922baffad42f2ef8bda882ed04621d660898bda882ed04621d660897d7d638f9cc27ffd06781939a06cedd6287274b2864e83994e
2014-04-28 13:25:41 -04:00
steve.naples
138ea72d59
ASM #528 Updated DrawPolygonDlg to remember location when opened and closed.
...
Change-Id: I19ec2f2e1898506387d053b8ada80d2d2d67cf7c
Former-commit-id: 00c78e904758b091e37be0b6f674f300c78e904758b091e37be0b6f674f3760fc00028e0b6f674f3760fc00028047e7fd5d6399702b22bbed2334f5726da8e332ab5e6653935
2014-04-28 13:55:21 +00:00
Brian.Dyke
19b4bb7dcc
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: 362d882b40f0b8ea5822fb1f5aa593362d882b40f0b8ea5822fb1f5aa5933524838f9ffb1f5aa5933524838f9f14a63a19e1bf3758efa3029f5753adc6d3fe6952f31d8cc8cf
2014-04-25 11:06:11 -04:00
Mike Duff
8edc6095c9
Issue #3025 - Fix incorrect sort algorithm.
...
Change-Id: Ied1ec59a8703c1f7476793d3896a253ec6aa2707
Former-commit-id: dd24e15b53a17f1879290b9f8ce7f1dd24e15b53a17f1879290b9f8ce7f1b1a4f695780b9f8ce7f1b1a4f69578a700a1a1dc989fcfb42f54e95e399bce6d95bd3ccfadb576e6
2014-04-17 09:55:45 -05:00
Richard Peter
626ab0bd58
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: 9b12d9ddafcd51f3fa873575d6586f9b12d9ddafcd51f3fa873575d6586f21ae3b5fcd3575d6586f21ae3b5fcd56089894f2d65b11d404a7ec0bcf66b6482f2e54a22345ea6b
2014-04-11 16:23:09 -05:00
brian.dyke
e205810cba
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: c75dba32e96a9ccba3936575f77fe3c75dba32e96a9ccba3936575f77fe3a8d6d58f316575f77fe3a8d6d58f3116a261d7f688ddd667b6ad63114f161c4e02168cf299a28f9b
2014-04-11 10:58:48 -04:00
steve.naples
ec7e7b856e
ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly.
...
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5
Former-commit-id: 5d7cf6c09875be620d0df6636a3dd75d7cf6c09875be620d0df6636a3dd77624f7ab75f6636a3dd77624f7ab7586c06b5632cfa9c6f01c050238ee44571efe359632e931cead
2014-04-04 15:30:18 +00:00
Brian.Dyke
a30b45174a
Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
...
Former-commit-id: 411457248b31864343686e515eb334411457248b31864343686e515eb3341f5c6139e36e515eb3341f5c6139e3f5ed39a8d9d163d9d190c013460db15345add58dc2a3ec6f04
2014-04-01 14:29:33 -04:00
