Commit graph

415 commits

Author SHA1 Message Date
Nate Jensen
fafdf1de48 Issue cleanup
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1

Former-commit-id: 6a034283b5 [formerly 4c8192e99f1ecb57bc6a4efeaa6d7ee3a8127ec1]
Former-commit-id: eac55b7587
2012-04-30 15:49:44 -05:00
Nate Jensen
9f32676a86 Issue remove extraneous event buses
Change-Id: I958de58ba963609ada80529195d024077a901a0e

Former-commit-id: 7aa1e562d8 [formerly 1c0d5457c079880996fc75872870545ededb4316]
Former-commit-id: bfd45d703f
2012-04-30 15:33:59 -05:00
Max Schenkelberg
7bfaa9474b Issue Made custom PointImageExtension that handles differencing for faster plot rendering
Change-Id: I2e22ee3eb6fe67ff754dd4689b8c8876eb3b893d

Former-commit-id: 9e2cf73f7a [formerly 2caf3e8ebb70ffd455cb9f354b1226e858898822]
Former-commit-id: 60aac07962
2012-04-30 15:01:37 -05:00
Bryan Kowal
a2d1cc317d Issue - ensure that plugin.xml is packaged in the com.raytheon.uf.viz.collaboration.radar jar file.
Former-commit-id: ed878bc13d [formerly 22fb97b29a3e7fd310de9915b83ffcbd2c7771a0]
Former-commit-id: 84e3c4704e
2012-04-30 12:45:30 -05:00
Nate Jensen
2e02578b63 Issue remove dead code
Change-Id: I36e3f77f8c0176b72762abc311d8e4e3eab22e0e

Former-commit-id: d5a3acc97b [formerly 90a1888baffbb21ac3b2f555764c37a519d5efb1]
Former-commit-id: bba6d5e400
2012-04-27 16:22:27 -05:00
Nate Jensen
4a85e47ee9 Issue separated collaboration.ui into two plugins
Change-Id: I3085f2aae4c1c44b65749e587a9eb753d1d7a34b

Former-commit-id: e8f1c0159c [formerly f96302b439b39030e54a2b87a6e2387ebb63502f]
Former-commit-id: 9454cbd1b9
2012-04-27 16:12:48 -05:00
Nate Jensen
cc61a7a62f Issue better part listeners
Change-Id: I0787fdc7a086c87228e9f38ce85e23dd9edc4bd2

Former-commit-id: 855ec5dd4d [formerly 008164a55b5720eaf8dbfd2d023fefc9ab705936]
Former-commit-id: 866acb24b2
2012-04-27 14:47:27 -05:00
Matt Nash
af819b2e0d Issue add preference page for collaboration, currently only enabling and disabling notifications
Former-commit-id: cc313ebcac [formerly 1a0bc57f249f3b757c6226526ba05b2f8d1ab2e6]
Former-commit-id: 00d11cdeaa
2012-04-27 14:34:55 -05:00
Max Schenkelberg
e5e13fc3b3 Issue Added render frame merging capability
Change-Id: Ie16e650693de6e07453357740b3c2bae21bd999d

Former-commit-id: ff0827b51d [formerly ad6d31300e0ac41375a3eb65ce337a6105be72ee]
Former-commit-id: df07bff0bc
2012-04-27 11:57:53 -05:00
Matt Nash
91035ee253 Issue add better notification to chat
Former-commit-id: e0d11ae8b1 [formerly 40db7caa4b6bd45537f4cb37a3f034a907cd8f79]
Former-commit-id: 3b2fdaa579
2012-04-27 10:10:05 -05:00
Matt Nash
501b74478e Issue 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: 25201fcbad [formerly 9c0f7ee82b7a844620f1f2e00947a256582b86ef]
Former-commit-id: 16de1dbafe
2012-04-27 10:08:27 -05:00
Matt Nash
fcecab2afb Issue remove listener to help prevent exceptions
Former-commit-id: 29b39a1df4 [formerly 66ac99ff89a3347d528d09081d41c248f4ff4783]
Former-commit-id: b69e13d795
2012-04-26 09:17:27 -05:00
Max Schenkelberg
2d25e8bb78 Added network logging for http traffic
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25

Former-commit-id: a912786429 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]
Former-commit-id: f74b6b4a93
2012-04-25 17:28:52 -05:00
Nate Jensen
0c523369c4 Issue remove sysouts
Change-Id: I82dd5bcd8e7eb20afcf516c0b8d33e37d72d45db

Former-commit-id: ed4303158c [formerly 5b87a033a88899b1ca033b18efc9532002b047c0]
Former-commit-id: e17dad1b54
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: 84b8ffa490 [formerly 2f1f6dd97555c46547a7440c97a5314f7a26dc8d]
Former-commit-id: 28693e6991
2012-04-25 16:18:41 -05:00
Matt Nash
f212b1d1ae Issue slight changes to data provider and session leader indicators
Former-commit-id: 06d71f13ad [formerly 61bcce04de9bf4e4756140903ed3dd861333fd2b]
Former-commit-id: 8f93192385
2012-04-25 15:07:14 -05:00
Nate Jensen
a14bccc7ac Issue renamed data provider rsc
Change-Id: I05b417c3f7d65908a52910f9d847cc188c7c4a9c

Former-commit-id: 069f809596 [formerly 35ef9c2c228ac97ef623edd1e50800495d9ab8f7]
Former-commit-id: b3723bc986
2012-04-25 14:41:37 -05:00
Matt Nash
f3467023a2 Issue first pass at alias
Former-commit-id: 7d870434f6 [formerly 34f230b550a886cad03e3ffeeeaeeaebe480defc]
Former-commit-id: b20b9530fd
2012-04-25 14:25:52 -05:00
Matt Nash
76e8b2e192 Issue color final fixes
Former-commit-id: 9bc3f0c75d [formerly 51b937b9be5c9f1a1e17317e241cd93337e9fd0c]
Former-commit-id: 506d3e8989
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: 001c52bd3a [formerly 4ac2f1ac53970f57936d3b8cd5dfcd90f718c6ce]
Former-commit-id: 9607d3dd41
2012-04-25 11:27:19 -05:00
Matt Nash
563e76c313 Issue colors matching between telestrator and chat room across clients
Former-commit-id: d84865ced9 [formerly 46a327c929a09c21270f7b6de543e8d742476003]
Former-commit-id: 09fc05162c
2012-04-25 07:39:05 -05:00
Matt Nash
d79ae59e19 Issue colors for collaboration session
Former-commit-id: 63dccd6b85 [formerly 86a4ba1b10b58f266cfd46a257145717140a3778]
Former-commit-id: bc1e35f4b4
2012-04-24 16:39:28 -05:00
Nate Jensen
7c727f5a0e Issue minor fix
Change-Id: I341e046bcde321ae70a2afeb745bedb0078758ca

Former-commit-id: fd1f337a92 [formerly 2d544b5c2fb48870173ea9d38b4c7370f6ebe49f]
Former-commit-id: bcc435ac28
2012-04-24 15:28:36 -05:00
Nate Jensen
0a7a5d44ff Issue login data stored in preferences
Change-Id: I0ac9d34f6a7eaf8f6db80d6c573115bd43e2e11c

Former-commit-id: c4afe61f01 [formerly 287dae35ae3566f22a2d9e5a22760f3ef9d29ca2]
Former-commit-id: bf3eb689cc
2012-04-24 14:11:27 -05:00
Max Schenkelberg
1ddbb3ef60 Issue Added persistence capability to Collaboration data events
Former-commit-id: f4193b0e4e [formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]
Former-commit-id: 32ade1a1f7
2012-04-24 13:44:16 -05:00
Matt Nash
b428da939c Issue major refactor of UserId, make CollaborationGroupView use actual objects instead of wrappers
Former-commit-id: 0241e8857f [formerly 68f7aaecfe8c78db56a70e8d33a9d990bf5fa467]
Former-commit-id: fa360c90cf
2012-04-24 12:20:55 -05:00
Nate Jensen
8130c22b64 Issue better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81

Former-commit-id: a4b0addeee [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]
Former-commit-id: 39ebbc3913
2012-04-23 11:23:22 -05:00
Bryan Kowal
de9a48b0c3 Issue - fix the collaboration pde build.
Former-commit-id: 19eb596d88 [formerly 450b6ad4bb2c3e0b9069256977884d7b89224cae]
Former-commit-id: d97819a8df
2012-04-21 18:17:39 -05:00
Matt Nash
4f3a414d6d Issue fixes for colors, needs to refactor user id to make work
Former-commit-id: b418af8aa9 [formerly a0f919d73ea4d1da7d79e721800079f0698070db]
Former-commit-id: 7f7bd73014
2012-04-20 15:30:58 -05:00
Matt Nash
15478a9e21 Issue color fixes
Former-commit-id: 7116eb79cd [formerly 819a0b037d49993e56dc77207809dbf3903ea6ec]
Former-commit-id: 1b9c4320fc
2012-04-20 15:30:58 -05:00
Matt Nash
fa120a1cd0 Issue lots of color changes
Former-commit-id: 064657306f [formerly ac71a592948b71c629f5f535a8d06840b3905c2a]
Former-commit-id: fdddff1957
2012-04-20 15:30:57 -05:00
Matt Nash
b5f8783a94 Issue first round fixes color
Former-commit-id: 5f47f98662 [formerly 901770d888a39df452e60d9ac6c5d7e071d6a810]
Former-commit-id: d34e2722b0
2012-04-20 15:30:57 -05:00
Max Schenkelberg
f05528979d Issue Started persistable object event pattern. Made construction
of single color images cheaper to allow object construction to happen
immediately 

Former-commit-id: 523c90b697 [formerly 995ddaebb670eb1689aeb44e3cb760731db46e80]
Former-commit-id: da5e17d6e3
2012-04-19 16:03:07 -05:00
Nate Jensen
7fdc45a275 Issue fix peer to peer
Change-Id: Iae7f0d4c5f3f28360a957768fa755809fe47c171

Former-commit-id: 8da43825d0 [formerly b8ca7f7c0d329c1d7bb527317fc89794ea4dbac0]
Former-commit-id: 62c5527e17
2012-04-19 15:27:52 -05:00
Nate Jensen
0951143f26 Issue cleanup
Change-Id: I74f9d6e99849f66ef33340685fbb08b4c9c1b768

Former-commit-id: efc911ac9d [formerly ee08cc7a0d81fd83b90398119add8fad3428283b]
Former-commit-id: 7f08b7cd22
2012-04-19 13:38:16 -05:00
Max Schenkelberg
65c864aff2 Issue Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]
Former-commit-id: 90a5c20b5a
2012-04-19 11:11:34 -05:00
Steve Harris
def458753d 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: 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]
Former-commit-id: 625cd4262c
2012-04-19 11:11:02 -05:00
Nate Jensen
35d4ef153f Issue consolidated user ids
Change-Id: I008c47320bbb5819db0607e7f695b3ecffa30387

Former-commit-id: 006785e374 [formerly 9e137757a7ed7bd9f319a1984aed40b6de960a35]
Former-commit-id: 919f6907d3
2012-04-19 10:45:25 -05:00
Nate Jensen
0cbcc74457 Issue exceptions are good
Change-Id: I67bb428804d025d20423b9e2320006c70e9b4c68

Former-commit-id: 47639de899 [formerly ec20a1f9d6076c2f72909f9fb9a6c88598201dcf]
Former-commit-id: 24ae50a37b
2012-04-18 17:05:27 -05:00
Nate Jensen
888d927468 Issue more cleanup
Change-Id: I82018bb21bed8c2e0d948da915f80ef33061615e

Former-commit-id: a54660c377 [formerly 1d24813371c2dec40ff90657705048083e03a9db]
Former-commit-id: 8124a47b94
2012-04-18 16:20:39 -05:00
Steve Harris
a4e519f3cd 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
2012-04-18 15:18:16 -05:00
Nate Jensen
8830e1c1c9 Issue more cleanup
Change-Id: Id2ad63a51e9a891801d2422547f855cd769a83d3

Former-commit-id: c33cf2538c [formerly 258df7c2187c1ebcecf1abf905ec2cc4e60464e0]
Former-commit-id: fa9c91e03d
2012-04-18 14:15:18 -05:00
Max Schenkelberg
044f21e405 Issue Got reprojection event working
Former-commit-id: 29f24e3ec5 [formerly 99e432cd258c9bf570a66be4702d28ac68204052]
Former-commit-id: 005beff18a
2012-04-18 14:01:09 -05:00
Nate Jensen
601b6628f7 Issue cleanup
Change-Id: I2a294a679f8cfb1ed62a63a95bcd21b4954194a3

Former-commit-id: ec2a0e39ed [formerly feaa63a200183b87c45a4fcea6b655cf4b1a826f]
Former-commit-id: d6e119bde1
2012-04-18 13:44:24 -05:00
Max Schenkelberg
d4bff8bbc5 Issue Added ability to remove remote graphics functionality from
editor.  Execute on session shutdown

Former-commit-id: bbb8d0e596 [formerly 8a2d8b0ce27364eae1bc7e696a5d1074e03169dc]
Former-commit-id: c64d84d1b5
2012-04-18 10:49:15 -05:00
Nate Jensen
9f055f8ec9 Issue fix non-collaboration sessions
Change-Id: I5f39311d65c16a097692a76e087598d577fe7a4b

Former-commit-id: b8cec96f21 [formerly 607ec4474b96f9670c53ba69295fa66a2880ff7e]
Former-commit-id: fa0f61a85e
2012-04-18 09:49:38 -05:00
Nate Jensen
e6bce354e8 Issue cleanup and fix errors
Change-Id: I4d949cf2e5a874793df875de8eed9b296801e32c

Former-commit-id: ee90af8052 [formerly ae78675364b412d2b06da0819e87618b8c9ab6a8]
Former-commit-id: 6b0d3a958c
2012-04-17 18:05:24 -05:00
Max Schenkelberg
dbe18c16d2 Issue Got radar and radar mosaic working for collaboration
Former-commit-id: d37d8f9bea [formerly a8c0dd15e221a6415c44f73897a80bc4b69e5ca0]
Former-commit-id: 96c81a03df
2012-04-17 17:47:21 -05:00
Nate Jensen
1b0975e7fa Issue send input events back as session leader
Change-Id: Ib1dacebdd94892bd9837b9bd91463bc6646fbccb

Former-commit-id: 9885949b27 [formerly 16af3874c9416b75edc00b4ad928de8a30e47abf]
Former-commit-id: 2d822df43f
2012-04-17 17:26:49 -05:00
Max Schenkelberg
a82f07b25d Issue Fixed mosaic bug, refactored dispatching colormap images so
mosaic could resuse

Former-commit-id: 40ca446e53 [formerly aea5c30443970933bf1517ced6d7e91a1008c9d5]
Former-commit-id: 29184d46ce
2012-04-17 13:09:07 -05:00