Ben Steffensmeier
0ee5726a56
merge branch Unifeid_Grid into developement
...
Former-commit-id: c789e1fd94
[formerly 272e057bf1
] [formerly d0a2ed32b5
] [formerly b6a1563bb2
[formerly d0a2ed32b5
[formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: e5e3edb870cf3d09a1893575414b5bd00a8d3081 [formerly 92fd247ccc
]
Former-commit-id: 1d94435220
2012-10-30 12:24:54 -05:00
Ben Steffensmeier
d3fe2e8c91
Issue #189 changes from code review
...
Former-commit-id: 25731091d2
[formerly 3c222ab437
] [formerly 984d128d33
] [formerly 7139c80557
[formerly 984d128d33
[formerly 449762acbbe74173121e19f5c325104221c083a2]]]
Former-commit-id: 7139c80557
Former-commit-id: ed268afbee011a325fcb6afd97574d59f6b6cb4c [formerly b0bf62ce6f
]
Former-commit-id: fcc23a917e
2012-10-25 16:33:59 -05:00
Ben Steffensmeier
e6235141b8
Issue #189 fix several errors with grid resources when there is no valid data.
...
Former-commit-id: 641dbae066
[formerly 601dcf7b31
] [formerly 392e64f33e
] [formerly efb19ceb6f
[formerly 392e64f33e
[formerly 98d52a1d86b5b5325c678a3aedbc4d20c009413d]]]
Former-commit-id: efb19ceb6f
Former-commit-id: 465c35649c653645545ae4813dc1d133bb118d31 [formerly a9c7c3297c
]
Former-commit-id: 1fe73f9c8f
2012-10-23 18:32:55 -05:00
Ben Steffensmeier
05432a9314
Issue #1152 synchronize preload for MemoryBasedTileSet.
...
Former-commit-id: 2463795850
[formerly 8da5cc0bc1
] [formerly 2d0615067b
] [formerly 5fe4533e87
[formerly 2d0615067b
[formerly 4f679955b848f5c6de3e61207c152eca9959d2d7]]]
Former-commit-id: 5fe4533e87
Former-commit-id: 4c9a63b774fa9ba0e319452024d265f7e0ab3a8b [formerly 6d5394dc71
]
Former-commit-id: eb283d6c42
2012-10-03 15:02:16 -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
70566fbec1
12.10.1-5 baseline
...
Former-commit-id: d0cd58d6bc
[formerly 82feb4de50
] [formerly a96d35a1fa
] [formerly 4fd8893e55
[formerly a96d35a1fa
[formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]
Former-commit-id: 4fd8893e55
Former-commit-id: 3760dcf872cc3205410a8002df70f1952ec6e644 [formerly deed84c1a2
]
Former-commit-id: a903893a09
2012-09-17 15:42:31 -05:00
Max Schenkelberg
0ff5dde0ba
Issue #1143 Fixed GriddedImageDisplay2 which is what the CWAT resource uses so stops incorrectly doubling the size of the short array used for display.
...
Change-Id: I7fd59086fc75b7b72ebece857273c8d0c58d2abd
Former-commit-id: ac6c96dc4c
[formerly dc613b2ba7
] [formerly 2b20299319
] [formerly 0b361078b3
[formerly 2b20299319
[formerly 5698f8158b32789bab532e8820521f609e23a8c8]]]
Former-commit-id: 0b361078b3
Former-commit-id: 729af0e9bf1baa090cf92f33588ab1ef791a8ca6 [formerly 0fc001113f
]
Former-commit-id: 18094f00ed
2012-09-13 16:40:00 -05:00
Mike Duff
4a392f3a7e
Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
...
Former-commit-id: 4180c20fbe
[formerly 269d2831d9
] [formerly bcafd807c5
] [formerly 7825863940
[formerly bcafd807c5
[formerly 5504abfd272649dad36357ae7fdce83c75b3e3fa]]]
Former-commit-id: 7825863940
Former-commit-id: a8d4d5f0957d84bdc382ed4bc60b15cf3078cc0b [formerly db6ac1594e
]
Former-commit-id: e443d5b5da
2012-09-11 08:50:55 -05:00
Ben Steffensmeier
f204baba47
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: bc054637f1
[formerly 596b48c490
] [formerly e1c07b5803
] [formerly a988fdf5de
[formerly e1c07b5803
[formerly 61aab7b55f9868e69b43c5250515ce0d5b01d6e5]]]
Former-commit-id: a988fdf5de
Former-commit-id: 4ae8b37adf188b82d73261cd1e97bb73d37e2f3a [formerly 4f16803030
]
Former-commit-id: da05d2dd24
2012-08-22 13:02:56 -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
Max Schenkelberg
d198245bb1
Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet.
...
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac
Former-commit-id: 01b0313c03
[formerly 079a11565a
] [formerly f635e9c332
] [formerly cc0a1fbca3
[formerly f635e9c332
[formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]]]
Former-commit-id: cc0a1fbca3
Former-commit-id: 703689be64513c64e5c5c59d86ee46848a3c571b [formerly 74f0179b92
]
Former-commit-id: 7ee188d90a
2012-08-01 10:51:32 -05:00
James Korman
9d1df24a3d
Issue #798 - Code review changes
...
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 226ff6ea65
[formerly 1166a7cbb1
] [formerly 38a2e426d9
] [formerly 4cbbc59278
[formerly 38a2e426d9
[formerly cb05a9f95384806537106dc804833331d6c7db48]]]
Former-commit-id: 4cbbc59278
Former-commit-id: 6dc3f6ecbe7383c692d6eefe822b05fbf5ec6557 [formerly 5df52e38f9
]
Former-commit-id: 16643cb1bc
2012-07-31 13:38:23 -05:00
Ben Steffensmeier
91e9532d0d
Issue #924 fix concurrency issues for Grid products
...
Former-commit-id: 7a1573aab5
[formerly 286274aed0
] [formerly 0b951d425d
] [formerly 9abd645758
[formerly 0b951d425d
[formerly 767173dc95dc811bc94081415a214803403985f5]]]
Former-commit-id: 9abd645758
Former-commit-id: 3a4bcf89b3760087f1a171aafd08bbb15551323d [formerly cb08c202ef
]
Former-commit-id: af3102991e
2012-07-19 17:37:15 -05:00
Ben Steffensmeier
bd239a7466
Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API.
...
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998
Former-commit-id: 0a7be21041
[formerly 5bf019e1bb
] [formerly 74a69d1fb9
] [formerly 79ab850efa
[formerly 74a69d1fb9
[formerly 009e769a180898cb62e9df4a604b40e139cf2886]]]
Former-commit-id: 79ab850efa
Former-commit-id: 2abc2a1aad032ea41191229591abdad0597e5bc9 [formerly 4182352f8c
]
Former-commit-id: 612e586a6c
2012-07-10 16:04:56 -05:00
Steve Harris
e528bb0df2
12.6.1-9 baseline
...
Former-commit-id: 32fdf6ed3b
[formerly 7c064b6868
] [formerly 2c0ff851ca
] [formerly 27afa60345
[formerly 2c0ff851ca
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0
]
Former-commit-id: dc50bc8443
2012-07-10 07:53:49 -05:00
Max Schenkelberg
58abd127b7
Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
...
Amend: Fixed Richard's comments
Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3
Former-commit-id: 3bff06cf92
[formerly 7d13c7d339
] [formerly 9bbb68a547
] [formerly 98c2ec7dc5
[formerly 9bbb68a547
[formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: 16ed73fb714995ccf7fe67f7b63b429bcc378657 [formerly 7286b4e962
]
Former-commit-id: c6d324aaeb
2012-07-06 16:01:47 -05:00
Max Schenkelberg
6ef03d0f02
Issue #763 Removed references to OBE cots org.apahce.tomcat.nativ to reduce size of collaboration standalone product. This project could now be removed from the baseline
...
Change-Id: I9d8d0155afa5c01f3cc027a5f5adb0e2a9893e47
Former-commit-id: f0f4ad8039
[formerly e1d23a56a9
] [formerly 62bd4a667a
] [formerly a3014f6ec3
[formerly 62bd4a667a
[formerly 24423c6b03bffd01313a93b6c641b3d8fef35902]]]
Former-commit-id: a3014f6ec3
Former-commit-id: 034844bd3b9932f93968553e4d47a01992315f8b [formerly 9328717a1a
]
Former-commit-id: 544ffdc4ca
2012-06-28 15:29:05 -05:00
Bryan Kowal
dfd75b4c72
Merge branch 'ss_sync' (OB12.6.1-10) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 455d7b90a9
[formerly b1b294c401
] [formerly a33740e915
] [formerly b87b66abc5
[formerly a33740e915
[formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe
]
Former-commit-id: b4917e6708
2012-06-27 17:21:48 -05:00
Steve Harris
7550311ef6
12.6.1-10 baseline
...
Former-commit-id: a9742f306e
[formerly edac4d827c
] [formerly 8dc4a774e2
] [formerly 3cd0902b49
[formerly 8dc4a774e2
[formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 1a8021953ed3a77781e285be5837377b59afd5e3 [formerly eacd5aeb7f
]
Former-commit-id: efe25edfad
2012-06-21 08:58:00 -05:00
Steve Harris
944e3148d4
Revert "12.6.1-10 baseline"
...
This reverts commit 530dfc0563
[formerly f8497470fc
] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf
]] [formerly a2c0893d1a
] [formerly 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly a2c0893d1a
[formerly ddde63eee0
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]].
Former-commit-id: 584f7eddf8
[formerly 62cf6a9f92
] [formerly b4b1f6975f
] [formerly 25198a5cd6
[formerly b4b1f6975f
[formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5
]
Former-commit-id: 333fd9c64e
2012-06-21 08:51:08 -05:00
Steve Harris
530dfc0563
12.6.1-10 baseline
...
Former-commit-id: 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly a2c0893d1a
[formerly ddde63eee0
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]
Former-commit-id: a2c0893d1a
Former-commit-id: c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf
]
Former-commit-id: f8497470fc
2012-06-21 08:38:48 -05:00
Ben Steffensmeier
e1139e8bcc
Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
...
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97
Former-commit-id: d0354ad4e4
[formerly 2da8a0df2f
] [formerly aad1eb18b0
] [formerly 9068e049cb
[formerly aad1eb18b0
[formerly 901f061f9e19f39cf5096a394cbd238c5562d733]]]
Former-commit-id: 9068e049cb
Former-commit-id: b1a38642bb839232d00e6dd72ecd1785344a38a9 [formerly dd496b3d90
]
Former-commit-id: bded5dde2b
2012-06-14 16:44:19 -05:00
Steve Harris
d5c94ccef2
12.6.1-5 baseline
...
Former-commit-id: 1ad64ffa98
[formerly 09f73b0601
] [formerly c99afab05f
] [formerly 8947efbc7f
[formerly c99afab05f
[formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d
]
Former-commit-id: b69fa75919
2012-06-11 16:23:47 -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
Steve Harris
8025cc609e
12.5.1-2 baseline
...
Former-commit-id: c1bc408f84
[formerly ac708c050d
] [formerly 84d191e7b6
] [formerly b36c69cc67
[formerly 84d191e7b6
[formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf
]
Former-commit-id: f6300cd995
2012-05-03 19:17:13 -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
Ben Steffensmeier
9eb242a64a
Issue #198 enable progress bar for satellite and cancel all jobs when it
...
is disposed or when it has successfully rendered a frame.
Former-commit-id: e2ba42ca48
[formerly 80766211c7
] [formerly e4875ea830
] [formerly 6bb90885c8
[formerly e4875ea830
[formerly bb0d4d876c130f8d7beba34507466c4024ce3600]]]
Former-commit-id: 6bb90885c8
Former-commit-id: f6c6b8910023c4e21af1bf6909d0b9016ac313a7 [formerly 0ae2291e53
]
Former-commit-id: 5a27eafc32
2012-01-26 15:45:27 -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