Max Schenkelberg
f20e674318
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 9b0d01f8b59b0d01f8b507cf5069ba993cac891e
2012-03-30 10:51:31 -05:00
Steve Harris
9fee09c9e4
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: d3ad6095b7d3ad6095b75cdda77afb6aa18f74f6
2012-03-30 09:50:48 -05:00
Steve Harris
2e0f4b241b
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f4068f5295f22bd792cd9ce3b74c605
2012-03-30 08:38:33 -05:00
Steve Harris
5a310acb18
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 70357d90bc70357d90bca0abcf81206884520750
2012-03-29 10:03:05 -05:00
Max Schenkelberg
2f3b9f0067
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: 15a924559215a9245592f10f1a5319ac11dd0c18
2012-03-28 13:32:04 -05:00
Max Schenkelberg
645900727c
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: cd6ebd80d4cd6ebd80d4b9085db25d954073b38c
2012-03-16 10:13:31 -05:00
Max Schenkelberg
a3bda1957c
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: cc111ab9accc111ab9ac258d57e8251e5c074e3b
2012-03-16 09:03:50 -05:00
Max Schenkelberg
682aca1dda
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: 719f87c261719f87c261556a270a09ba8af4dcc1
2012-03-14 18:03:44 -05:00
Max Schenkelberg
6378e8c4ee
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: 6e5964df9d6e5964df9d50765e8a34cf440b3884
2012-03-14 09:49:32 -05:00
Max Schenkelberg
1303289d12
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: d43b0456d8d43b0456d889f603f4484662ece060
2012-03-09 12:31:50 -06:00
David Gillingham
ad8efe180e
Issue #354 : Refactor AbstractParmManager to better handle ISC parm
...
pre-loading.
Former-commit-id: d68e3a7eead68e3a7eea494fbe93dbbc61eb1e43
2012-03-05 11:23:11 -06:00
David Gillingham
788007ff63
Issue #346 : Convert GFE to use identity-based ListenerLists, increase
...
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.
Former-commit-id: f6f0ca24dff6f0ca24df0c0f659896b3df043f97
2012-03-02 13:22:46 -06:00
Max Schenkelberg
585e979c76
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: ae47d9683eae47d9683e48b6d45f003212cc6ebb
2012-03-01 16:59:40 -06:00
Steve Harris
376edad3c9
Merge branch 'ss_sync' into sync_test
...
Former-commit-id: 951ecfe3dd951ecfe3dd787aed90f8db45babec8
2012-03-01 14:01:16 -06:00
Steve Harris
6cdedca0a3
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c21bd2719cc21bd2719c9bdea0399f6f5c182af0
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
e0ad3aee33
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: 49cce84edf49cce84edf7c2409eab03220ee4745
2012-03-01 12:44:43 -06:00
Steve Harris
a4d8f58c90
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 703cb6e748703cb6e748dd52eb4d4006baad5169
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
588432f980
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 5c303ed1895c303ed189c61e40c42684e6c9beb8
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
7d4367ee7a
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: 5dee50e7e95dee50e7e9d7a63995f1e52c2ffb20
2012-02-28 15:20:37 -06:00
Steve Harris
ba4a6aa434
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: aa597242f9aa597242f9a4538f0a48fdd6018d1a
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
0b4134f364
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 357dc4d88b357dc4d88b637c051a2362f1ea0aac
2012-02-24 14:57:23 -06:00
David Gillingham
85c082f1e9
Issue #346 : Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
...
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d
Former-commit-id: d79f7e9613d79f7e96135aa5b51a55f9ed20bada
2012-02-23 14:40:25 -06:00
David Gillingham
8e123e3ae0
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 32b2c0698832b2c0698885998bc65488dcd4d09d
2012-02-23 13:23:59 -06:00
Steve Harris
2c958713b6
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: dcadf7baa4dcadf7baa486e586befe938dc5b21c
2012-02-23 12:38:55 -06:00
Steve Harris
7f8343833e
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: 957d232286957d232286a82f2c5750e6c3afa7a2
2012-02-23 10:19:54 -06:00
Steve Harris
ae9c52b012
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: d0bbbfefccd0bbbfefcc7a10ca97663d511fe719
2012-02-23 10:06:18 -06:00
Ben Steffensmeier
8f34946969
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 06c9d4cdcf06c9d4cdcf55aa66a5105d6b036ed7
2012-02-22 17:40:48 -06:00
Steve Harris
15c56d11bc
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae98741c8aae9874154be9660f14450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
156ad8471d
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 94c2ea985b94c2ea985b9995d22e25aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
a14d90ed4d
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 84926c80be84926c80bef3fe839c1c6d1b04e62c
2012-02-21 10:37:36 -06:00
Nate Jensen
f92be47f79
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
...
Former-commit-id: b90611d995b90611d995ec0cd8d08613ea11ddfc
2012-02-21 08:57:12 -06:00
Ben Steffensmeier
f949f622dd
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
...
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 69e8cde11569e8cde11573d24fad2fdcbe4fc7da
2012-02-20 15:28:20 -06:00
Steve Harris
acd7845ebd
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: cabf9fd956cabf9fd9565e9d2dd36733483f3960
2012-02-20 13:03:39 -06:00
Steve Harris
d9c8a99210
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: 6a064cb78b6a064cb78bd02529fef4d133454b27
2012-02-20 12:54:25 -06:00
Steve Harris
09b81c6e00
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: 4b76d22f774b76d22f77cc66c8be2454b5b6baef
2012-02-20 12:43:38 -06:00
Steve Harris
f265cb965d
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 62c587b84162c587b841c825bd03a20fab56e0f1
2012-02-20 07:49:13 -06:00
Steve Harris
895404abeb
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 93f6535bd893f6535bd8b13730280265b22abd24
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
c286cb0406
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
...
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 26d82729c926d82729c93e3e4bd4e3d4e7df98a9
2012-02-16 16:36:56 -06:00
Steve Harris
c2cf0253bf
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: e2989d1a9fe2989d1a9f64ddef69b6ff45f4eaab
2012-02-16 14:23:01 -06:00
Ben Steffensmeier
1aff4d27fb
Issue #343 remove extra perspectives when in thinclient component
...
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 28c7e6bc2228c7e6bc228cf7360e3bb819bfa8e9
2012-02-15 17:10:34 -06:00
Steve Harris
dc9df63a11
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 2119a1513e2119a1513e2e29bc8ee2cb3371ee28
2012-02-14 15:54:46 -06:00
Nate Jensen
ab4ab01dd4
Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
...
Former-commit-id: da7d13d933da7d13d93306327646d9dd8500b081
2012-02-13 11:40:36 -06:00
Bryan Kowal
e40f50ba36
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
...
Former-commit-id: 34d9122f1434d9122f14c77b9558e12c3f67d470
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
7d16f12962
Issue #235 add an export menu to cave to handle screen capture, print, and displays
...
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: ebbbd0bafcebbbd0bafcf7985bff7ba9e13fac26
2012-02-10 12:13:34 -06:00
Ben Steffensmeier
e1eeef7827
Issue #235 Added ability to capture multiple frames to NSharp
...
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 5cdcd5a2615cdcd5a2616bfd8ccfee512e0f1bd5
2012-02-09 10:54:02 -06:00
Steve Harris
3cbce90726
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 1002555dbd1002555dbdf693b6d0a7f650243958
2012-02-09 08:54:18 -06:00
Ben Steffensmeier
6164ad39b6
Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
...
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9
Former-commit-id: 863fa0f635863fa0f6353f60daa9c7d49939ddb2
2012-02-08 16:29:02 -06:00
Matt Nash
bbb3cacd0d
Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
...
Former-commit-id: e52a1315b2e52a1315b225b9659dc75c10b1d587
2012-02-08 08:53:19 -06:00
Matt Nash
7ef7069905
Issue #26 fix gage color for hydro to refresh
...
Former-commit-id: f7652d25e3f7652d25e3bb4f69039382089434e5
2012-02-07 16:49:34 -06:00
Max Schenkelberg
e4fca4c6f7
Issue #206 fixed dialog context deactivation bug
...
Former-commit-id: 9535ae2d0e9535ae2d0efe59c3e8d89a7efcaae8
2012-02-07 16:45:59 -06:00
