Commit graph

42 commits

Author SHA1 Message Date
Steve Harris
dc6ffe2ccf 13.4.1-2 baseline
Former-commit-id: 4533276dd5 [formerly 9212be8b74] [formerly 52f0ae4758] [formerly 4533276dd5 [formerly 9212be8b74] [formerly 52f0ae4758] [formerly 5ebd58a0b3 [formerly 52f0ae4758 [formerly 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d]]]]
Former-commit-id: 5ebd58a0b3
Former-commit-id: 9f9d623cb7 [formerly 6880107d32] [formerly 742c1aa68303bc46ceb9dc5329e59d055f9196d4 [formerly 99bc8c8072]]
Former-commit-id: 98121cb0481fa56429e9421ab7d17667e0bd863c [formerly c0481dcdf2]
Former-commit-id: b2b9dac313
2013-04-24 17:22:10 -05:00
Steve Harris
b0fb1f49be 13.4.1-1 baseline
Former-commit-id: 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]]
Former-commit-id: 00332e6305
Former-commit-id: aecc3cfd89 [formerly 0e950655f1] [formerly fff69f92a60e6f16033e299ff1dd2395fac95290 [formerly 4accbb80db]]
Former-commit-id: 85465ead73fe31102e486ee012a5fcb51cfcc9b9 [formerly 4001e050e7]
Former-commit-id: 722e428c74
2013-04-24 17:15:55 -05:00
Steve Harris
99d89adc2e 13.3.1-20 baseline
Former-commit-id: 9e73c3f1ed [formerly 07f7e6e2b4] [formerly 25432cc388] [formerly 9e73c3f1ed [formerly 07f7e6e2b4] [formerly 25432cc388] [formerly 446bec6f49 [formerly 25432cc388 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]]]
Former-commit-id: 446bec6f49
Former-commit-id: 1749ff8a3c [formerly 8535bceb4c] [formerly 48c43f807cd6cab814e5d057a67effdc5c9ea638 [formerly 4b71131386]]
Former-commit-id: 03e22585dd1936fc2af32023a5ae3b65d4f222f9 [formerly 44cd8d47fb]
Former-commit-id: 953ffdab87
2013-04-15 08:58:59 -05:00
Steve Harris
b6db7821fa 13.3.1-19 baseline
Former-commit-id: 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]]
Former-commit-id: abaf9f12f9
Former-commit-id: fe5020d315 [formerly ed4150db5f] [formerly afa8971d2a4b49801835997c9e04d909cbb5917c [formerly 340a2cfb23]]
Former-commit-id: 8178539bb83f1e27afa01a5dd82705a3f18fc420 [formerly 7d76371536]
Former-commit-id: 7b7efd0bd1
2013-04-09 08:37:12 -05:00
Steve Harris
fd3b082c54 13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]]
Former-commit-id: a3fe998f8f
Former-commit-id: a6ff543f88 [formerly ef413da5f7] [formerly 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]]
Former-commit-id: aceedb117eb5695a6155a52973b981de9bb6252a [formerly 50becef97f]
Former-commit-id: a112803c98
2013-04-01 12:04:56 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
1261f1dbf9 13.3.1-10 baseline
Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]]
Former-commit-id: 7078eec1b1
Former-commit-id: dbeb388d72 [formerly e9f0328808] [formerly 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26]]
Former-commit-id: a425f5b8a103c063bd8067c0d4a3f1cbedcd8f01 [formerly f2cc967a4f]
Former-commit-id: e6ab10cc26
2013-03-20 15:53:01 -05:00
Steve Harris
0b0c5e4bec 13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 2fd4ac9397 [formerly 81a3f29afc] [formerly 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]]
Former-commit-id: 419ae74464bf2fde736619a602f8bbae8a6b4c86 [formerly 0c94cc97fb]
Former-commit-id: 1c2dffd66d
2013-03-18 15:43:32 -05:00
Steve Harris
352658125b 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d [formerly ed5f1dbab6] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd]
Former-commit-id: 88b28c39c1
2013-03-13 09:50:28 -05:00
Steve Harris
b43935a991 13.2.1-6 baseline
Former-commit-id: 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 5027d2365b [formerly bbe92e6824] [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d [formerly 30d38334cc]]
Former-commit-id: 0cd3f4b5889bda9de32b546358edf3d8210d3ad8 [formerly 0c128dd8f0]
Former-commit-id: dc55ef579a
2013-02-07 16:00:39 -06:00
Steve Harris
b92dfd1b62 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
2013-01-23 11:18:44 -05:00
Steve Harris
2c834d0f58 13.2.1-1 baseline
Former-commit-id: 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 1d1791b3b4 [formerly 8ed6a53113] [formerly b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf]]
Former-commit-id: c7cd6e75591b001d138f41ea10b2ed691477e255 [formerly 9146e727f9]
Former-commit-id: 08bf724a6c
2013-01-23 11:13:03 -05:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
94cd5a1388 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de]
Former-commit-id: af59663a99
2012-11-07 12:41:20 -06:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00
Steven Harris
db663faca9 12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83]
Former-commit-id: 2f855322f6
2012-09-27 15:57:45 -05:00
Steve Harris
9d4e230e7a 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
2012-09-11 16:00:38 -05:00
Steve Harris
98059f9ef1 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
2012-08-21 15:27:03 -05:00
Steve Harris
31353e2296 12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121]
Former-commit-id: 16d7d955fc
2012-08-15 13:59:00 -05:00
Steve Harris
c74431ba29 12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
2012-07-10 07:53:49 -05:00
Steve Harris
46068c6716 12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
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
Steve Harris
7f90924706 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
2012-05-01 18:06:13 -05:00
Steve Harris
0cf19dc505 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 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]]
Former-commit-id: 625cd4262c
Former-commit-id: 6aa0898aae [formerly e86dc647be] [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d]]
Former-commit-id: 8ce2584572b74cd38fac4b323558490c8c29e686 [formerly 19657ae52d]
Former-commit-id: 9b8c6e395d
2012-04-19 11:11:02 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Steve Harris
095b190063 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 b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]]
Former-commit-id: 5cdda77afb
Former-commit-id: c6071e24c5 [formerly 9845ef53f9] [formerly a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6]]
Former-commit-id: 863dd9f649ac647186ce86d3db6a31c7237682d4 [formerly 9fee09c9e4]
Former-commit-id: 1556e72eeb
2012-03-30 09:50:48 -05:00
Max Schenkelberg
42696fd296 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 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]]
Former-commit-id: 50765e8a34
Former-commit-id: 458f5970aa [formerly 8f08fab0a7] [formerly 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884]]
Former-commit-id: 732d389245ce92a580088b9302b87702dca2b03d [formerly 6378e8c4ee]
Former-commit-id: 9366a5f308
2012-03-14 09:49:32 -05:00
Max Schenkelberg
714bb7dfec Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 89f603f448 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]]
Former-commit-id: 89f603f448
Former-commit-id: 8b6aa63464 [formerly f78b932abb] [formerly 69a2b029e678fdd8a18305144330e4c95774ec78 [formerly 4662ece060]]
Former-commit-id: 633ae123a39ad609c62c4173a428f3bfbc1fedbd [formerly 1303289d12]
Former-commit-id: 0f005d3521
2012-03-09 12:31:50 -06:00
Max Schenkelberg
67b1edb767 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 52c7dec2e8 [formerly 0554abdde0] [formerly 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb]]
Former-commit-id: de90ce0a3f7817cfc15c75089e7f6a081fef0acc [formerly 585e979c76]
Former-commit-id: ae389f0b57
2012-03-01 16:59:40 -06:00
Steve Harris
f0c1c03fff 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 eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 2e0f1d3ecc [formerly b12f5e5d75] [formerly a529cc7da8a5f072c8a414b5af753a556a2be162 [formerly 33483f3960]]
Former-commit-id: f7595a0be89f8ab41c20c0d16d038e5e650e4712 [formerly acd7845ebd]
Former-commit-id: bcccffbaa4
2012-02-20 13:03:39 -06:00
Steve Harris
2acea8b7d5 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: cc45f5a268 [formerly a2fd2cf6fa] [formerly 6a064cb78b] [formerly cc45f5a268 [formerly a2fd2cf6fa] [formerly 6a064cb78b] [formerly d02529fef4 [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]]
Former-commit-id: d02529fef4
Former-commit-id: 4ffbe4780e [formerly b41e5f2415] [formerly b1cec7b0617c7b5f5c46fade03d4b59fd4aeb442 [formerly d133454b27]]
Former-commit-id: 1d157738e844ae1be12f9b1669c8101f16df9737 [formerly d9c8a99210]
Former-commit-id: d3c80a1557
2012-02-20 12:54:25 -06:00
Steve Harris
8c9e581f41 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]]
Former-commit-id: b137302802
Former-commit-id: 43c3cfdd1a [formerly 1ac6b36d1f] [formerly eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]]
Former-commit-id: f9b44e61385fcc409fa97cc2681f13c4a9c57a4a [formerly 895404abeb]
Former-commit-id: 9a09879521
2012-02-17 10:55:02 -06:00
Steve Harris
95e6601959 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c2a47087ce [formerly 46dda7b8bd] [formerly 2119a1513e] [formerly c2a47087ce [formerly 46dda7b8bd] [formerly 2119a1513e] [formerly 2e29bc8ee2 [formerly 2119a1513e [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: 1d529a0d83 [formerly d23d12d596] [formerly 1e32c15008441ec81c586e6dfaf0f8d5acded476 [formerly cb3371ee28]]
Former-commit-id: 18d1f5125e904eb011450ccd159a15fe5f2fe0e0 [formerly dc9df63a11]
Former-commit-id: 0d9992da14
2012-02-14 15:54:46 -06:00
Ben Steffensmeier
5f8a097b34 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 ced66f23a5 [formerly 6e95175ba2] [formerly ebbbd0bafc] [formerly f7985bff7b [formerly ebbbd0bafc [formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]]]]
Former-commit-id: f7985bff7b
Former-commit-id: 59d62510ea [formerly 99557a2a0f] [formerly d92b9c3f75bd9c764113a021ca2bf3440df9c8f6 [formerly a9e13fac26]]
Former-commit-id: c179c0b5094ae13bfd402f99c51b8a082697dc7e [formerly 7d16f12962]
Former-commit-id: eaf930f7b8
2012-02-10 12:13:34 -06:00
Ben Steffensmeier
a1c5350f5e Issue #235 Added ability to capture multiple frames to NSharp
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc

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

Former-commit-id: 8eb80818ce [formerly 2e37808e48] [formerly e904dadb5e] [formerly 8eb80818ce [formerly 2e37808e48] [formerly e904dadb5e] [formerly c74dae631e [formerly e904dadb5e [formerly 9062fe4b8fdb62840b21aba7c648f48fa691986a]]]]
Former-commit-id: c74dae631e
Former-commit-id: 9e2d8f88e2 [formerly 9c6081d7a3] [formerly 48be892967e3c67b6967381d7bc91582cd36bbf6 [formerly 0873a518c6]]
Former-commit-id: 670b0b590026d550e4cd333e58dc15e1be7d7702 [formerly 4b748f8a34]
Former-commit-id: 5a3c1c56ac
2012-02-07 15:33:23 -06:00
Matt Nash
7cb78d5150 Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
Former-commit-id: e512d27770 [formerly a659029ea0] [formerly f4c5d7f94b] [formerly e512d27770 [formerly a659029ea0] [formerly f4c5d7f94b] [formerly 28e3da498e [formerly f4c5d7f94b [formerly c12bae0a615198f6d409cf5e6d79a6a32e57494d]]]]
Former-commit-id: 28e3da498e
Former-commit-id: 628da725c1 [formerly 8dbb17b2e8] [formerly d0e84e05ac9aabb1cf0f0936159cb5c6919bb005 [formerly ef18b8c47f]]
Former-commit-id: 7add8b2ce2e06b31de0dd26e7afc5fc7caf67c7b [formerly cc50a32732]
Former-commit-id: 53612b087f
2012-02-07 11:45:28 -06:00
Matt Nash
6da2e9a891 Issue #206 radio buttons only select one at a time
Former-commit-id: 3430c01156 [formerly 42b4f10d37] [formerly 5094c1ec1c] [formerly 3430c01156 [formerly 42b4f10d37] [formerly 5094c1ec1c] [formerly c8365fa660 [formerly 5094c1ec1c [formerly 38de69ea29c429a2295518fb9d8c1707efe1d3c4]]]]
Former-commit-id: c8365fa660
Former-commit-id: 8dcbb297c9 [formerly e977aefb73] [formerly 864503773583d07d8597244deea399d7f0d59d17 [formerly 3b247ad783]]
Former-commit-id: b19fb847114911708ed4e3632fcb819c529a71e4 [formerly ca6b480fb8]
Former-commit-id: d757beaf59
2012-01-27 11:50:34 -06:00
Ben Steffensmeier
59460ad8f7 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 5ff423894d [formerly 6cdc7f561a] [formerly 6cbe5bbf71] [formerly 0f906ac4d5 [formerly 6cbe5bbf71 [formerly 05ac4ac87d5371cabc91d82322b2c9728373e8b1]]]]
Former-commit-id: 0f906ac4d5
Former-commit-id: b92663faed [formerly 54990c6377] [formerly d3fb31a063b0236fcdc41f2db8896dcab112716c [formerly 0e27eeebf6]]
Former-commit-id: 5aaad5c1140b31350ef89ef63078a538c2e56c8b [formerly f03edcc502]
Former-commit-id: 3e5db64692
2012-01-26 15:20:56 -06:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00