Matt Nash
b0beab3044
Issue #448 use aliased name in peer to peer if available, fixes the extra view that once was created
...
Former-commit-id: 167767dcbcd1f23b8dee
2012-05-02 09:42:50 -05:00
Max Schenkelberg
a608dcb59b
Issue #239 Fixed url path issue for joining late
...
Change-Id: Ibf11c6d12b93954aad6e3969fa9869e977d48de6
Former-commit-id: adabe413f60326936e85
2012-05-02 09:25:44 -05:00
Max Schenkelberg
878de45ee6
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 3fe183277be3d6962fe6
2012-05-01 18:36:09 -05:00
Steve Harris
6dd3ee8809
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: 2ed72496137b75b781ad
2012-05-01 18:31:09 -05:00
Steve Harris
a28d70b5c5
12.4.1-10 baseline
...
Former-commit-id: 9f8cb727a58485b90ff8
2012-05-01 18:06:13 -05:00
Nate Jensen
e89143161c
Issue #427 cleanup
...
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691
Former-commit-id: 9a992aab780b6b92c9ff
2012-05-01 17:33:55 -05:00
Matt Nash
5d3c2686cd
Issue #448 clean up group code
...
Former-commit-id: ae7b40634e8791b7329a
2012-05-01 16:14:33 -05:00
Max Schenkelberg
0b5623654a
Issue #239 Got joining late working to load data participants don't have
...
Change-Id: I7c27e584b3b7f7331708689acee7f1b62fefe0eb
Former-commit-id: edacf7a4b34b8f81dbcb
2012-05-01 15:51:15 -05:00
Matt Nash
529444c746
Issue #448 fix icons
...
Former-commit-id: fd515ad7669764210b93
2012-05-01 15:07:46 -05:00
Matt Nash
7a89fa8342
Issue #448 problem where the file is not there and null is returned
...
Former-commit-id: cef6bd81a81872503cd8
2012-05-01 11:55:12 -05:00
Matt Nash
f121499f7a
Issue #448 aliasing works on tabs and such now too
...
Former-commit-id: 88b20d568e4a0b1e36ca
2012-05-01 10:28:20 -05:00
Matt Nash
b797bf94b9
Issue #448 further aliasing
...
Former-commit-id: 603b114ae7efd6485647
2012-04-30 17:28:01 -05:00
Matt Nash
77e3b905b0
Issue #448 aliasing for group view
...
Former-commit-id: cb6aa40f4249bda84329
2012-04-30 16:45:35 -05:00
Nate Jensen
fafdf1de48
Issue #427 cleanup
...
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1
Former-commit-id: 6a034283b5eac55b7587
2012-04-30 15:49:44 -05:00
Nate Jensen
9f32676a86
Issue #427 remove extraneous event buses
...
Change-Id: I958de58ba963609ada80529195d024077a901a0e
Former-commit-id: 7aa1e562d8bfd45d703f
2012-04-30 15:33:59 -05:00
Max Schenkelberg
7bfaa9474b
Issue #239 Made custom PointImageExtension that handles differencing for faster plot rendering
...
Change-Id: I2e22ee3eb6fe67ff754dd4689b8c8876eb3b893d
Former-commit-id: 9e2cf73f7a60aac07962
2012-04-30 15:01:37 -05:00
Dave Hladky
61e31c62ff
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 1b7473572f5b7ecea866
2012-04-30 13:43:34 -05:00
Bryan Kowal
a2d1cc317d
Issue #517 - ensure that plugin.xml is packaged in the com.raytheon.uf.viz.collaboration.radar jar file.
...
Former-commit-id: ed878bc13d84e3c4704e
2012-04-30 12:45:30 -05:00
Nate Jensen
2e02578b63
Issue #427 remove dead code
...
Change-Id: I36e3f77f8c0176b72762abc311d8e4e3eab22e0e
Former-commit-id: d5a3acc97bbba6d5e400
2012-04-27 16:22:27 -05:00
Nate Jensen
4a85e47ee9
Issue #427 separated collaboration.ui into two plugins
...
Change-Id: I3085f2aae4c1c44b65749e587a9eb753d1d7a34b
Former-commit-id: e8f1c0159c9454cbd1b9
2012-04-27 16:12:48 -05:00
Nate Jensen
cc61a7a62f
Issue #427 better part listeners
...
Change-Id: I0787fdc7a086c87228e9f38ce85e23dd9edc4bd2
Former-commit-id: 855ec5dd4d866acb24b2
2012-04-27 14:47:27 -05:00
Matt Nash
af819b2e0d
Issue #448 add preference page for collaboration, currently only enabling and disabling notifications
...
Former-commit-id: cc313ebcac00d11cdeaa
2012-04-27 14:34:55 -05:00
David Gillingham
a1a62aa8f1
Merge "Issue #562 : Rename QPFRecord getters and setters to match Java-naming conventions, correct bugs in other classes found during test." into 9-Wes2Bridge
...
Former-commit-id: 4aadd41fde9878793618
2012-04-27 13:26:37 -05:00
David Gillingham
6f40ba77f1
Issue #562 : Rename QPFRecord getters and setters to match Java-naming
...
conventions, correct bugs in other classes found during test.
Change-Id: I7f490793678741ffa41769a63371e06d27840bdb
Former-commit-id: c28bfaddee292374ce21
2012-04-27 12:43:04 -05:00
Richard Peter
e3323febc5
Issue #538 : Fix Serialization Annotations and Serialization Issues
...
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: 349adaeeddb11df888d3
2012-04-27 12:08:29 -05:00
Max Schenkelberg
e5e13fc3b3
Issue #239 Added render frame merging capability
...
Change-Id: Ie16e650693de6e07453357740b3c2bae21bd999d
Former-commit-id: ff0827b51ddf07bff0bc
2012-04-27 11:57:53 -05:00
Matt Nash
91035ee253
Issue #429 add better notification to chat
...
Former-commit-id: e0d11ae8b13b2fdaa579
2012-04-27 10:10:05 -05:00
Matt Nash
501b74478e
Issue #429 make chatting append to message before sending out to prevent delay, add notification method so if CAVE is minimized the user will still get the notification that a new chat has happened
...
Former-commit-id: 25201fcbad16de1dbafe
2012-04-27 10:08:27 -05:00
Matt Nash
fcecab2afb
Issue #448 remove listener to help prevent exceptions
...
Former-commit-id: 29b39a1df4b69e13d795
2012-04-26 09:17:27 -05:00
Max Schenkelberg
2d25e8bb78
Added network logging for http traffic
...
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25
Former-commit-id: a912786429f74b6b4a93
2012-04-25 17:28:52 -05:00
David Gillingham
36717c7a3e
Issue #473 : Properly archive text plugin records,
...
fix bugs in DatabaseArchiver.determineStartTime().
Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f
Former-commit-id: 526abfd36e04ab5d619b
2012-04-25 17:08:21 -05:00
Nate Jensen
0c523369c4
Issue #427 remove sysouts
...
Change-Id: I82dd5bcd8e7eb20afcf516c0b8d33e37d72d45db
Former-commit-id: ed4303158ce17dad1b54
2012-04-25 16:56:19 -05:00
Max Schenkelberg
e608125f9d
Got efficient sending of events working where it only sends if events changed
...
Change-Id: I499a38c1b9cbbd3ede5b04356d2f7788153f836b
Former-commit-id: 84b8ffa49028693e6991
2012-04-25 16:18:41 -05:00
Matt Nash
f212b1d1ae
Issue #448 slight changes to data provider and session leader indicators
...
Former-commit-id: 06d71f13ad8f93192385
2012-04-25 15:07:14 -05:00
Nate Jensen
a14bccc7ac
Issue #427 renamed data provider rsc
...
Change-Id: I05b417c3f7d65908a52910f9d847cc188c7c4a9c
Former-commit-id: 069f809596b3723bc986
2012-04-25 14:41:37 -05:00
Matt Nash
f3467023a2
Issue #448 first pass at alias
...
Former-commit-id: 7d870434f6b20b9530fd
2012-04-25 14:25:52 -05:00
Matt Nash
76e8b2e192
Issue #429 color final fixes
...
Former-commit-id: 9bc3f0c75d506d3e8989
2012-04-25 14:22:12 -05:00
Max Schenkelberg
9d8dbba20b
#Issue 239 Got bulk event sending and only sending events when previous frame changes.
...
Former-commit-id: 001c52bd3a9607d3dd41
2012-04-25 11:27:19 -05:00
Matt Nash
563e76c313
Issue #429 colors matching between telestrator and chat room across clients
...
Former-commit-id: d84865ced909fc05162c
2012-04-25 07:39:05 -05:00
Matt Nash
d79ae59e19
Issue #429 colors for collaboration session
...
Former-commit-id: 63dccd6b85bc1e35f4b4
2012-04-24 16:39:28 -05:00
Steve Harris
aabc3842ac
12.4.1-10 baseline
...
Former-commit-id: 704b75e1a101457fbbde
2012-04-24 15:38:29 -05:00
Nate Jensen
7c727f5a0e
Issue #427 minor fix
...
Change-Id: I341e046bcde321ae70a2afeb745bedb0078758ca
Former-commit-id: fd1f337a92bcc435ac28
2012-04-24 15:28:36 -05:00
Steve Harris
d9f966008c
12.4.1-7 baseline
...
Former-commit-id: 90ae4bbb36cca73b3c62
2012-04-24 15:24:39 -05:00
Nate Jensen
0a7a5d44ff
Issue #427 login data stored in preferences
...
Change-Id: I0ac9d34f6a7eaf8f6db80d6c573115bd43e2e11c
Former-commit-id: c4afe61f01bf3eb689cc
2012-04-24 14:11:27 -05:00
Max Schenkelberg
1ddbb3ef60
Issue #239 Added persistence capability to Collaboration data events
...
Former-commit-id: f4193b0e4e32ade1a1f7
2012-04-24 13:44:16 -05:00
Matt Nash
b428da939c
Issue #429 major refactor of UserId, make CollaborationGroupView use actual objects instead of wrappers
...
Former-commit-id: 0241e8857ffa360c90cf
2012-04-24 12:20:55 -05:00
Nate Jensen
8130c22b64
Issue #443 better logging of traffic
...
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81
Former-commit-id: a4b0addeee39ebbc3913
2012-04-23 11:23:22 -05:00
Bryan Kowal
de9a48b0c3
Issue #517 - fix the collaboration pde build.
...
Former-commit-id: 19eb596d88d97819a8df
2012-04-21 18:17:39 -05:00
Matt Nash
4f3a414d6d
Issue #429 fixes for colors, needs to refactor user id to make work
...
Former-commit-id: b418af8aa97f7bd73014
2012-04-20 15:30:58 -05:00
Matt Nash
15478a9e21
Issue #429 color fixes
...
Former-commit-id: 7116eb79cd1b9c4320fc
2012-04-20 15:30:58 -05:00
