Michael James
|
e3d3355c29
|
unscrew that screwy merge
|
2016-09-13 12:58:48 -06:00 |
|
Michael James
|
199a7d184c
|
Merge remote-tracking branch 'origin/unidata_16.2.2' into unidata_16.1.5-osx-merge
Conflicts:
.gitignore
build/deploy.edex.awips2/esb/etc/ingestGrib.sh
build/deploy.edex.awips2/esb/etc/request.sh
cave/build/build.sh
cave/build/cave/customTargets.xml
cave/build/p2-build.xml
cave/build/static/linux/cave/caveUtil.sh
cave/build/static/linux/cave/run.sh
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisualization.java
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/dataprovider/rsc/DataProviderRsc.java
cave/com.raytheon.uf.viz.collaboration.ui/localization/collaboration/config.xml
cave/com.raytheon.uf.viz.d2d.nsharp/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpPaletteWindow.java
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpObservedSoundingDialogContents.java
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/map/D2DNsharpMapResourceData.java
cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml
cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/ClearAction.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/TwoPanelLayoutMenuAction.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2DPerspectiveManager.java
cave/com.raytheon.uf.viz.dat.feature/feature.xml
cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/handler/ExportImageHandler.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/DispatchGraphicsTarget.java
cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/strings/DrawStringEvent.java
cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfileMap.xml
cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml
cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java
cave/com.raytheon.uf.viz.truecolor.gl/src/com/raytheon/uf/viz/truecolor/gl/extension/GLTrueColorImagingExtension.java
cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/help/SmartInit.html
cave/com.raytheon.viz.gfe/help/localConfig.html
cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGustFromAlgorithm.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementBrowserDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ZoneDbResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.pointdata/localization/bundles/SurfaceColorTemp.xml
cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
cave/com.raytheon.viz.product.awips/awips.product
cave/com.raytheon.viz.product.awips/developer.product
cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
cave/com.raytheon.viz.redbook/localization/bundles/Redbook.xml
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductsImagery.xml
cave/com.raytheon.viz.satellite/localization/menus/satellite/regionalSatellite.xml
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/edex/developer.properties
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.bufrua/utility/common_static/base/purge/bufruaPurgeRules.xml
edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/RAP13GribPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/RAP40GribPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid1440721.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.10.table
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.11.table
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.3.table
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.7.table
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.8.table
edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radar/radarsInUse.txt
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/dao/SatelliteDao.java
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkyIFR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkyLIFR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkySymVFR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentMaritimeSky.xml
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentSkySym.xml
edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentSkySym2.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.ohd/utility/edex_static/base/distribution/dhr.xml
edexOsgi/com.raytheon.uf.edex.ohd/utility/edex_static/base/distribution/dpa.xml
edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/areaNames.xml
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/creatingEntities.xml
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py
edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductRetriever.py
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductStorer.py
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/storeActivity.py
installCAVE.sh
installEDEX.sh
javaUtilities/build.wes2bridge.utility/ant/setup.xml
javaUtilities/build.wes2bridge.utility/build.xml
localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.cave/deploy.builder/build.sh
rpms/awips2.core/Installer.common-base/component.spec
rpms/awips2.core/Installer.database/component.spec
rpms/awips2.core/Installer.edex-environment/edex/component.spec
rpms/awips2.core/Installer.edex-environment/wes2bridge.files/build/build.sh
rpms/awips2.core/Installer.gfe/component.spec
rpms/awips2.core/Installer.localization/component.spec
rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/WFO.xml
rpms/awips2.core/Installer.maps-database/component.spec
rpms/awips2.core/Installer.ncep-database/component.spec
rpms/awips2.core/Installer.pgadmin/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/awips2.core/Installer.topo/component.spec
rpms/awips2.core/Installer.version/component.spec
rpms/awips2.core/deploy.builder/build.sh
rpms/awips2.edex/Installer.edex-shapefiles/component.spec
rpms/awips2.edex/Installer.edex/component.spec
rpms/awips2.edex/deploy.builder/build.sh
rpms/awips2.shapefiles/Installer.edex-shapefiles/component.spec
rpms/awips2.shapefiles/deploy.builder/build.sh
rpms/awips2.upc/Installer.edex-upc/programs/edex
rpms/awips2.upc/Installer.ldm/component.spec
rpms/awips2.upc/Installer.ldm/patch/cron/awips
rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
rpms/build/common/lookupRPM.sh
rpms/build/common/usage.sh
rpms/build/i386/build.sh
rpms/build/i386/buildEnvironment.sh
rpms/build/x86_64/build.sh
rpms/build/x86_64/buildEnvironment.sh
rpms/python.site-packages/Installer.cherrypy/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pmw/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.python-awips/component.spec
rpms/python.site-packages/Installer.thrift/component.spec
rpms/python.site-packages/Installer.tpg/component.spec
rpms/python.site-packages/Installer.werkzeug/component.spec
rpms/unidata/build.sh
rpms/unidata/buildEnvironment.sh
rpms/unidata/rsync.dirs
|
2016-09-13 10:44:13 -06:00 |
|
Michael James
|
759e398e76
|
remove ncep plugin dependence from com.raytheon.viz.radar RadarMap
|
2016-09-12 15:54:48 -05:00 |
|
Michael James
|
71f8ac54df
|
Radar map resource and lpi file lgx and psf additions
|
2016-09-12 13:56:03 -05:00 |
|
Michael James
|
9f02c04a8c
|
RadarMapResource points drawn with DrawableCircle rather than NCEP PGEN MarkerType
|
2016-09-09 19:33:31 -05:00 |
|
Michael James
|
e1a475182b
|
WSR-88D scale updates; Storm Clear Reflectivity colormap transparent floor; minor RadarMapResource updates
|
2016-09-07 20:56:52 -05:00 |
|
Michael James
|
283ac21e39
|
RadarMapResource and WSR-88d scales for D2D
|
2016-09-07 19:10:23 -05:00 |
|
Michael James
|
e3e7da8c4c
|
working version of nexrad sites RadarMapResource
|
2016-09-01 15:45:00 -05:00 |
|
David Friedman
|
f6e7dc9ffe
|
ASM #18863 - D2D: Radar Display Control settings may revert after changing
Change-Id: I24e2ec8dab5e10b139b2853e2a24933bc6df9a0e
|
2016-08-30 13:08:50 -05:00 |
|
Michael James
|
7397b099f9
|
localize/create individual Regional.xml scale; RadarMenuUtil revert; BOU localization;radar 4-panel update for lvl3
|
2016-07-26 12:28:31 -05:00 |
|
Michael James
|
507cb39462
|
TwoPanelLayout Menu and Action; d2d.ui remove old DataScale handler;new WFO.xml base map bundle; Storm Clear Reflc. colormap update
|
2016-07-19 18:17:26 -05:00 |
|
mjames-upc
|
960130cf78
|
Unidata CAVE D2D UI
Former-commit-id: 32ae604d863057fa63748c2e23f384e213140e1b
|
2016-06-27 14:44:19 -05:00 |
|
mjames-upc
|
c986e0d703
|
typo fix: verticallAlignment to verticalAlignment
Former-commit-id: c8bf982c48949a9d7f4a6cb423f13a0fa61da34f
|
2016-06-27 14:36:02 -05:00 |
|
mjames-upc
|
bf989836c4
|
adding DAA/DTA composites to radar menu
|
2016-06-08 14:43:46 -06:00 |
|
mjames-upc
|
4b75ed07b4
|
Revert "use sectorID CONUS for NEXRCOMP"
This reverts commit 21aec4a21f.
|
2016-06-05 12:38:29 -05:00 |
|
mjames-upc
|
21aec4a21f
|
use sectorID CONUS for NEXRCOMP
|
2016-06-03 15:33:10 -05:00 |
|
mjames-upc
|
2b020fee41
|
build and UI updates for 16.1.4-15
|
2016-05-18 10:10:31 -05:00 |
|
Ana Rivera
|
3a3da7aa68
|
Merge "VLab Issue #17882 - Fixes to DCS18425 per DR 18886; fixes #17882" into field_16.2.2
Former-commit-id: 30f0c54c15061d0229bdd291cd0d4222792d94b7
|
2016-05-03 14:12:45 +00:00 |
|
Matthew Foster
|
432d75d807
|
VLab Issue #17882 - Fixes to DCS18425 per DR 18886; fixes #17882
Change-Id: I2787bef9456db1ef05796402bb9b95a2aa172d36
Former-commit-id: 760f6aa3052890cd7f0f3759a952b2bd8ae821cc
|
2016-05-03 13:59:14 +00:00 |
|
mjames-upc
|
4373760eaf
|
further with the menus
|
2016-05-02 18:22:14 -05:00 |
|
mjames-upc
|
5e6a40e37c
|
various D2D menu updates
|
2016-04-30 17:37:50 -05:00 |
|
mjames-upc
|
a80fdb578e
|
DefaultRadarComposite default to 3 hr loop
|
2016-04-29 20:23:49 -05:00 |
|
mjames-upc
|
3951e80394
|
new colormap for NEXRCOMP DHR, fade to black -5dBZ
|
2016-04-29 19:20:11 -05:00 |
|
Ana Rivera
|
9d9b062d92
|
Merge branch 'master_16.2.2'(OB_16.2.2-5) into field_16.2.2
Change-Id: I078a3ea61368fd6b26131fd19fb718def2bcfbf6
Former-commit-id: df84daf8cbbc493d60a1e08c04556af36230673c
|
2016-04-27 16:43:13 +00:00 |
|
mjames-upc
|
43513162db
|
typo fix for DrawableString: verticallAlignment -> verticalAlignment
|
2016-04-27 10:09:41 -05:00 |
|
mjames-upc
|
09a9b4eac0
|
removed avn/aviation viz plugins; minor edits to radar and volume bundles
|
2016-04-20 15:32:02 -05:00 |
|
mjames-upc
|
4b76ff83b5
|
two panel / two column layout handler, menu action, bundles
|
2016-04-20 10:10:09 -05:00 |
|
Matthew Foster
|
707170e0db
|
VLab Issue #17882 - Fixes to DCS18425 per DR 18886; fixes #17882
Change-Id: Iaa4cf2301ab832576c7005798a491c405f3876b2
Former-commit-id: 0faa924dd75da34b302392079d5db0096e9e6b8f
|
2016-04-18 17:04:27 +00:00 |
|
Shawn.Hooper
|
1b186554b7
|
Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
Change-Id: I6cd12190f57f25ea433ce578559444c9f9a27965
Former-commit-id: 86ef513f00aaa0c06f66088cf2e67f25da788e57
|
2016-04-13 13:37:34 -04:00 |
|
Steve Harris
|
abaa61769f
|
Merge tag 'OB_16.2.2-3' into omaha_16.2.2
16.2.2-3
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
Former-commit-id: 55bc369bddace873c371d0b5b51c383b33c6ca3d
|
2016-04-12 16:14:15 -05:00 |
|
Penghai Wang
|
1ff00e7088
|
Merge branch 'master_16.2.2' into asdt_16.2.2
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
Former-commit-id: 51bcd1df67c24bce021a89b8708e48306dd0691e
|
2016-04-12 16:45:34 +00:00 |
|
mjames-upc
|
e2d9ba9a4c
|
merge unidata_15.1.1 to unidata_16.1.4
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
|
2016-03-25 13:09:32 -05:00 |
|
Steve Harris
|
3ce4378152
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ZoneDbResource.java
Former-commit-id: 6074ea5185430ae4b5c959b02c893d93cf414479
|
2016-03-16 09:43:23 -05:00 |
|
Ron Anderson
|
1a9cfff722
|
Omaha #5318 Fixed hard coded scale factors in RadarGraphicsPage
Change-Id: Ib372e7ef7ea7894d0c7671087c35f607031b6c27
Former-commit-id: 3eacf1af5519e26a9e2131f00cf270a871f88268
|
2016-03-08 14:18:49 -06:00 |
|
Ana Rivera
|
9b97d8e4c3
|
Merge branch 'omaha_16.2.2' into field_16.2.2
Change-Id: Iaa9a1a801ee2059f5ffa5473a407ac8a7c1a4200
Former-commit-id: eb7beb890676babbbd203fc1721d48ceb067aba1
|
2016-02-22 20:35:27 +00:00 |
|
Penghai Wang
|
e50a635701
|
Merge "VLab Issue #12783 - DR12021 fix mesoclone symbol zooming issue; fixes #12783" into asdt_16.2.2
Former-commit-id: eba33da6d0b3ed2eb480fe0efcc93937b8787397
|
2016-02-20 17:01:35 +00:00 |
|
Wen Kwock
|
00747d2be6
|
VLab Issue #12783 - DR12021 fix mesoclone symbol zooming issue; fixes #12783
Change-Id: I30556e4b9ab4a8433619e2cbda5ff5ed7782e6ac
Former-commit-id: f58d04c76997d51c51f55061563c77fd2a93851e
|
2016-02-18 19:38:22 +00:00 |
|
Juliya Dynina
|
e7ff89a803
|
VLab Issue #15224 - D-2D: Entry for DSD in dual pol version of radar menu is incorrect; fixes #15224
Change-Id: I906de25e06b873063c10f9d1e736ee723438f816
Former-commit-id: 4b29194d53372869e38c81d0450a6789ee013b33
|
2016-02-12 16:02:49 +00:00 |
|
Steve Harris
|
8c95084547
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: ff0808a91ab8b08878954b0fa32c00c20b3e5ef3
|
2016-02-10 13:31:20 -06:00 |
|
Ron Anderson
|
5060d160b3
|
Omaha #5318 Change RadarGraphicsPage font back to hard coded size
Change-Id: Id973a0d9db02e6bc77d810e2b2c2814d0f6d8655
Former-commit-id: aadbf17cdcb65b601b2181d939c4884bd5b54325
|
2016-02-08 13:09:36 -06:00 |
|
Matthew Foster
|
a6a90205b3
|
VLab Issue #14581 - DCS18425 National Radar Display; fixes #14581
Change-Id: I13baf525ba7b6162beddfcfd273ec67e9b893c95
Former-commit-id: 9033a963a6dadf03de3a2b98ff7e0c851cc838a3
|
2016-02-02 17:50:17 +00:00 |
|
Steve Harris
|
e4202dd626
|
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 6e31f1b2e4f7c30faf67d0d62b5907b111e4b52f
|
2016-01-20 16:49:18 -06:00 |
|
Steve Harris
|
11a5db155d
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java
Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
|
2016-01-20 15:23:43 -06:00 |
|
Steve Harris
|
52279f6cc1
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertMessageDlg.java
cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GFEConfigDialog.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java
Former-commit-id: afd3fb15b22d92b6b30205446b6fe4b3e21271bf
|
2016-01-20 09:44:34 -06:00 |
|
Ron Anderson
|
24bc0a3344
|
Omaha #5054 Fix Dialog parenting
Change-Id: Ie7e1727ef9666cf510093f8fb6b06a1a258a30e2
Former-commit-id: 5093e43e9d1d26898f9719e00f6489a7f3ea55c8
|
2016-01-19 09:19:13 -06:00 |
|
mjames-upc
|
739226d2f8
|
further model menu reorg / additions
Former-commit-id: 8d7f86057a
|
2016-01-17 15:04:52 -06:00 |
|
David Gillingham
|
5e18c49d19
|
Omaha #5247: Plugin-ize Tools menu in D2D.
Change-Id: I7543886b22c1535574b048923c7462226d444086
Former-commit-id: 81e5df1c594a447ea1ef0c4901fe98a242cc6692
|
2016-01-14 11:36:25 -06:00 |
|
Ron Anderson
|
9f255c8d50
|
Omaha #5070 Adjust font sizes for dpi scaling
(cherry picked from commit 0fac683b60 [formerly 330ae8034e6457f20224c81cf3886d797ea5b8fc])
Conflicts:
cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
Former-commit-id: 8817960b2aaea9188f868be38930903a498ef633
|
2016-01-13 19:17:37 -06:00 |
|
Shawn.Hooper
|
bd27f40c6d
|
Merge tag 'OB_16.1.2-9' into master_16.2.1
16.1.2-9
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
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
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.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/smartinit/Init.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c
Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
|
2016-01-12 15:10:02 -05:00 |
|
mjames-upc
|
5ff1082a72
|
MRMS menu updates
Former-commit-id: 9cffafefff
|
2016-01-08 14:44:21 -07:00 |
|