xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
241 commits 31 branches 40 tags 3.8 GiB
Commit graph

145 commits

Author SHA1 Message Date
Max Schenkelberg
33d08f1496 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: e03ee60c75 [formerly 1294fa0ca1] [formerly e03ee60c75 [formerly 1294fa0ca1] [formerly 90a5c20b5a [formerly bd93246cccd1b123598006d7343eac265392695d]]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 51a826384e [formerly 65c864aff2]
Former-commit-id: 72a27b7ae0
 2012-04-19 11:11:34 -05:00
Steve Harris
9b8c6e395d 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: 63f11892e8 [formerly 4d7572a632] [formerly 63f11892e8 [formerly 4d7572a632] [formerly 625cd4262c [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: e86dc647be [formerly def458753d]
Former-commit-id: 19657ae52d
 2012-04-19 11:11:02 -05:00
Steve Harris
74b66d9683 12.4.1-4 baseline 
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
 2012-04-18 15:18:16 -05:00
Max Schenkelberg
e8bc0cfa66 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 74458bfb73 [formerly 9b0d01f8b5] [formerly 74458bfb73 [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]
Former-commit-id: 07cf5069ba
Former-commit-id: 4234b91d5b [formerly 993cac891e]
Former-commit-id: f20e674318
 2012-03-30 10:51:31 -05:00
Steve Harris
1556e72eeb 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: a4e4792bb5 [formerly d3ad6095b7] [formerly a4e4792bb5 [formerly d3ad6095b7] [formerly 5cdda77afb [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: 9845ef53f9 [formerly 6aa18f74f6]
Former-commit-id: 9fee09c9e4
 2012-03-30 09:50:48 -05:00
Steve Harris
293563cfe7 12.3.1-10 baseline 
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 8bc60b1e32 [formerly ce3b74c605]
Former-commit-id: 2e0f4b241b
 2012-03-30 08:38:33 -05:00
Steve Harris
0a7cb5fd7a Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: 0665862abe [formerly 70357d90bc] [formerly 0665862abe [formerly 70357d90bc] [formerly a0abcf8120 [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]
Former-commit-id: a0abcf8120
Former-commit-id: 65aa72fee7 [formerly 6884520750]
Former-commit-id: 5a310acb18
 2012-03-29 10:03:05 -05:00
Max Schenkelberg
e73e40dc78 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: 66eaffb9ee [formerly 15a9245592] [formerly 66eaffb9ee [formerly 15a9245592] [formerly f10f1a5319 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]
Former-commit-id: f10f1a5319
Former-commit-id: bbab188fb9 [formerly ac11dd0c18]
Former-commit-id: 2f3b9f0067
 2012-03-28 13:32:04 -05:00
Max Schenkelberg
8878a9732d Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in 
case of "NO DATA"

Former-commit-id: 468c812dde [formerly cd6ebd80d4] [formerly 468c812dde [formerly cd6ebd80d4] [formerly b9085db25d [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]
Former-commit-id: b9085db25d
Former-commit-id: 81bc45f071 [formerly 954073b38c]
Former-commit-id: 645900727c
 2012-03-16 10:13:31 -05:00
Max Schenkelberg
e220ddf515 Issue #358 Fixed sampling issue with mosaic resource with best 
res resources

Former-commit-id: 97edff9f7c [formerly cc111ab9ac] [formerly 97edff9f7c [formerly cc111ab9ac] [formerly 258d57e825 [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]
Former-commit-id: 258d57e825
Former-commit-id: 4e81d2432c [formerly 1e5c074e3b]
Former-commit-id: a3bda1957c
 2012-03-16 09:03:50 -05:00
Max Schenkelberg
d585d19f48 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: 10b720381b [formerly 719f87c261] [formerly 10b720381b [formerly 719f87c261] [formerly 556a270a09 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 556a270a09
Former-commit-id: a4b859ae54 [formerly ba8af4dcc1]
Former-commit-id: 682aca1dda
 2012-03-14 18:03:44 -05:00
Max Schenkelberg
9366a5f308 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: 8fb7eccb73 [formerly 6e5964df9d] [formerly 8fb7eccb73 [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 8f08fab0a7 [formerly cf440b3884]
Former-commit-id: 6378e8c4ee
 2012-03-14 09:49:32 -05:00
Max Schenkelberg
0f005d3521 Issue #358 Merging core drawing API improvements from Collaboration 
Former-commit-id: 18805c68f7 [formerly d43b0456d8] [formerly 18805c68f7 [formerly d43b0456d8] [formerly 89f603f448 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: f78b932abb [formerly 4662ece060]
Former-commit-id: 1303289d12
 2012-03-09 12:31:50 -06:00
David Gillingham
678953ae76 Issue #354: Refactor AbstractParmManager to better handle ISC parm 
pre-loading.

Former-commit-id: 1908212c27 [formerly d68e3a7eea] [formerly 1908212c27 [formerly d68e3a7eea] [formerly 494fbe93db [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]
Former-commit-id: 494fbe93db
Former-commit-id: 29f03b0d2a [formerly bc61eb1e43]
Former-commit-id: ad8efe180e
 2012-03-05 11:23:11 -06:00
David Gillingham
0b79b9ea21 Issue #346: Convert GFE to use identity-based ListenerLists, increase 
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: bd01975367 [formerly f6f0ca24df] [formerly bd01975367 [formerly f6f0ca24df] [formerly 0c0f659896 [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]
Former-commit-id: 0c0f659896
Former-commit-id: bce9ad39ae [formerly b3df043f97]
Former-commit-id: 788007ff63
 2012-03-02 13:22:46 -06:00
Max Schenkelberg
ae389f0b57 Issue #358 Committing NPP core rendering improvements merged with Thin 
Client core improvements

Former-commit-id: e2cd95d3f4 [formerly ae47d9683e] [formerly e2cd95d3f4 [formerly ae47d9683e] [formerly 48b6d45f00 [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 0554abdde0 [formerly 3212cc6ebb]
Former-commit-id: 585e979c76
 2012-03-01 16:59:40 -06:00
Steve Harris
cdc4d1cb44 Merge branch 'ss_sync' into sync_test 
Former-commit-id: 3b9c3e3474 [formerly 951ecfe3dd] [formerly 3b9c3e3474 [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]
Former-commit-id: 787aed90f8
Former-commit-id: b3f831a7b4 [formerly db45babec8]
Former-commit-id: 376edad3c9
 2012-03-01 14:01:16 -06:00
Steve Harris
9ce7c680d7 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: 8794c4bcf6 [formerly c21bd2719c] [formerly 8794c4bcf6 [formerly c21bd2719c] [formerly 9bdea0399f [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]]
Former-commit-id: 9bdea0399f
Former-commit-id: fe0b1eed94 [formerly 6f5c182af0]
Former-commit-id: 6cdedca0a3
 2012-03-01 13:19:04 -06:00
Ben Steffensmeier
4e0ec11a6f Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request 
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd

Former-commit-id: aa90109f45 [formerly 49cce84edf] [formerly aa90109f45 [formerly 49cce84edf] [formerly 7c2409eab0 [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]
Former-commit-id: 7c2409eab0
Former-commit-id: f8c2ad7136 [formerly 3220ee4745]
Former-commit-id: e0ad3aee33
 2012-03-01 12:44:43 -06:00
Steve Harris
3306848158 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: 98d1fbeb0e [formerly 703cb6e748] [formerly 98d1fbeb0e [formerly 703cb6e748] [formerly dd52eb4d40 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]
Former-commit-id: dd52eb4d40
Former-commit-id: 3e4d618486 [formerly 06baad5169]
Former-commit-id: a4d8f58c90
 2012-02-29 16:08:39 -06:00
Ben Steffensmeier
da7275d80b Issue #353 add logic to syncronize times for thin client data updates.. 
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: 56d97c95d5 [formerly 5c303ed189] [formerly 56d97c95d5 [formerly 5c303ed189] [formerly c61e40c426 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]
Former-commit-id: c61e40c426
Former-commit-id: 390700efb0 [formerly 84e6c9beb8]
Former-commit-id: 588432f980
 2012-02-29 15:49:47 -06:00
Ben Steffensmeier
f668495c76 Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time. 
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f

Former-commit-id: 3713d7a181 [formerly 5dee50e7e9] [formerly 3713d7a181 [formerly 5dee50e7e9] [formerly d7a63995f1 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]
Former-commit-id: d7a63995f1
Former-commit-id: dba810ddc4 [formerly e52c2ffb20]
Former-commit-id: 7d4367ee7a
 2012-02-28 15:20:37 -06:00
Steve Harris
98c100b36f Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: c45e7b888c [formerly aa597242f9] [formerly c45e7b888c [formerly aa597242f9] [formerly a4538f0a48 [formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]]
Former-commit-id: a4538f0a48
Former-commit-id: 7c18ec7c7c [formerly fdd6018d1a]
Former-commit-id: ba4a6aa434
 2012-02-27 11:32:49 -06:00
Ben Steffensmeier
cc91522fa0 Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target 
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2

Former-commit-id: 20481daa1b [formerly 357dc4d88b] [formerly 20481daa1b [formerly 357dc4d88b] [formerly 637c051a23 [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]
Former-commit-id: 637c051a23
Former-commit-id: 88d2d2e4b6 [formerly 62f1ea0aac]
Former-commit-id: 0b4134f364
 2012-02-24 14:57:23 -06:00
David Gillingham
98bc9450d3 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor. 
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

Former-commit-id: ef903bc728 [formerly d79f7e9613] [formerly ef903bc728 [formerly d79f7e9613] [formerly 5aa5b51a55 [formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]]
Former-commit-id: 5aa5b51a55
Former-commit-id: 6bca8d6353 [formerly f9ed20bada]
Former-commit-id: 85c082f1e9
 2012-02-23 14:40:25 -06:00
David Gillingham
ca09c3a75a Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs. 
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: 5a8ba0f0fb [formerly 32b2c06988] [formerly 5a8ba0f0fb [formerly 32b2c06988] [formerly 85998bc654 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]]
Former-commit-id: 85998bc654
Former-commit-id: 9ff631305a [formerly 88dcd4d09d]
Former-commit-id: 8e123e3ae0
 2012-02-23 13:23:59 -06:00
Steve Harris
93d99ca49c Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration 
Conflicts:
	edexOsgi/build.edex/deploy-install.xml

Seems to have solved itself or was not actually a conflict


Former-commit-id: 4981170462 [formerly dcadf7baa4] [formerly 4981170462 [formerly dcadf7baa4] [formerly 86e586befe [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]
Former-commit-id: 86e586befe
Former-commit-id: 4eb1ef5b0f [formerly 938dc5b21c]
Former-commit-id: 2c958713b6
 2012-02-23 12:38:55 -06:00
Steve Harris
fd5ed23eb3 Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client 
Former-commit-id: c0c0acfbe8 [formerly 957d232286] [formerly c0c0acfbe8 [formerly 957d232286] [formerly a82f2c5750 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]]
Former-commit-id: a82f2c5750
Former-commit-id: 43b83ed8aa [formerly e6c3afa7a2]
Former-commit-id: 7f8343833e
 2012-02-23 10:19:54 -06:00
Steve Harris
3aef320ffd Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client 
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 92084b3f20 [formerly d0bbbfefcc] [formerly 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 92b7072b82 [formerly 3d511fe719]
Former-commit-id: ae9c52b012
 2012-02-23 10:06:18 -06:00
Ben Steffensmeier
16d205ce9d Issue #345 allow double dispose of GLTarget 
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be

Former-commit-id: b776d953d7 [formerly 06c9d4cdcf] [formerly b776d953d7 [formerly 06c9d4cdcf] [formerly 55aa66a510 [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]]
Former-commit-id: 55aa66a510
Former-commit-id: c3d3142bab [formerly 5d6b036ed7]
Former-commit-id: 8f34946969
 2012-02-22 17:40:48 -06:00
Steve Harris
978d22db50 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: b55a488ed8 [formerly 4450cf8963]
Former-commit-id: 15c56d11bc
 2012-02-22 11:14:43 -06:00
Steve Harris
01d72ca3c9 Merge branch 14-NCEP into 'ss_sync' 
Former-commit-id: 85075e6107 [formerly 94c2ea985b] [formerly 85075e6107 [formerly 94c2ea985b] [formerly 9995d22e25 [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]
Former-commit-id: 9995d22e25
Former-commit-id: 610fdf3f4e [formerly aaead73ec5]
Former-commit-id: 156ad8471d
 2012-02-22 10:12:49 -06:00
Steve Harris
a9cfeacc6b Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: 2c12c02910 [formerly 84926c80be] [formerly 2c12c02910 [formerly 84926c80be] [formerly f3fe839c1c [formerly fe86fe3696731660f6b37a147194c670906cdf4f]]]
Former-commit-id: f3fe839c1c
Former-commit-id: 968239217e [formerly 6d1b04e62c]
Former-commit-id: a14d90ed4d
 2012-02-21 10:37:36 -06:00
Nate Jensen
0d56994428 Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client 
Former-commit-id: ba5b1ee03f [formerly b90611d995] [formerly ba5b1ee03f [formerly b90611d995] [formerly ec0cd8d086 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]]
Former-commit-id: ec0cd8d086
Former-commit-id: 2ee4305d77 [formerly 13ea11ddfc]
Former-commit-id: f92be47f79
 2012-02-21 08:57:12 -06:00
Ben Steffensmeier
f934ade63a Issue #345 fix issues with gl contexts and creation and deletion of gl objects! 
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db

Former-commit-id: 27973ec694 [formerly 69e8cde115] [formerly 27973ec694 [formerly 69e8cde115] [formerly 73d24fad2f [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]]
Former-commit-id: 73d24fad2f
Former-commit-id: 0ee68fb6cc [formerly dcbe4fc7da]
Former-commit-id: f949f622dd
 2012-02-20 15:28:20 -06:00
Steve Harris
bcccffbaa4 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: d971880b98 [formerly cabf9fd956] [formerly d971880b98 [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: b12f5e5d75 [formerly 33483f3960]
Former-commit-id: acd7845ebd
 2012-02-20 13:03:39 -06:00
Steve Harris
d3c80a1557 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked 
Former-commit-id: a2fd2cf6fa [formerly 6a064cb78b] [formerly a2fd2cf6fa [formerly 6a064cb78b] [formerly d02529fef4 [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]
Former-commit-id: d02529fef4
Former-commit-id: b41e5f2415 [formerly d133454b27]
Former-commit-id: d9c8a99210
 2012-02-20 12:54:25 -06:00
Steve Harris
60bf5aeced Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client 
Former-commit-id: c268da57bc [formerly 4b76d22f77] [formerly c268da57bc [formerly 4b76d22f77] [formerly cc66c8be24 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]
Former-commit-id: cc66c8be24
Former-commit-id: dd911bed4d [formerly 54b5b6baef]
Former-commit-id: 09b81c6e00
 2012-02-20 12:43:38 -06:00
Steve Harris
41571066d5 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: e3535054ff [formerly 62c587b841] [formerly e3535054ff [formerly 62c587b841] [formerly c825bd03a2 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]]
Former-commit-id: c825bd03a2
Former-commit-id: b609a6fd60 [formerly 0fab56e0f1]
Former-commit-id: f265cb965d
 2012-02-20 07:49:13 -06:00
Steve Harris
9a09879521 Manual merge of SS OB12.1.2-4 changes into ss_sync 
Former-commit-id: c209d6de36 [formerly 93f6535bd8] [formerly c209d6de36 [formerly 93f6535bd8] [formerly b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]
Former-commit-id: b137302802
Former-commit-id: 1ac6b36d1f [formerly 65b22abd24]
Former-commit-id: 895404abeb
 2012-02-17 10:55:02 -06:00
Ben Steffensmeier
b648274e36 Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified. 
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0

Former-commit-id: 38993f5a5a [formerly 26d82729c9] [formerly 38993f5a5a [formerly 26d82729c9] [formerly 3e3e4bd4e3 [formerly 04a68e6815001450fece9bb5fbf6ce99143e2d05]]]
Former-commit-id: 3e3e4bd4e3
Former-commit-id: ea93dcd939 [formerly d4e7df98a9]
Former-commit-id: c286cb0406
 2012-02-16 16:36:56 -06:00
Steve Harris
caa8a19335 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: c26a22cfb7 [formerly e2989d1a9f] [formerly c26a22cfb7 [formerly e2989d1a9f] [formerly 64ddef69b6 [formerly d3ca90194ff9d361ba9ff7679c2f4da43a439de4]]]
Former-commit-id: 64ddef69b6
Former-commit-id: 840c858697 [formerly ff45f4eaab]
Former-commit-id: c2cf0253bf
 2012-02-16 14:23:01 -06:00
Ben Steffensmeier
2d4d4faf20 Issue #343 remove extra perspectives when in thinclient component 
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee

Former-commit-id: 0104e1970d [formerly 28c7e6bc22] [formerly 0104e1970d [formerly 28c7e6bc22] [formerly 8cf7360e3b [formerly cb03ef54be5e9dae57d758903f6956a8c2a9a617]]]
Former-commit-id: 8cf7360e3b
Former-commit-id: 7de650c868 [formerly b819bfa8e9]
Former-commit-id: 1aff4d27fb
 2012-02-15 17:10:34 -06:00
Steve Harris
0d9992da14 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: 46dda7b8bd [formerly 2119a1513e] [formerly 46dda7b8bd [formerly 2119a1513e] [formerly 2e29bc8ee2 [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: d23d12d596 [formerly cb3371ee28]
Former-commit-id: dc9df63a11
 2012-02-14 15:54:46 -06:00
Nate Jensen
9fb2590b25 Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client 
Former-commit-id: 364cd8f5fc [formerly da7d13d933] [formerly 364cd8f5fc [formerly da7d13d933] [formerly 06327646d9 [formerly ad20627fab2fdcc0fdc45eb74e8c0e903009c4b9]]]
Former-commit-id: 06327646d9
Former-commit-id: ce7e58062c [formerly dd8500b081]
Former-commit-id: ab4ab01dd4
 2012-02-13 11:40:36 -06:00
Bryan Kowal
d9096e1306 Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes. 
Former-commit-id: 8e552ca56f [formerly 34d9122f14] [formerly 8e552ca56f [formerly 34d9122f14] [formerly c77b9558e1 [formerly 00ce48c7698c9baad8a3ab643d39858c47c18226]]]
Former-commit-id: c77b9558e1
Former-commit-id: ef4218bdb0 [formerly 2c3f67d470]
Former-commit-id: e40f50ba36
 2012-02-13 10:08:15 -06:00
Ben Steffensmeier
eaf930f7b8 Issue #235 add an export menu to cave to handle screen capture, print, and displays 
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98

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

Former-commit-id: 08e8343d98 [formerly 5cdcd5a261] [formerly 08e8343d98 [formerly 5cdcd5a261] [formerly 6bfd8ccfee [formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: 9d442083a1 [formerly 512e0f1bd5]
Former-commit-id: e1eeef7827
 2012-02-09 10:54:02 -06:00
Steve Harris
87ffdc4f01 Merge branch '10-Tech_Blocked' into 104-integration 
Former-commit-id: 695e2979c3 [formerly 1002555dbd] [formerly 695e2979c3 [formerly 1002555dbd] [formerly f693b6d0a7 [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]
Former-commit-id: f693b6d0a7
Former-commit-id: 93e856457b [formerly f650243958]
Former-commit-id: 3cbce90726
 2012-02-09 08:54:18 -06:00
Ben Steffensmeier
8c5e58d181 Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled 
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9

Former-commit-id: ddd5ee68ad [formerly 863fa0f635] [formerly ddd5ee68ad [formerly 863fa0f635] [formerly 3f60daa9c7 [formerly b7b3a581e8291313833b20da308f5adc5a234f26]]]
Former-commit-id: 3f60daa9c7
Former-commit-id: b09c00244e [formerly d49939ddb2]
Former-commit-id: 6164ad39b6
 2012-02-08 16:29:02 -06:00