Commit graph

13 commits

Author SHA1 Message Date
Steve Harris
7eaa5ba208 12.5.1-15 baseline
Former-commit-id: 015a8da70c [formerly 2f10c7a1e4] [formerly 8552902906] [formerly 8552902906 [formerly b13cbb7e00]] [formerly 015a8da70c [formerly 2f10c7a1e4] [formerly 8552902906] [formerly 8552902906 [formerly b13cbb7e00]] [formerly 3904c4ccf5 [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 8ccf4a080b [formerly 1f521a70b3] [formerly 97c4db937e] [formerly 97da88e714a2380193993a8566392a59d8676bcd [formerly 0e40eb424698bf43c230ac21347627590405fcb2] [formerly 97c4db937e [formerly 676ea3192f]]]
Former-commit-id: af467b247de91107ea43705eb1f608a755f6dd75 [formerly 5dd364497cd5da1357297a4b842e962ad3d5e006] [formerly 39ff9954f8 [formerly 9054c5ab6c]]
Former-commit-id: 39ff9954f8
Former-commit-id: 46068c6716
2012-06-08 13:39:48 -05:00
Steve Harris
d4a05f8fe7 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: 96e46d555b [formerly fe946166ed] [formerly 4ec294b525] [formerly 4ec294b525 [formerly 2ed7249613]] [formerly 96e46d555b [formerly fe946166ed] [formerly 4ec294b525] [formerly 4ec294b525 [formerly 2ed7249613]] [formerly 7b75b781ad [formerly 4ec294b525 [formerly 2ed7249613] [formerly 7b75b781ad [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 08554ea00c [formerly 3992b18e28] [formerly 7c7fc97131] [formerly 9ee665afb795cedd34fe668f888bdf442dac1e05 [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4] [formerly 7c7fc97131 [formerly 6dd3ee8809]]]
Former-commit-id: 75097a3bb4faeb3f7f6bfcba75fe018bc8fdd576 [formerly 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b] [formerly 491aa53a0c [formerly fd9e226b35]]
Former-commit-id: 491aa53a0c
Former-commit-id: 3419f72215
2012-05-01 18:31:09 -05:00
Steve Harris
a7d4792406 12.4.1-10 baseline
Former-commit-id: 5a9d6c7e53 [formerly 7fa9dbd5fb] [formerly 4bfbdad17d] [formerly 4bfbdad17d [formerly 9f8cb727a5]] [formerly 5a9d6c7e53 [formerly 7fa9dbd5fb] [formerly 4bfbdad17d] [formerly 4bfbdad17d [formerly 9f8cb727a5]] [formerly 8485b90ff8 [formerly 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 6723602d7c [formerly 40aa780b3d] [formerly 33a67cdd82] [formerly 52719153ecfda25f148e6c62deff2923a38c0bc2 [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319] [formerly 33a67cdd82 [formerly a28d70b5c5]]]
Former-commit-id: 8222befd757ec0a8a9a4056a4f80321f65ebe856 [formerly a16a1b4dd44fc344ee709abbe262aeed58a8339b] [formerly 0c25458510 [formerly e5543a0e86]]
Former-commit-id: 0c25458510
Former-commit-id: 7f90924706
2012-05-01 18:06:13 -05:00
Steve Harris
378580bfa7 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: 806ab798eb [formerly 634d40a156] [formerly 63f11892e8] [formerly 63f11892e8 [formerly 4d7572a632]] [formerly 806ab798eb [formerly 634d40a156] [formerly 63f11892e8] [formerly 63f11892e8 [formerly 4d7572a632]] [formerly 625cd4262c [formerly 63f11892e8 [formerly 4d7572a632] [formerly 625cd4262c [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]]]
Former-commit-id: 625cd4262c
Former-commit-id: b9baa827fb [formerly 6aa0898aae] [formerly e86dc647be] [formerly dac839070782d5a0063cf4c5125ad4335ecf6d73 [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f] [formerly e86dc647be [formerly def458753d]]]
Former-commit-id: 59b165758ae42991d423c75a9fa27df01b740f79 [formerly 8ce2584572b74cd38fac4b323558490c8c29e686] [formerly 9b8c6e395d [formerly 19657ae52d]]
Former-commit-id: 9b8c6e395d
Former-commit-id: 0cf19dc505
2012-04-19 11:11:02 -05:00
Steve Harris
26b250dbd1 12.4.1-4 baseline
Former-commit-id: 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 2a216f333c [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 6456a7f75f [formerly 98d8b3f188] [formerly a2a6a18fae] [formerly 8177a31ae65520dcaf2978b703dc497369e03cf1 [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b] [formerly a2a6a18fae [formerly a4e519f3cd]]]
Former-commit-id: a5e6e414f62a4ad9f7e0da4037f64ad5885e2f16 [formerly 816045b74a6ddb3791f4e241a6f25a4d4ab3391a] [formerly 74b66d9683 [formerly 8cd5974f4c]]
Former-commit-id: 74b66d9683
Former-commit-id: 5b35d8a6e0
2012-04-18 15:18:16 -05:00
Steve Harris
6cfb235578 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: ceb1839ffe [formerly b4846ce8a8] [formerly a4e4792bb5] [formerly a4e4792bb5 [formerly d3ad6095b7]] [formerly ceb1839ffe [formerly b4846ce8a8] [formerly a4e4792bb5] [formerly a4e4792bb5 [formerly d3ad6095b7]] [formerly 5cdda77afb [formerly a4e4792bb5 [formerly d3ad6095b7] [formerly 5cdda77afb [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]]]
Former-commit-id: 5cdda77afb
Former-commit-id: 628d2034b2 [formerly c6071e24c5] [formerly 9845ef53f9] [formerly dc643e390bbb0e640e8b8359ebde1ec5c72c0607 [formerly a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58] [formerly 9845ef53f9 [formerly 6aa18f74f6]]]
Former-commit-id: 2054eb0b446385b4ef626fd6a3d19989833cb826 [formerly 863dd9f649ac647186ce86d3db6a31c7237682d4] [formerly 1556e72eeb [formerly 9fee09c9e4]]
Former-commit-id: 1556e72eeb
Former-commit-id: 095b190063
2012-03-30 09:50:48 -05:00
Max Schenkelberg
f8021a0b42 Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: a36ae8f15d [formerly 3beecc1cdf] [formerly 18805c68f7] [formerly 18805c68f7 [formerly d43b0456d8]] [formerly a36ae8f15d [formerly 3beecc1cdf] [formerly 18805c68f7] [formerly 18805c68f7 [formerly d43b0456d8]] [formerly 89f603f448 [formerly 18805c68f7 [formerly d43b0456d8] [formerly 89f603f448 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]]]
Former-commit-id: 89f603f448
Former-commit-id: 59cbd3efc2 [formerly 8b6aa63464] [formerly f78b932abb] [formerly 6dc1489d12555cc7d28c9dace11e041f855e7f11 [formerly 69a2b029e678fdd8a18305144330e4c95774ec78] [formerly f78b932abb [formerly 4662ece060]]]
Former-commit-id: 5b833ac9bcda8646a0ad797388907a4066485c9a [formerly 633ae123a39ad609c62c4173a428f3bfbc1fedbd] [formerly 0f005d3521 [formerly 1303289d12]]
Former-commit-id: 0f005d3521
Former-commit-id: 714bb7dfec
2012-03-09 12:31:50 -06:00
Steve Harris
f0dfcf2d05 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: a22b78548d [formerly 60b350f7f2] [formerly 695e2979c3] [formerly 695e2979c3 [formerly 1002555dbd]] [formerly a22b78548d [formerly 60b350f7f2] [formerly 695e2979c3] [formerly 695e2979c3 [formerly 1002555dbd]] [formerly f693b6d0a7 [formerly 695e2979c3 [formerly 1002555dbd] [formerly f693b6d0a7 [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]]]
Former-commit-id: f693b6d0a7
Former-commit-id: 90c4d92a39 [formerly 5ee70f0f28] [formerly 93e856457b] [formerly 718f270a549097b768b965ad2b3cadd3888b7f11 [formerly ad66d263d16a34b9108e5df9e52a2625e742ad07] [formerly 93e856457b [formerly f650243958]]]
Former-commit-id: f5b76ebeb6f6ee4ab09475136bc931b855b508b9 [formerly c794a75c8d74844afb8888a761b9fa0f1da0eaac] [formerly 87ffdc4f01 [formerly 3cbce90726]]
Former-commit-id: 87ffdc4f01
Former-commit-id: 9df09d3111
2012-02-09 08:54:18 -06:00
Max Schenkelberg
7e1371a36c Issue #206 - Fixed loading and disposing bugs in tear off menus
Issue #206 Fixed bugs in maps menu and other dynamically created menus


Former-commit-id: eb2ecaaab4 [formerly 885f291b35] [formerly be37f19c90] [formerly be37f19c90 [formerly 370e20f0ae]] [formerly eb2ecaaab4 [formerly 885f291b35] [formerly be37f19c90] [formerly be37f19c90 [formerly 370e20f0ae]] [formerly a7ccea5eda [formerly be37f19c90 [formerly 370e20f0ae] [formerly a7ccea5eda [formerly 875c90104e80d95798956330e24b59d83ef52942]]]]]
Former-commit-id: a7ccea5eda
Former-commit-id: 215193f8d6 [formerly 26b5acd957] [formerly 825bd76f55] [formerly 7b710c402a49ea8adcdf21a1450bf5a45bb2188b [formerly ead10f07881d137ecc80314da8c248c4e77e5f1b] [formerly 825bd76f55 [formerly a6622153d7]]]
Former-commit-id: 18e144f5bd9f49a3902d5b42b72311ccd899979d [formerly ab8f916eb71b9c4a01d3b1b2acdc2d21f22703d0] [formerly a6c4e04126 [formerly 4ba7705369]]
Former-commit-id: a6c4e04126
Former-commit-id: 18662550ee
2012-02-07 16:12:19 -06:00
Ben Steffensmeier
75bbcc3b58 Issue #227 enhanced caching of maps for thin client
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94

Former-commit-id: 4bb315a38a [formerly 2c1110953c] [formerly 138b4de82f] [formerly 138b4de82f [formerly 0617773c79]] [formerly 4bb315a38a [formerly 2c1110953c] [formerly 138b4de82f] [formerly 138b4de82f [formerly 0617773c79]] [formerly 9b78596436 [formerly 138b4de82f [formerly 0617773c79] [formerly 9b78596436 [formerly 067ba5b7d28174d99119d5bf87a28334578f78dd]]]]]
Former-commit-id: 9b78596436
Former-commit-id: 9f1177cf96 [formerly 68e1a7c2f1] [formerly 5deb83a291] [formerly 84b28df3bf715a2b20800623bfbb4da6709ab60c [formerly ed3367219c6c038731023f39d10bc892cdd2132f] [formerly 5deb83a291 [formerly a714f57f78]]]
Former-commit-id: 3fde305d6a01d33b8396245ea9177ae733a6881d [formerly 2e5faaafda0772397c471d118d97379815249b52] [formerly 774f2614d0 [formerly 82db9d2c0c]]
Former-commit-id: 774f2614d0
Former-commit-id: 4d9bd2fa9b
2012-01-31 10:53:10 -06:00
Matt Nash
2b1ab0a6d0 Issue #26 add tear off code to git baseline
Former-commit-id: b427209b3c [formerly ea6ef73802] [formerly 892cb9a7ae] [formerly 892cb9a7ae [formerly cf4e1f764e]] [formerly b427209b3c [formerly ea6ef73802] [formerly 892cb9a7ae] [formerly 892cb9a7ae [formerly cf4e1f764e]] [formerly 4286cb0342 [formerly 892cb9a7ae [formerly cf4e1f764e] [formerly 4286cb0342 [formerly dedac216cfa51bd413f7c4d1f7db5ee8ce665866]]]]]
Former-commit-id: 4286cb0342
Former-commit-id: 09f1033e5a [formerly e4fb11ce75] [formerly e8d239e963] [formerly 48058ffd8721f275a61bf1c77cd79476b89300c8 [formerly 6e2a1045719c1a26e7628366b3ec9f4ceaa8912c] [formerly e8d239e963 [formerly 8e3d2af84e]]]
Former-commit-id: c6e71a56466755a14d0776a5c5bacb2bcac6e1dc [formerly 1e134f6cafd331aaf1b78e49c9aa7f8df38c2bf3] [formerly 8997f82570 [formerly 240ac978f2]]
Former-commit-id: 8997f82570
Former-commit-id: ff53dcd67f
2012-01-25 12:50:31 -06:00
Matt Nash
1b128de135 Moving 12.1.1 into ss_sync
Former-commit-id: 6bcbc7d8ef [formerly d8da2252c3] [formerly 580e2938d7] [formerly 580e2938d7 [formerly 66be3bec40]] [formerly 6bcbc7d8ef [formerly d8da2252c3] [formerly 580e2938d7] [formerly 580e2938d7 [formerly 66be3bec40]] [formerly c83e5ff474 [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]]
Former-commit-id: c83e5ff474
Former-commit-id: 50944163ba [formerly fa4cd88c90] [formerly 82300ccdcf] [formerly bcc32c10bc [formerly 21d2361f00] [formerly 82300ccdcf [formerly 1faae42484]]]
Former-commit-id: bcc32c10bc [formerly 21d2361f00]
Former-commit-id: bcc32c10bc
Former-commit-id: 515196cb86
2012-01-19 11:53:12 -06:00
root
57877615f5 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 06a8b51d6d [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 2c3569dd39 [formerly 9bb8decbcf] [formerly 8e80217e59] [formerly e2ecdcfe33 [formerly 377dcd10b9] [formerly 8e80217e59 [formerly 3360eb6c5f]]]
Former-commit-id: e2ecdcfe33 [formerly 377dcd10b9]
Former-commit-id: e2ecdcfe33
Former-commit-id: 7dbd17a5aa
2012-01-06 08:55:05 -06:00