Commit graph

22 commits

Author SHA1 Message Date
Steve Harris
1f521a70b3 12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]
Former-commit-id: 97c4db937e
2012-06-08 13:39:48 -05:00
Steve Harris
3992b18e28 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 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]
Former-commit-id: 7c7fc97131
2012-05-01 18:31:09 -05:00
Steve Harris
40aa780b3d 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]
Former-commit-id: 33a67cdd82
2012-05-01 18:06:13 -05:00
Steve Harris
6aa0898aae Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
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

Former-commit-id: 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d]
Former-commit-id: e86dc647be
2012-04-19 11:11:02 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Steve Harris
c6071e24c5 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
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

Former-commit-id: b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6]
Former-commit-id: 9845ef53f9
2012-03-30 09:50:48 -05:00
Max Schenkelberg
458f5970aa Issue #358 Cleaned up mesh extension and API to use geotools for
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884]
Former-commit-id: 8f08fab0a7
2012-03-14 09:49:32 -05:00
Max Schenkelberg
8b6aa63464 Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 89f603f448 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: 69a2b029e678fdd8a18305144330e4c95774ec78 [formerly 4662ece060]
Former-commit-id: f78b932abb
2012-03-09 12:31:50 -06:00
Max Schenkelberg
52c7dec2e8 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb]
Former-commit-id: 0554abdde0
2012-03-01 16:59:40 -06:00
Steve Harris
2e0f1d3ecc Merge branch '10-Tech_Blocked' into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml
	rpms/awips2.edex/Installer.edex-cots/component.spec

Former-commit-id: eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: a529cc7da8a5f072c8a414b5af753a556a2be162 [formerly 33483f3960]
Former-commit-id: b12f5e5d75
2012-02-20 13:03:39 -06:00
Steve Harris
4ffbe4780e Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: cc45f5a268 [formerly a2fd2cf6fa] [formerly 6a064cb78b] [formerly d02529fef4 [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]
Former-commit-id: d02529fef4
Former-commit-id: b1cec7b0617c7b5f5c46fade03d4b59fd4aeb442 [formerly d133454b27]
Former-commit-id: b41e5f2415
2012-02-20 12:54:25 -06:00
Steve Harris
43c3cfdd1a Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]
Former-commit-id: b137302802
Former-commit-id: eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]
Former-commit-id: 1ac6b36d1f
2012-02-17 10:55:02 -06:00
Steve Harris
1d529a0d83 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c2a47087ce [formerly 46dda7b8bd] [formerly 2119a1513e] [formerly 2e29bc8ee2 [formerly 2119a1513e [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: 1e32c15008441ec81c586e6dfaf0f8d5acded476 [formerly cb3371ee28]
Former-commit-id: d23d12d596
2012-02-14 15:54:46 -06:00
Ben Steffensmeier
59d62510ea Issue #235 add an export menu to cave to handle screen capture, print, and displays
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98

Former-commit-id: ced66f23a5 [formerly 6e95175ba2] [formerly ebbbd0bafc] [formerly f7985bff7b [formerly ebbbd0bafc [formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]]]
Former-commit-id: f7985bff7b
Former-commit-id: d92b9c3f75bd9c764113a021ca2bf3440df9c8f6 [formerly a9e13fac26]
Former-commit-id: 99557a2a0f
2012-02-10 12:13:34 -06:00
Ben Steffensmeier
34c03d78d0 Issue #235 Added ability to capture multiple frames to NSharp
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc

Former-commit-id: 8a5a87c2b1 [formerly 08e8343d98] [formerly 5cdcd5a261] [formerly 6bfd8ccfee [formerly 5cdcd5a261 [formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: b17c805c928548abe79f8ce56d670d4b8f032bbf [formerly 512e0f1bd5]
Former-commit-id: 9d442083a1
2012-02-09 10:54:02 -06:00
Steve Harris
5ee70f0f28 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 60b350f7f2 [formerly 695e2979c3] [formerly 1002555dbd] [formerly f693b6d0a7 [formerly 1002555dbd [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]
Former-commit-id: f693b6d0a7
Former-commit-id: ad66d263d16a34b9108e5df9e52a2625e742ad07 [formerly f650243958]
Former-commit-id: 93e856457b
2012-02-09 08:54:18 -06:00
Ben Steffensmeier
9e2d8f88e2 Issue #235 Ability to screen capture or print multiple frames at once.
Change-Id: I58176883e701fbe0d9e0bcc0e43b60bd5c0053a7

Former-commit-id: 8eb80818ce [formerly 2e37808e48] [formerly e904dadb5e] [formerly c74dae631e [formerly e904dadb5e [formerly 9062fe4b8fdb62840b21aba7c648f48fa691986a]]]
Former-commit-id: c74dae631e
Former-commit-id: 48be892967e3c67b6967381d7bc91582cd36bbf6 [formerly 0873a518c6]
Former-commit-id: 9c6081d7a3
2012-02-07 15:33:23 -06:00
Matt Nash
628da725c1 Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
Former-commit-id: e512d27770 [formerly a659029ea0] [formerly f4c5d7f94b] [formerly 28e3da498e [formerly f4c5d7f94b [formerly c12bae0a615198f6d409cf5e6d79a6a32e57494d]]]
Former-commit-id: 28e3da498e
Former-commit-id: d0e84e05ac9aabb1cf0f0936159cb5c6919bb005 [formerly ef18b8c47f]
Former-commit-id: 8dbb17b2e8
2012-02-07 11:45:28 -06:00
Matt Nash
8dcbb297c9 Issue #206 radio buttons only select one at a time
Former-commit-id: 3430c01156 [formerly 42b4f10d37] [formerly 5094c1ec1c] [formerly c8365fa660 [formerly 5094c1ec1c [formerly 38de69ea29c429a2295518fb9d8c1707efe1d3c4]]]
Former-commit-id: c8365fa660
Former-commit-id: 864503773583d07d8597244deea399d7f0d59d17 [formerly 3b247ad783]
Former-commit-id: e977aefb73
2012-01-27 11:50:34 -06:00
Ben Steffensmeier
b92663faed Issue #199 Do not endFrame for panes which are not drawn. This prevents
gl from swapping buffers which leads to a flicker on intel graphics
cards.

Former-commit-id: 5ff423894d [formerly 6cdc7f561a] [formerly 6cbe5bbf71] [formerly 0f906ac4d5 [formerly 6cbe5bbf71 [formerly 05ac4ac87d5371cabc91d82322b2c9728373e8b1]]]
Former-commit-id: 0f906ac4d5
Former-commit-id: d3fb31a063b0236fcdc41f2db8896dcab112716c [formerly 0e27eeebf6]
Former-commit-id: 54990c6377
2012-01-26 15:20:56 -06:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00