Commit graph

16 commits

Author SHA1 Message Date
Michael James
2736851422 GL refactor for osx 2016-09-13 13:40:19 -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
6c9c9bf891 RadarRadialMesh refactored to use jogamp 2 2016-09-13 10:07:29 -06:00
Jordan Gerth
af7829fe93 VLab Issue #15754 - Gamma control for true color imagery
Change-Id: Id4c36dffe00993131dc87215d34d69e7364b2df3

Former-commit-id: ebe05d4f470cd6a67c79657536ef66f6743a114a
2016-02-19 13:28:06 -06:00
David Lovely
80dc4c85d9 Omaha #4146 Bundled class files in a jar when unpacked.
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02

Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
2015-05-19 10:23:35 -05:00
Nate Jensen
25e09348c0 Omaha #3549 remove dead code
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2

Former-commit-id: 70209fbc92c5459dab007224e1f5783a5bb08fd0
2014-12-03 17:35:08 -06:00
Nate Jensen
8dbe6abbe4 Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
2014-12-03 15:47:10 -06:00
Max Schenkelberg
a8a67634f9 Issue #2680 fixed samplers in structs issues with GLSL spec.
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9

Former-commit-id: 4f3635fc682c2a1746e188dac0f371676c9e0be9
2014-02-10 13:43:16 -06:00
Ben Steffensmeier
3696896b49 Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1
2013-11-25 11:31:57 -06:00
Max Schenkelberg
bd903f6641 Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing.
Change-Id: Ic82f45447113425a08909be4c5229502882db022

Former-commit-id: 58ccc575973ea9a1778659e17daff8577747dec5
2013-11-11 11:09:00 -06:00
Max Schenkelberg
c28fd2b38d Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
Amend: Fixed precision issue with float comparison, made factory better synchronized.

Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2

Former-commit-id: ae724ecce3d4c65f8845f3278f9b5eeb5b04908a
2013-11-06 15:07:18 -06:00
Max Schenkelberg
004720f7a9 Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image.
Change-Id: I6ec7c0808516cc1ce87e3325b54041366392d191

Former-commit-id: b4249acf8655c2c31e491cf945f2bb4fc00f7fad
2013-10-17 12:59:23 -05:00
Ben Steffensmeier
2ca86633d6 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: 7c24d10acae9dee7ec03edd471983e0b80d58092
2013-02-28 17:00:56 -06:00
Steve Harris
59969775ad 13.1.2-6 baseline
Former-commit-id: 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7
2013-01-06 14:55:11 -06:00
Steve Harris
fd5e214e72 12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: af8ffe73c81cd980843f137800f9fbb453c9e2c0
2012-09-12 13:10:36 -05:00
Steve Harris
969e7e6dfd 12.10.1-3 baseline
Former-commit-id: 1a94c1ca3674c8e4dbb8847de5190efe33da371c
2012-09-11 16:00:38 -05:00