Steve Harris
9845ef53f9
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: a4e4792bb5d3ad6095b75cdda77afb5cdda77afb6aa18f74f6
2012-03-30 09:50:48 -05:00
Steve Harris
8bc60b1e32
12.3.1-10 baseline
...
Former-commit-id: 0e4128712b4068f5295f22bd792cd922bd792cd9ce3b74c605
2012-03-30 08:38:33 -05:00
Steve Harris
65aa72fee7
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 0665862abe70357d90bca0abcf8120a0abcf81206884520750
2012-03-29 10:03:05 -05:00
Max Schenkelberg
bbab188fb9
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: 66eaffb9ee15a9245592f10f1a5319f10f1a5319ac11dd0c18
2012-03-28 13:32:04 -05:00
Max Schenkelberg
81bc45f071
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: 468c812ddecd6ebd80d4b9085db25db9085db25d954073b38c
2012-03-16 10:13:31 -05:00
Max Schenkelberg
4e81d2432c
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: 97edff9f7ccc111ab9ac258d57e825258d57e8251e5c074e3b
2012-03-16 09:03:50 -05:00
Max Schenkelberg
a4b859ae54
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: 10b720381b719f87c261556a270a09556a270a09ba8af4dcc1
2012-03-14 18:03:44 -05:00
Max Schenkelberg
8f08fab0a7
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: 8fb7eccb736e5964df9d50765e8a3450765e8a34cf440b3884
2012-03-14 09:49:32 -05:00
Max Schenkelberg
f78b932abb
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 18805c68f7d43b0456d889f603f44889f603f4484662ece060
2012-03-09 12:31:50 -06:00
David Gillingham
29f03b0d2a
Issue #354 : Refactor AbstractParmManager to better handle ISC parm
...
pre-loading.
Former-commit-id: 1908212c27d68e3a7eea494fbe93db494fbe93dbbc61eb1e43
2012-03-05 11:23:11 -06:00
David Gillingham
bce9ad39ae
Issue #346 : Convert GFE to use identity-based ListenerLists, increase
...
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.
Former-commit-id: bd01975367f6f0ca24df0c0f6598960c0f659896b3df043f97
2012-03-02 13:22:46 -06:00
Max Schenkelberg
0554abdde0
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: e2cd95d3f4ae47d9683e48b6d45f0048b6d45f003212cc6ebb
2012-03-01 16:59:40 -06:00
Steve Harris
b3f831a7b4
Merge branch 'ss_sync' into sync_test
...
Former-commit-id: 3b9c3e3474951ecfe3dd787aed90f8787aed90f8db45babec8
2012-03-01 14:01:16 -06:00
Steve Harris
fe0b1eed94
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 8794c4bcf6c21bd2719c9bdea0399f9bdea0399f6f5c182af0
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
f8c2ad7136
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: aa90109f4549cce84edf7c2409eab07c2409eab03220ee4745
2012-03-01 12:44:43 -06:00
Steve Harris
3e4d618486
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 98d1fbeb0e703cb6e748dd52eb4d40dd52eb4d4006baad5169
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
390700efb0
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 56d97c95d55c303ed189c61e40c426c61e40c42684e6c9beb8
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
dba810ddc4
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: 3713d7a1815dee50e7e9d7a63995f1d7a63995f1e52c2ffb20
2012-02-28 15:20:37 -06:00
Steve Harris
7c18ec7c7c
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c45e7b888caa597242f9a4538f0a48a4538f0a48fdd6018d1a
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
88d2d2e4b6
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 20481daa1b357dc4d88b637c051a23637c051a2362f1ea0aac
2012-02-24 14:57:23 -06:00
David Gillingham
6bca8d6353
Issue #346 : Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
...
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d
Former-commit-id: ef903bc728d79f7e96135aa5b51a555aa5b51a55f9ed20bada
2012-02-23 14:40:25 -06:00
David Gillingham
9ff631305a
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 5a8ba0f0fb32b2c0698885998bc65485998bc65488dcd4d09d
2012-02-23 13:23:59 -06:00
Steve Harris
4eb1ef5b0f
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: 4981170462dcadf7baa486e586befe86e586befe938dc5b21c
2012-02-23 12:38:55 -06:00
Steve Harris
43b83ed8aa
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: c0c0acfbe8957d232286a82f2c5750a82f2c5750e6c3afa7a2
2012-02-23 10:19:54 -06:00
Steve Harris
92b7072b82
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: 92084b3f20d0bbbfefcc7a10ca97667a10ca97663d511fe719
2012-02-23 10:06:18 -06:00
Ben Steffensmeier
c3d3142bab
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: b776d953d706c9d4cdcf55aa66a51055aa66a5105d6b036ed7
2012-02-22 17:40:48 -06:00
Steve Harris
b55a488ed8
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 8da36046dec8aae9874154be9660f154be9660f14450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
610fdf3f4e
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 85075e610794c2ea985b9995d22e259995d22e25aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
968239217e
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 2c12c0291084926c80bef3fe839c1cf3fe839c1c6d1b04e62c
2012-02-21 10:37:36 -06:00
Nate Jensen
2ee4305d77
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
...
Former-commit-id: ba5b1ee03fb90611d995ec0cd8d086ec0cd8d08613ea11ddfc
2012-02-21 08:57:12 -06:00
Ben Steffensmeier
0ee68fb6cc
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
...
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 27973ec69469e8cde11573d24fad2f73d24fad2fdcbe4fc7da
2012-02-20 15:28:20 -06:00
Steve Harris
b12f5e5d75
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: d971880b98cabf9fd9565e9d2dd3675e9d2dd36733483f3960
2012-02-20 13:03:39 -06:00
Steve Harris
b41e5f2415
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: a2fd2cf6fa6a064cb78bd02529fef4d02529fef4d133454b27
2012-02-20 12:54:25 -06:00
Steve Harris
dd911bed4d
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: c268da57bc4b76d22f77cc66c8be24cc66c8be2454b5b6baef
2012-02-20 12:43:38 -06:00
Steve Harris
b609a6fd60
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: e3535054ff62c587b841c825bd03a2c825bd03a20fab56e0f1
2012-02-20 07:49:13 -06:00
Steve Harris
1ac6b36d1f
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: c209d6de3693f6535bd8b137302802b13730280265b22abd24
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
ea93dcd939
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
...
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 38993f5a5a26d82729c93e3e4bd4e33e3e4bd4e3d4e7df98a9
2012-02-16 16:36:56 -06:00
Steve Harris
840c858697
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c26a22cfb7e2989d1a9f64ddef69b664ddef69b6ff45f4eaab
2012-02-16 14:23:01 -06:00
Ben Steffensmeier
7de650c868
Issue #343 remove extra perspectives when in thinclient component
...
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 0104e1970d28c7e6bc228cf7360e3b8cf7360e3bb819bfa8e9
2012-02-15 17:10:34 -06:00
Steve Harris
d23d12d596
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 46dda7b8bd2119a1513e2e29bc8ee22e29bc8ee2cb3371ee28
2012-02-14 15:54:46 -06:00
Nate Jensen
ce7e58062c
Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
...
Former-commit-id: 364cd8f5fcda7d13d93306327646d906327646d9dd8500b081
2012-02-13 11:40:36 -06:00
Bryan Kowal
ef4218bdb0
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
...
Former-commit-id: 8e552ca56f34d9122f14c77b9558e1c77b9558e12c3f67d470
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
99557a2a0f
Issue #235 add an export menu to cave to handle screen capture, print, and displays
...
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: 6e95175ba2ebbbd0bafcf7985bff7bf7985bff7ba9e13fac26
2012-02-10 12:13:34 -06:00
Ben Steffensmeier
9d442083a1
Issue #235 Added ability to capture multiple frames to NSharp
...
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 08e8343d985cdcd5a2616bfd8ccfee6bfd8ccfee512e0f1bd5
2012-02-09 10:54:02 -06:00
Steve Harris
93e856457b
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 695e2979c31002555dbdf693b6d0a7f693b6d0a7f650243958
2012-02-09 08:54:18 -06:00
Ben Steffensmeier
b09c00244e
Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
...
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9
Former-commit-id: ddd5ee68ad863fa0f6353f60daa9c73f60daa9c7d49939ddb2
2012-02-08 16:29:02 -06:00
Matt Nash
6e11115195
Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
...
Former-commit-id: ce5baf0632e52a1315b225b9659dc725b9659dc75c10b1d587
2012-02-08 08:53:19 -06:00
Matt Nash
d3433544ab
Issue #26 fix gage color for hydro to refresh
...
Former-commit-id: c4fee978d7f7652d25e3bb4f690393bb4f69039382089434e5
2012-02-07 16:49:34 -06:00
Max Schenkelberg
0c4a9cf58a
Issue #206 fixed dialog context deactivation bug
...
Former-commit-id: d5369932fd9535ae2d0efe59c3e8d8fe59c3e8d89a7efcaae8
2012-02-07 16:45:59 -06:00
Matt Nash
178663bd09
Merge "Issue #206 - Fixed loading and disposing bugs in tear off menus" into 10-Tech_Blocked
...
Former-commit-id: 6fc771908f81ec1d5dacbe92a03f2dbe92a03f2de629c0bc38
2012-02-07 16:13:03 -06:00
