Max Schenkelberg
dccb0d1350
Issue #1638 Made string rendering always look right despite extent proportions so it is never warped. Moved dataURI map creation to DataURIUtil. Fixed double dispose of controls in VizDisplayPane, also made resize non interface method.
...
Amend: Fixed menu mix up and making sure perspective bar is on by default
Change-Id: I0c19e5fbf0f0d29cdca0f63afb33ca964a145b94
Former-commit-id: 259982918f
[formerly c8fcaf06d1
] [formerly b336095f6cef1ceaade468d41b34e7a6ff3c91c3 [formerly b91b706701
]] [formerly 1d3c378dde
[formerly b91b706701
[formerly 53e42aa3925399271cc3ad4ee964476ddffc8eb6]]]
Former-commit-id: 1d3c378dde
Former-commit-id: a2c21fee41cbb58a585e7280c1318378ee5b8959 [formerly e05c12e246
]
Former-commit-id: 69abb31ee6
2013-04-19 14:57:40 -05:00
Ben Steffensmeier
786490e228
Issue #1782 fix merge problems related to graphics API.
...
Former-commit-id: b8e7e8868f
[formerly 0aad550439
] [formerly 2b898e58c7
] [formerly 6edee13cdd
[formerly 2b898e58c7
[formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]]
Former-commit-id: 6edee13cdd
Former-commit-id: 12a49ee4a881d261f0a943322274ece3293cc090 [formerly 76a6213807
]
Former-commit-id: f983e5d705
2013-03-26 12:06:45 -05:00
Steve Harris
5be2208aaf
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.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/internal/ext/mosaic/GLMosaicImageExtension.java
edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: e154e58354
[formerly b0621d90bc
] [formerly fd71e44f0f
] [formerly a23cecdb26
[formerly fd71e44f0f
[formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]
Former-commit-id: a23cecdb26
Former-commit-id: 26c72d3b440387cfdf094f0ac6a91b946edf8f59 [formerly e96e95b565
]
Former-commit-id: 02105701a0
2013-03-26 10:12:34 -05:00
Max Schenkelberg
44f5bd04b6
Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
...
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair
Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0
Former-commit-id: 2da689223f
[formerly 07ae94c499
] [formerly ea26d0de84
] [formerly 126be0cfe5
[formerly ea26d0de84
[formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]]
Former-commit-id: 126be0cfe5
Former-commit-id: b81da1853ef8773cba40a9f1ed03ab5d498966c2 [formerly d20958ae92
]
Former-commit-id: 850c8995cc
2013-03-22 10:54:44 -05:00
Ben Steffensmeier
3e3e114898
Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures.
...
Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51
Former-commit-id: 6cbdf5beda
[formerly 3cc175f373
] [formerly e69011cdd8
] [formerly de02fe7922
[formerly e69011cdd8
[formerly 26baf1550ad70417a68bd0a36ea99ac83c6d39cd]]]
Former-commit-id: de02fe7922
Former-commit-id: 53fc7d83e457d86a8b95d9126ec3adbb8909a627 [formerly 6ce135a80a
]
Former-commit-id: 4323ea54d2
2013-03-21 11:09:23 -05:00
Ben Steffensmeier
4936191404
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: 8e2333d0d7
[formerly d27d30c2db
] [formerly f46686a6e2
] [formerly 2ca86633d6
[formerly f46686a6e2
[formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: fa7abe8431fbbdea60e6504cd61a867956d20856 [formerly 5068b18c6a
]
Former-commit-id: 334af0001b
2013-02-28 17:00:56 -06:00
Max Schenkelberg
2aef608c3f
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
...
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: d0b7850775
[formerly 2611980ca4
] [formerly 4ed4ef8d71
] [formerly e0ba97d547
[formerly 4ed4ef8d71
[formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]
Former-commit-id: e0ba97d547
Former-commit-id: c22d83de78a7efcb6e70f98b882e95d6a6e64ae6 [formerly 6b1426dd34
]
Former-commit-id: 5617dfaa67
2013-02-27 11:50:38 -06:00
Ben Steffensmeier
4140260659
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
...
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: bd6e0f8462
[formerly 1940a92596
] [formerly aa4c7526ff
] [formerly 8c0e9d3d9e
[formerly aa4c7526ff
[formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: badd785e8aa7a433093d24b4c4bf0d45450daf4a [formerly 455aa4628f
]
Former-commit-id: 086f6aabe9
2013-02-14 15:34:25 -06:00
Ben Steffensmeier
b79c1ab24f
Issue #1564 correct mosaic ordered shader shader.
...
Former-commit-id: 1a64db22b1
[formerly 153b826ca9
] [formerly ebae642c8a
] [formerly 9bf9b1cc0d
[formerly ebae642c8a
[formerly 514ae219a7e986ca420d28a0c480de4c4d31bbdb]]]
Former-commit-id: 9bf9b1cc0d
Former-commit-id: d92b64a0bf697d0e6d3938e713596a22bf3878e0 [formerly c43bd1a5ab
]
Former-commit-id: 723c4c87a7
2013-01-31 15:26:16 -06:00
Max Schenkelberg
754fe67e13
Issue #1329 Fixed issues with tile intersection calculation.
...
Change-Id: I753abdfefc0ed38ef838c3f7b8de6d1cd1ee264a
Former-commit-id: 978c200f04
[formerly 14f102d8ae
] [formerly b4952b003a
] [formerly 373de78320
[formerly b4952b003a
[formerly 8b5bfd7e9010f9ffd4ce019c5fd961e1b370ff1e]]]
Former-commit-id: 373de78320
Former-commit-id: 94aad176091cd344656ab44ae8b6a7db61c25bf6 [formerly adf6aed592
]
Former-commit-id: 886c39f5a4
2012-12-17 17:05:34 -06:00
Max Schenkelberg
cf9e6ff3b2
Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
...
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb
Former-commit-id: 24938de2d2
[formerly be99f6c7ca
] [formerly 3e128b266a
] [formerly 5db71ca943
[formerly 3e128b266a
[formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]
Former-commit-id: 5db71ca943
Former-commit-id: e215a3aeda7dede45a9e7e93feb2e2f2e9e6e34b [formerly b74d788909
]
Former-commit-id: d43e0c1c25
2012-12-12 11:39:32 -06:00
Ron Anderson
76141bfc05
Issue #1395 Modified LineStyle to contain a definition of the style so that GL and SWT can render them the same way
...
Change-Id: I9e9875c3d56870309d4c5420a541674fb8733a09
Former-commit-id: 03dff87b0d
[formerly 330e913cb2
] [formerly 5143e82d4a
] [formerly 9398573f2f
[formerly 5143e82d4a
[formerly 6c2704dffcbadab19611464df580f781bb5ebefd]]]
Former-commit-id: 9398573f2f
Former-commit-id: d82c8ff0301aef55921e5f77656fa41a6963ce17 [formerly 10479a1909
]
Former-commit-id: d42afa44dc
2012-12-06 15:38:04 -06:00
Ben Steffensmeier
09a3a976e3
Issue #1371 fix offscreen rendering on graphics cards that don't support luminance.
...
Former-commit-id: 78e9553fcc
[formerly a980e67c9c
] [formerly 16b918000e
] [formerly 73dbed5bfc
[formerly 16b918000e
[formerly 4c620ffc4a6df585c67b41868ec1b28dab21a7e4]]]
Former-commit-id: 73dbed5bfc
Former-commit-id: d50a723a5f3f8ee10034ca4246ae5e1c170ca48d [formerly 4a6fc8ea28
]
Former-commit-id: 979e0ccc4e
2012-12-04 12:28:43 -06:00
Ben Steffensmeier
24de750932
merge Unified_Grid with ss_builds to 12.11.1-7
...
Former-commit-id: 1a215cb42a
[formerly 4f503d3a1e
] [formerly 6a9ff88b33
] [formerly c2934ae7a5
[formerly 6a9ff88b33
[formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8
]
Former-commit-id: 9b8f2bcdbd
2012-10-25 12:22:11 -05:00
Steve Harris
c9b563338a
12.11.1-4 baseline
...
Former-commit-id: 6e44abdba1
[formerly 98171b5de9
] [formerly d3497e47eb
] [formerly 6958b861f0
[formerly d3497e47eb
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce
]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00
Ben Steffensmeier
97c23508d7
Merge branch 'ss_builds' into Unified_Grid
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
Former-commit-id: a67ce9586c
[formerly de3769129c
] [formerly 8b7256b1ae
] [formerly 266a2f317f
[formerly 8b7256b1ae
[formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]
Former-commit-id: 266a2f317f
Former-commit-id: aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3
]
Former-commit-id: fde1e73d58
2012-10-12 12:45:50 -05:00
Ben Steffensmeier
9b5abe464b
Issue #189 switch GL to use regular floats so it works with very samll values and NaN.
...
Former-commit-id: 518fadf1d1
[formerly 6441db74b0
] [formerly b5df6b6ef4
] [formerly 0a0597302f
[formerly b5df6b6ef4
[formerly f850384883b1faaf3f1092aa2a40cac89b952c5f]]]
Former-commit-id: 0a0597302f
Former-commit-id: 6e7a652c48cb1c7220a6f390ddfe133b7f8702d5 [formerly 3477060b44
]
Former-commit-id: a9d7ca9e96
2012-10-01 13:19:00 -05:00
Steven Harris
9c67bbab77
12.11.1-1 baseline
...
Former-commit-id: ffe3641057
[formerly 0e86bfd1d3
] [formerly 618aa3f316
] [formerly feec28f274
[formerly 618aa3f316
[formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022
]
Former-commit-id: f5e63d5f93
2012-09-27 15:57:45 -05:00
Steve Harris
11421048fb
12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
...
Former-commit-id: bbc20f4a68
[formerly 22dac5c82e
] [formerly 077ced354e
] [formerly fd5e214e72
[formerly 077ced354e
[formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]
Former-commit-id: fd5e214e72
Former-commit-id: bdf8cbe13f96fe312d8ad014285d113e04c8d85a [formerly ba25027ea5
]
Former-commit-id: 9f3bd0d4ec
2012-09-12 13:10:36 -05:00
Steve Harris
64699fa90b
12.10.1-3 baseline
...
Former-commit-id: 0403e7d0a9
[formerly de1639aea2
] [formerly 21f430062b
] [formerly 969e7e6dfd
[formerly 21f430062b
[formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd
]
Former-commit-id: f376a4b4db
2012-09-11 16:00:38 -05:00
Steve Harris
d9faed979f
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5
[formerly a1d931fd44
] [formerly 61f269f54c
] [formerly f2fac39428
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb
]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
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
Max Schenkelberg
c5b45b0265
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: e0a22310dc
[formerly 2ef208b263
] [formerly 3fe183277b
] [formerly e3d6962fe6
[formerly 3fe183277b
[formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]
Former-commit-id: e3d6962fe6
Former-commit-id: b0a578678016a097651cd359f6c7d0ad3223db18 [formerly 878de45ee6
]
Former-commit-id: 338f80fa87
2012-05-01 18:36:09 -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
Max Schenkelberg
937f4b6aa3
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 9126809973
[formerly e03ee60c75
] [formerly 1294fa0ca1
] [formerly 90a5c20b5a
[formerly 1294fa0ca1
[formerly bd93246cccd1b123598006d7343eac265392695d]]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 2e1507a1308f6373329e72eb1d9ccc52bd416fb3 [formerly 65c864aff2
]
Former-commit-id: 51a826384e
2012-04-19 11:11:34 -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
Max Schenkelberg
ea7fcde242
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 25cf44a674
[formerly 74458bfb73
] [formerly 9b0d01f8b5
] [formerly 07cf5069ba
[formerly 9b0d01f8b5
[formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]
Former-commit-id: 07cf5069ba
Former-commit-id: bf3b4f5b4265812c5767225a4547be327787f7dd [formerly 993cac891e
]
Former-commit-id: 4234b91d5b
2012-03-30 10:51:31 -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
5fc757226e
Issue #358 Made wireframe shapes rely more on the grid geoemtry of the
...
descriptor than the actual descriptor as the descriptor is used purely
for convenience
Former-commit-id: 86d3763df0
[formerly 66eaffb9ee
] [formerly 15a9245592
] [formerly f10f1a5319
[formerly 15a9245592
[formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]
Former-commit-id: f10f1a5319
Former-commit-id: 6d1ea66ba9a1390c296443e20785aa9ef4a890fa [formerly ac11dd0c18
]
Former-commit-id: bbab188fb9
2012-03-28 13:32:04 -05:00
Max Schenkelberg
f51a9e5571
Issue #358 Fixed painting and sampling regression in radar mosaic due to
...
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements
Former-commit-id: 732c2ddb5c
[formerly 10b720381b
] [formerly 719f87c261
] [formerly 556a270a09
[formerly 719f87c261
[formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 556a270a09
Former-commit-id: c943e46db5cb54b3fb026d1fe63057721df3c99d [formerly ba8af4dcc1
]
Former-commit-id: a4b859ae54
2012-03-14 18:03:44 -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
Ben Steffensmeier
d5118790dd
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 8fd9d92f0a
[formerly 20481daa1b
] [formerly 357dc4d88b
] [formerly 637c051a23
[formerly 357dc4d88b
[formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]
Former-commit-id: 637c051a23
Former-commit-id: bc7a93cc6ff900a77e00a7eb9d6864845eda90c8 [formerly 62f1ea0aac
]
Former-commit-id: 88d2d2e4b6
2012-02-24 14:57:23 -06:00
Ben Steffensmeier
e99e823ca8
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 13ecc7e4ea
[formerly b776d953d7
] [formerly 06c9d4cdcf
] [formerly 55aa66a510
[formerly 06c9d4cdcf
[formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]]
Former-commit-id: 55aa66a510
Former-commit-id: caf20037931a8dff74e314931dddc204682bcdf7 [formerly 5d6b036ed7
]
Former-commit-id: c3d3142bab
2012-02-22 17:40:48 -06:00
Ben Steffensmeier
ab464fde3e
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
...
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 1c1500408b
[formerly 27973ec694
] [formerly 69e8cde115
] [formerly 73d24fad2f
[formerly 69e8cde115
[formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]]
Former-commit-id: 73d24fad2f
Former-commit-id: 2e661e9d7cba71c6da9333bda034d1523204696a [formerly dcbe4fc7da
]
Former-commit-id: 0ee68fb6cc
2012-02-20 15:28:20 -06:00
Ben Steffensmeier
7dd3206882
Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
...
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9
Former-commit-id: d9a3c84933
[formerly ddd5ee68ad
] [formerly 863fa0f635
] [formerly 3f60daa9c7
[formerly 863fa0f635
[formerly b7b3a581e8291313833b20da308f5adc5a234f26]]]
Former-commit-id: 3f60daa9c7
Former-commit-id: e3debd0d8974eb97e4ab13e3a2137a497123f416 [formerly d49939ddb2
]
Former-commit-id: b09c00244e
2012-02-08 16:29:02 -06:00
Ben Steffensmeier
b4eed50d5c
Issue #21 update offscreen rendering to work correctly with graphics cards that do not support luminance.
...
Change-Id: Id04fc4cd643840ddcf39d617d4594def9f013917
Former-commit-id: 73bc155708
[formerly 2306325a34
] [formerly eb9062a016
] [formerly 554313dcc8
[formerly eb9062a016
[formerly 53fc5959effe94c2775627a3cd88a5c0287c22d3]]]
Former-commit-id: 554313dcc8
Former-commit-id: c6052896e52c6a3d27a2a351e9f0175039987fd1 [formerly 1e463b6d52
]
Former-commit-id: f8655c1887
2012-01-27 11:50:16 -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