xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/ncep
History
Steve Harris 3419f72215 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 
used git cherry-pick -m 1 879a2e0

Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Conflicts:

	ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java


Former-commit-id: fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 3992b18e28 [formerly 7c7fc97131] [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]]
Former-commit-id: 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b [formerly fd9e226b35]
Former-commit-id: 491aa53a0c
2012-05-01 18:31:09 -05:00
..
com.raytheon.uf.viz.ncep.core.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.ncep.nsharp.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.ncep.perspective.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
edu.wisc.ssec.mcidas 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.airmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.atcf 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.aww 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.convsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.ffg 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.idft 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.intlsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.mcidas 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncairep 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncccfp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncgrib 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncpafm 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncpirep 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncscat 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncscd 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.nctaf 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncuair 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.sgwh 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.sgwhv 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.ssha 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.stormtrack 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.tcm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.wcp 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.log 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.log4j.config 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.common 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.gempak.jna 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.ingest.grib.util 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.ingest.util 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.airmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.atcf 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.aww 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.convsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.ffg 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.idft 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.intlsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.mcidas 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.mosaic 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.ncairep 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.ncccfp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.ncgrib 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.ncpafm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.ncpirep 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.ncscat 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.ncscd 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.nctaf 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.nctext 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.ncuair 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.nonconvsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.sgwh 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.sgwhv 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.ssha 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.stormtrack 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.tcm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.wcp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.purgeutil 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.uengine 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.gempak.parameterConversionLibrary 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.gempak.parameters 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.metParameters 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.ui.nctextui 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.ui.nsharp 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.ui.nsharp.linux32 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.ui.nsharp.linux64 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.ui.nsharp.win32 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.ui.pgen 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.cloudHeight 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.common 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.gempak 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.localization 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.overlays 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.resourceManager 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.resources 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.airmet 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.atcf 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.convsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.ffa 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.ffg 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.hrcn 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.idft 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.intlsig 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.lightning 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.mosaic Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
gov.noaa.nws.ncep.viz.rsc.ncgrid 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.ncradar Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
gov.noaa.nws.ncep.viz.rsc.ncscat 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.nonconvsigmet 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.pgen 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.plotdata 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.satellite Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
gov.noaa.nws.ncep.viz.rsc.stormtrack 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.svrl 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.warn 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.wavesat 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.wcn 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.wcp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.wou 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.wstm 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.wtch 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.tools 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.ui.display 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.ui.locator 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.ui.perspectives 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.ui.seek 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00