Richard Peter
59e9fe78f2
Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java
Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5
Former-commit-id: 23eafaba3d
[formerly 2457d0e6f7
] [formerly 23eafaba3d
[formerly 2457d0e6f7
] [formerly 8de1ebcb65
[formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: 746bbb0885
[formerly f7d8755ba9
]
Former-commit-id: bf3ddbb62b
2014-12-12 10:36:04 -06:00
steve.naples
872c537dbe
ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
...
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4
Former-commit-id: 91c240f8bd
[formerly c4fad58bd9
] [formerly 91c240f8bd
[formerly c4fad58bd9
] [formerly b5389ced26
[formerly 862cb7c4d789915067558c4508cf5f1e45a2cdf2]]]
Former-commit-id: b5389ced26
Former-commit-id: ffe6a3d92f
[formerly f33429b6f0
]
Former-commit-id: 21f7cc1c0d
2014-12-03 18:35:19 +00:00
Paul.Grell
a335d1383c
ASM #16911 HydroDate set to next day if hour is 18Z or later
...
Change-Id: Ied55660cb81e3fdf2e87295fe22eb0915f7b4764
Former-commit-id: 2aecc9933d
[formerly 63ae1fe88c
] [formerly 2aecc9933d
[formerly 63ae1fe88c
] [formerly 370466a7e8
[formerly 38d9bc8c4e385e339df5bdd010160728730bed8d]]]
Former-commit-id: 370466a7e8
Former-commit-id: 5269897368
[formerly c6cec6b252
]
Former-commit-id: 08f47bfadd
2014-12-02 11:35:28 -05:00
steve.naples
5b67fa0f7c
ASM #16889 - Daily QC does not display SNOTEL data.
...
Change-Id: I42035d5d4d856a395400a1be1d0c6a24bc64b0d8
Former-commit-id: 74aa7ae98b
[formerly ec656123f2
] [formerly 74aa7ae98b
[formerly ec656123f2
] [formerly a0face5b02
[formerly 01735909fffdc9b5ef14ed072253eed6deaecad9]]]
Former-commit-id: a0face5b02
Former-commit-id: ffb601d560
[formerly 5845c1d382
]
Former-commit-id: 98e2feaf8d
2014-11-26 18:24:53 +00:00
Steve Harris
b514fdc3f7
Merge tag 'OB_14.3.1-29m' into omaha_14.4.1
...
Former-commit-id: 7da796e1b0
[formerly 0322884798
] [formerly 7da796e1b0
[formerly 0322884798
] [formerly 0f40604bcb
[formerly e5cd617f80e90dcfba52058b2a439fade1cfe15e]]]
Former-commit-id: 0f40604bcb
Former-commit-id: 1d89136dd2
[formerly 0d2cbbfe4a
]
Former-commit-id: 627ebd7dbf
2014-10-29 10:03:20 -05:00
Shawn.Hooper
dd3d444885
ASM #16871 - Checkin: MPE Gage Table: columns do not sort in descending order
...
Change-Id: I197c3049e39ad0c5f5edca8926ff1afdaca20e2f
Former-commit-id: 1c025e7a9d
[formerly 7a7d877c17
] [formerly 1c025e7a9d
[formerly 7a7d877c17
] [formerly f5b9798c3d
[formerly ce7ade3d25263f5af09073e4877b018a84f195a3]]]
Former-commit-id: f5b9798c3d
Former-commit-id: 0510185ff8
[formerly 154ad67a31
]
Former-commit-id: f66225d338
2014-10-24 09:47: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
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
763439c814
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 75f3bb31d5
[formerly 4db67c581c
] [formerly 75f3bb31d5
[formerly 4db67c581c
] [formerly 8d665b93b5
[formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]]]
Former-commit-id: 8d665b93b5
Former-commit-id: 12bf31b5ba
[formerly b83e12da28
]
Former-commit-id: c4d7c97897
2014-09-19 16:56:50 -04: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
64435ea860
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: e70a9db68c
[formerly c6b0adfc53
] [formerly e70a9db68c
[formerly c6b0adfc53
] [formerly 8b0603cdb8
[formerly de22db308f36c42d5c7e0989dbd7decfaaf3adbb]]]
Former-commit-id: 8b0603cdb8
Former-commit-id: 87dfb0e978
[formerly d5f57cd98e
]
Former-commit-id: 37ffb37db6
2014-09-18 12:43:01 -04:00
Chip Gobs
35439f3173
VLab Issue #4611
...
Adding missing changed file.
Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e
Former-commit-id: 0e4b8d2e9b
[formerly 0d046a56e8
] [formerly 0e4b8d2e9b
[formerly 0d046a56e8
] [formerly 31efce6b8f
[formerly e68f56628f035ca2a20848a0e76f6efa8bbe1e8a]]]
Former-commit-id: 31efce6b8f
Former-commit-id: aa838b2230
[formerly a287a95ef9
]
Former-commit-id: 552430bda0
2014-09-18 12:12:42 -04:00
Brian.Dyke
484ebfd9c9
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: c44811098f
[formerly cb7a266271
] [formerly c44811098f
[formerly cb7a266271
] [formerly 97fc11f099
[formerly dcfe2369455e6b7f27039418b090c9c577400a63]]]
Former-commit-id: 97fc11f099
Former-commit-id: 050fb83ec8
[formerly e8e2549284
]
Former-commit-id: 8f0d1e9dc5
2014-09-17 14:39:56 -04:00
Brian.Dyke
55a25f2525
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 54b26b3616
[formerly 216f34fb25
] [formerly 54b26b3616
[formerly 216f34fb25
] [formerly 1541e4c255
[formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]]]
Former-commit-id: 1541e4c255
Former-commit-id: 5115becdef
[formerly ffa56ef950
]
Former-commit-id: 26b1938813
2014-09-15 10:46:25 -04:00
Max Schenkelberg
a2e7d1324f
Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
...
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb
Former-commit-id: 422ceffbdd
[formerly 3ea9b1b4be
] [formerly 422ceffbdd
[formerly 3ea9b1b4be
] [formerly 994605c1ce
[formerly 154c4ac7131ae8f533d4080055d9afe257bf0506]]]
Former-commit-id: 994605c1ce
Former-commit-id: 165583b144
[formerly 3b1a3f84fd
]
Former-commit-id: 144e042b42
2014-09-10 15:43:19 -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
Chip Gobs
cbbe589afe
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: 83e0a41593
[formerly bbc346e29e
] [formerly 83e0a41593
[formerly bbc346e29e
] [formerly ec3ff24577
[formerly 3ad2b50520a7a8fdfaa1a99a1f34570e43d0164e]]]
Former-commit-id: ec3ff24577
Former-commit-id: 1af9261db2
[formerly 272690ed5a
]
Former-commit-id: d0810673a4
2014-09-08 14:29:28 -04:00
Chip Gobs
e37cf3ecf7
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: bc2962c9ce
[formerly 780f484a56
] [formerly bc2962c9ce
[formerly 780f484a56
] [formerly cf0816edce
[formerly 57614e9869d5a36c80b8d988e8fea4136045a982]]]
Former-commit-id: cf0816edce
Former-commit-id: b41aef6d84
[formerly edef86ba43
]
Former-commit-id: d00048b40f
2014-09-08 14:28:33 -04:00
Chip Gobs
07ce013d2c
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: a06a4667a3
[formerly f7624b0609
] [formerly a06a4667a3
[formerly f7624b0609
] [formerly 874db74c54
[formerly 7df28e4d5c1d8a03db5500939b0af2905d11a4aa]]]
Former-commit-id: 874db74c54
Former-commit-id: 7bda177305
[formerly ee70ab2956
]
Former-commit-id: b2319cd60a
2014-09-08 12:37:20 -04:00
Chip Gobs
b2f957c4d4
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: 69450976c8
[formerly 8c6e70ccab
] [formerly 69450976c8
[formerly 8c6e70ccab
] [formerly 25e4ed8d51
[formerly 44f6bf08a72b5450d6d0db40ff49dd5123cf811c]]]
Former-commit-id: 25e4ed8d51
Former-commit-id: 689ccd9fcf
[formerly 215f1dfaa1
]
Former-commit-id: 9bf30e3dbd
2014-09-08 12:06:45 -04:00
Chip Gobs
3e23c79eea
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: da10a7b4ac
[formerly fc8a7d48ca
] [formerly da10a7b4ac
[formerly fc8a7d48ca
] [formerly 4911ac1917
[formerly 4d87ebeef93e561a303566853fd2616316c568ca]]]
Former-commit-id: 4911ac1917
Former-commit-id: 6d5926df35
[formerly 7c6f9b3ad9
]
Former-commit-id: f50b09855f
2014-09-08 11:44:48 -04:00
steve.naples
03f50a48f1
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
...
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: 4205d83452
[formerly 1856a05319
] [formerly 4205d83452
[formerly 1856a05319
] [formerly ff52f1dc0a
[formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]]
Former-commit-id: ff52f1dc0a
Former-commit-id: 1532c683a1
[formerly 211e9f7546
]
Former-commit-id: 3f11e82772
2014-08-28 16:08:17 +00:00
Loubna.Bousaidi
af004872fd
ASM #511 changes to transmit_rfc_bias calls from MPE
...
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: afae4700a6
[formerly 8c15d1f124
] [formerly afae4700a6
[formerly 8c15d1f124
] [formerly d41e489ced
[formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]]]
Former-commit-id: d41e489ced
Former-commit-id: d9be7127bc
[formerly 5cc9b08890
]
Former-commit-id: 65cfa4e033
2014-08-15 10:54:10 -05:00
Nate Jensen
7336692b85
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
...
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 253198b5bc
[formerly b3083a663e
] [formerly 253198b5bc
[formerly b3083a663e
] [formerly 9b72a1399d
[formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]
Former-commit-id: 9b72a1399d
Former-commit-id: 58a4cb95c1
[formerly d67083655a
]
Former-commit-id: 951feab33d
2014-08-14 10:22:37 -05:00
Mark Peters
019a89bcaf
Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape()
...
Change-Id: Ie521a2041586825b9fb995a675e5caa550fa5313
Former-commit-id: 1d0983cd4a
[formerly 58dd0873e3
] [formerly 1d0983cd4a
[formerly 58dd0873e3
] [formerly 8e7d6964c6
[formerly 0df04ef8a5b4eee4398a411fc02baba22f719eaf]]]
Former-commit-id: 8e7d6964c6
Former-commit-id: 4ca6e07182
[formerly c823ff5bc3
]
Former-commit-id: 824ebff454
2014-08-13 12:22:47 -05:00
Mark Peters
ac75dda420
Omaha #3504 Replace Raytheon references to IODataPreparer
...
Change-Id: I376f430154996944bd49c2e72d89e57537b68084
Former-commit-id: 70a7f2215f
[formerly ca0df210d9
] [formerly 70a7f2215f
[formerly ca0df210d9
] [formerly 5b3893c56f
[formerly 08621067f8046b4260e87583d16950fee1e741de]]]
Former-commit-id: 5b3893c56f
Former-commit-id: 4140e1cc8c
[formerly 1ae1220e4a
]
Former-commit-id: 02814f3400
2014-08-12 12:15:35 -05: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
Brian.Dyke
4be2bcf64a
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: 8ea5c4f98b
[formerly 6f6daaa249
] [formerly 8ea5c4f98b
[formerly 6f6daaa249
] [formerly 7fbb3b6a54
[formerly f22cc09d0a6fdc7a806726d5207f6b3507972b94]]]
Former-commit-id: 7fbb3b6a54
Former-commit-id: 3e56f7e403
[formerly 45cfe1aa9c
]
Former-commit-id: 861a40ce5a
2014-08-04 16:40:02 -04:00
Mark Peters
7a4c25190e
Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()
...
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9
Former-commit-id: 9be02c8dfe
[formerly 22c077d77f
] [formerly 9be02c8dfe
[formerly 22c077d77f
] [formerly 88b334cf14
[formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]]]
Former-commit-id: 88b334cf14
Former-commit-id: 469f73cb43
[formerly 666c988f64
]
Former-commit-id: ca4003ca7f
2014-08-04 13:27:45 -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
Mark Peters
011ef40360
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
...
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf
Former-commit-id: 11abefd4de
[formerly 437e127ebc
] [formerly 11abefd4de
[formerly 437e127ebc
] [formerly bac12d844b
[formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]]
Former-commit-id: bac12d844b
Former-commit-id: 95886b5ded
[formerly 6edd39cc9e
]
Former-commit-id: baecaaaca0
2014-07-29 11:20:53 -05:00
Nate Jensen
b01f9947cd
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: 9568761800
[formerly 9ec259d7df
] [formerly 9568761800
[formerly 9ec259d7df
] [formerly d5b929d5c1
[formerly 13ad27128cd4a29bb559d6911f870b15f447fdf5]]]
Former-commit-id: d5b929d5c1
Former-commit-id: bc2e75a7a9
[formerly 9969273949
]
Former-commit-id: ba49569911
2014-07-24 14:53:47 -05:00
Mark Peters
e08b81c8d9
Omaha #3422 Update plug-in version number and java version for viz.hydrocommon and viz.mpe.ui
...
Change-Id: I2f8799c32a11ed636f714c0bfe304c5248f48a98
Former-commit-id: 5eacdbc13b
[formerly 53042a9bf7
] [formerly 5eacdbc13b
[formerly 53042a9bf7
] [formerly 627ecd28e1
[formerly 02b964ae1e7490cc9124dcd70d6806881396a692]]]
Former-commit-id: 627ecd28e1
Former-commit-id: 7087f36098
[formerly 3293e61ae0
]
Former-commit-id: d804243d0f
2014-07-24 14:38:59 -05:00
Mark Peters
0a1e272abb
Omaha #3422 Move HydroPointResource and HydroPointResourceData to MPE plugin
...
Change-Id: I222f99b0b952d9cef91208eb27f6adca43e13669
Former-commit-id: 85bf675f6a
[formerly 92b1e9a9cf
] [formerly 85bf675f6a
[formerly 92b1e9a9cf
] [formerly 29bc0fae50
[formerly 7929e5b809d83a0f682e9f1c6953c9a090ed7310]]]
Former-commit-id: 29bc0fae50
Former-commit-id: 034616b4b7
[formerly 6727654e2d
]
Former-commit-id: a87ed6f7af
2014-07-22 14:57:35 -05:00
steve.naples
db04c1a2ec
ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
...
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88
Former-commit-id: 2ebfd61f12
[formerly 339fcbc18a
] [formerly 2ebfd61f12
[formerly 339fcbc18a
] [formerly 0bd7b6c65b
[formerly 24b9a6e0801cc653062a71d86090df3836aa86a4]]]
Former-commit-id: 0bd7b6c65b
Former-commit-id: 6b58fb2509
[formerly aa8c11d134
]
Former-commit-id: 458dd1fe8f
2014-07-09 15:42:51 +00:00
steve.naples
10e2eaa6ed
ASM #253 Update RadarBiasTableDialog fix issue of not saving.
...
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673
Former-commit-id: 29ca2338b8
[formerly 75969ceec2
] [formerly 29ca2338b8
[formerly 75969ceec2
] [formerly 24b0d49a5b
[formerly 9021eca6b32dd2b3859cd928c14a0e40a4907c13]]]
Former-commit-id: 24b0d49a5b
Former-commit-id: 94e246b619
[formerly ea071e81f5
]
Former-commit-id: 23ff3f3fe7
2014-07-08 16:32:08 +00:00
steve.naples
9f52699bd2
ASM #253 Update RadarBiasTableDialog to remove old code.
...
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: 3d75da3db0
[formerly 66c3241bc4
] [formerly 3d75da3db0
[formerly 66c3241bc4
] [formerly 4e959af1b4
[formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]]
Former-commit-id: 4e959af1b4
Former-commit-id: f1c92f1e35
[formerly 3cfabd29bc
]
Former-commit-id: 93c8f822cc
2014-07-02 15:30:48 +00:00
steve.naples
6fc0dad1d4
ASM #665 Updated getCv_use in DisplayFieldData class to return name
...
Change-Id: I1acbe41ca6a11794ff2f3cc4234422b78a39b0d2
Former-commit-id: c484574dd5
[formerly 34956449ef
] [formerly c484574dd5
[formerly 34956449ef
] [formerly 6d1b26c5f4
[formerly 324ee4e77b4b6ff1a7f1385fde1a44c13aa86570]]]
Former-commit-id: 6d1b26c5f4
Former-commit-id: 630f6ccf9f
[formerly 96b54075cd
]
Former-commit-id: 815e17be50
2014-06-30 17:41:43 +00:00
steve.naples
3638879057
ASM #253 Update RadarBiasTableDialog to allow undo changes.
...
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: 2a49bbda2f
[formerly efe877d82b
] [formerly 2a49bbda2f
[formerly efe877d82b
] [formerly 90ed511478
[formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]]
Former-commit-id: 90ed511478
Former-commit-id: 2e77b74c44
[formerly 362e1ce880
]
Former-commit-id: 5dcda5cabc
2014-06-24 15:52:23 +00:00
Steve Harris
7eabeb7ad6
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: 647cd97e29
[formerly 7fec0d039c
] [formerly 647cd97e29
[formerly 7fec0d039c
] [formerly 455eb8b39d
[formerly 45250149681f057cf168f4d3cb27276279f62c05]]]
Former-commit-id: 455eb8b39d
Former-commit-id: 373c816e6a
[formerly ec743199f1
]
Former-commit-id: cbceb4ea62
2014-06-02 11:21:46 -05:00
Brian.Dyke
9351315fd6
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: a0a879be7d
[formerly a8737e18f0
] [formerly a0a879be7d
[formerly a8737e18f0
] [formerly 3f1e12effc
[formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]
Former-commit-id: 3f1e12effc
Former-commit-id: 3961c75ecd
[formerly 66aacd6578
]
Former-commit-id: a23d371522
2014-05-30 10:46:25 -04:00
Nate Jensen
caf433d525
Omaha #3133 Removed dead hydro code and related dependencies
...
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a
Former-commit-id: a984e7ac9a
[formerly 514c9d3a0c
] [formerly a984e7ac9a
[formerly 514c9d3a0c
] [formerly 67ac5fa242
[formerly 13d3dc45edab66106e9aa5a1149ca05e94d144c3]]]
Former-commit-id: 67ac5fa242
Former-commit-id: a25a8b69eb
[formerly c2f78a6888
]
Former-commit-id: 11899e65e2
2014-05-27 18:23:38 -05:00
brian.dyke
b2e3c50ec0
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: 9626317825
[formerly 011d121e4b
] [formerly 9626317825
[formerly 011d121e4b
] [formerly 58683ad040
[formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d
[formerly bc4649765a
]
Former-commit-id: b42011fc76
2014-05-19 09:45:37 -04:00
Chip Gobs
47068a7939
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: 4e4d00792d
[formerly 65d2135ac2
] [formerly 4e4d00792d
[formerly 65d2135ac2
] [formerly e42bef2a33
[formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]]
Former-commit-id: e42bef2a33
Former-commit-id: c075175e8e
[formerly 593b36d722
]
Former-commit-id: 1b7f762617
2014-05-06 10:48:35 -04:00
steve.naples
18c51dac23
ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
...
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316
Former-commit-id: a7092ac01d
[formerly b58b7d3d5a
] [formerly a7092ac01d
[formerly b58b7d3d5a
] [formerly 8a00348730
[formerly 2f608451c941efcc5372f0d0870ac72409f518e3]]]
Former-commit-id: 8a00348730
Former-commit-id: 452cbdcc4e
[formerly d079dbcb7c
]
Former-commit-id: 39437970c7
2014-05-02 16:15:04 +00:00
Juliya Dynina
18c84c47bc
Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1
...
Former-commit-id: 00bbbf32c1
[formerly d37490acb1
] [formerly 00bbbf32c1
[formerly d37490acb1
] [formerly 78bb549533
[formerly a129795302a562e68638bb5e5764f54a8dcc331e]]]
Former-commit-id: 78bb549533
Former-commit-id: b28bb8e3ac
[formerly d5290b8bbf
]
Former-commit-id: a4073b805e
2014-04-30 07:41:27 -05:00
Loubna.Bousaidi
ecbad2efac
ASM #511 changes to transmit_rfc_bias calls from MPE
...
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: 1b5bccc451
[formerly 760ee964d6
] [formerly 1b5bccc451
[formerly 760ee964d6
] [formerly 6d526cb1ff
[formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]]]
Former-commit-id: 6d526cb1ff
Former-commit-id: 93a6523f46
[formerly e28ec3469d
]
Former-commit-id: 84640a8936
2014-04-29 21:09:34 +00:00
Richard Peter
938e39a0fc
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: 67683dd891
[formerly 44b1782461
] [formerly 67683dd891
[formerly 44b1782461
] [formerly 32957285fc
[formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 6966b79246
[formerly 80d4153878
]
Former-commit-id: 24a3fe1466
2014-04-28 16:27:40 -05:00
brian.dyke
864e83994e
Merge branch 'master_14.3.1' into asm_14.3.1
...
Merge 14.3.1-2 into ASM
Former-commit-id: ffad42f2ef
[formerly 8bda882ed0
] [formerly ffad42f2ef
[formerly 8bda882ed0
] [formerly 4621d66089
[formerly 29bcb6987ee371f128b75eee84b65574d799135f]]]
Former-commit-id: 4621d66089
Former-commit-id: c27ffd0678
[formerly 1939a06ced
]
Former-commit-id: d6287274b2
2014-04-28 13:25:41 -04:00
steve.naples
b5e6653935
ASM #528 Updated DrawPolygonDlg to remember location when opened and closed.
...
Change-Id: I19ec2f2e1898506387d053b8ada80d2d2d67cf7c
Former-commit-id: 58b091e37b
[formerly e0b6f674f3
] [formerly 58b091e37b
[formerly e0b6f674f3
] [formerly 760fc00028
[formerly ae0616b0b71e0d1952f2c3e8f461a4d8e79e934f]]]
Former-commit-id: 760fc00028
Former-commit-id: 399702b22b
[formerly bed2334f57
]
Former-commit-id: 26da8e332a
2014-04-28 13:55:21 +00:00