Max Schenkelberg
|
a3baaa9ae8
|
Issue #584 Got draw point calls working
Change-Id: I80f9061647a96e66acf70fb5c22aefb8916979b0
Former-commit-id: 65f8b18194 [formerly 65f8b18194 [formerly 39a9ae5047e2f873d9b09ba65eded740f6568cec]]
Former-commit-id: 5d9da5e1ef
Former-commit-id: 01ae8134b2
|
2012-05-02 16:40:55 -05:00 |
|
Matt Nash
|
5aecb3340e
|
Issue #429 add capability for session leader to change other's colors
Former-commit-id: 817bd297c8 [formerly 817bd297c8 [formerly 6cdc4cfa9e740988c01a73ec862fcaed72403b45]]
Former-commit-id: c746441432
Former-commit-id: df25bbf079
|
2012-05-02 14:36:58 -05:00 |
|
Matt Nash
|
2da26e7ed5
|
Issue #437 fix change status, remove double posting
Former-commit-id: e9f75e7f50 [formerly e9f75e7f50 [formerly 038bae22b932a1bdddeca4dd813920bf62b8db71]]
Former-commit-id: 3c8143e8bc
Former-commit-id: 1e4d656cf9
|
2012-05-02 14:36:58 -05:00 |
|
Max Schenkelberg
|
f4bd13133e
|
Issue #239 Fixed bug with mosaic being up and starting a session
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01
Former-commit-id: a045f6f3b9 [formerly a045f6f3b9 [formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]]
Former-commit-id: b82eb49055
Former-commit-id: 6a1b035c2d
|
2012-05-02 10:20:20 -05:00 |
|
Matt Nash
|
49fa359d9a
|
Issue #448 use aliased name in peer to peer if available, fixes the extra view that once was created
Former-commit-id: 167767dcbc [formerly 167767dcbc [formerly 37181c07d14af1ab3cacd363d9ce150771139d3b]]
Former-commit-id: d1f23b8dee
Former-commit-id: b0beab3044
|
2012-05-02 09:42:50 -05:00 |
|
Max Schenkelberg
|
11cf1f3a23
|
Issue #239 Fixed url path issue for joining late
Change-Id: Ibf11c6d12b93954aad6e3969fa9869e977d48de6
Former-commit-id: adabe413f6 [formerly adabe413f6 [formerly 9879fcd8733798a96026b3459d66f5f9e757e182]]
Former-commit-id: 0326936e85
Former-commit-id: a608dcb59b
|
2012-05-02 09:25:44 -05:00 |
|
Max Schenkelberg
|
9f72069996
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 3fe183277b [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]
Former-commit-id: e3d6962fe6
Former-commit-id: 878de45ee6
|
2012-05-01 18:36:09 -05:00 |
|
Steve Harris
|
fd9e226b35
|
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: 2ed7249613 [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 7b75b781ad
Former-commit-id: 6dd3ee8809
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
e5543a0e86
|
12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
|
2012-05-01 18:06:13 -05:00 |
|
Nate Jensen
|
6bcab11947
|
Issue #427 cleanup
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691
Former-commit-id: 9a992aab78 [formerly 9a992aab78 [formerly 2165fb7d4b1e2743110f647797b8f6017fc0a86c]]
Former-commit-id: 0b6b92c9ff
Former-commit-id: e89143161c
|
2012-05-01 17:33:55 -05:00 |
|
Matt Nash
|
f99b59b0fd
|
Issue #448 clean up group code
Former-commit-id: ae7b40634e [formerly ae7b40634e [formerly aad6d7178694bfe9b42171729b4185e65429a515]]
Former-commit-id: 8791b7329a
Former-commit-id: 5d3c2686cd
|
2012-05-01 16:14:33 -05:00 |
|
Max Schenkelberg
|
37077c6b3e
|
Issue #239 Got joining late working to load data participants don't have
Change-Id: I7c27e584b3b7f7331708689acee7f1b62fefe0eb
Former-commit-id: edacf7a4b3 [formerly edacf7a4b3 [formerly ceabfd385103380f99bed2eaa4470cfbcb70cef9]]
Former-commit-id: 4b8f81dbcb
Former-commit-id: 0b5623654a
|
2012-05-01 15:51:15 -05:00 |
|
Matt Nash
|
a55f4c6402
|
Issue #448 fix icons
Former-commit-id: fd515ad766 [formerly fd515ad766 [formerly 6b6ef0c250f895f20e43a5b596be7189d8bc9d5f]]
Former-commit-id: 9764210b93
Former-commit-id: 529444c746
|
2012-05-01 15:07:46 -05:00 |
|
Matt Nash
|
e39edb5776
|
Issue #448 problem where the file is not there and null is returned
Former-commit-id: cef6bd81a8 [formerly cef6bd81a8 [formerly 41eb0413a8c68104532d4f302c4bed07a572b430]]
Former-commit-id: 1872503cd8
Former-commit-id: 7a89fa8342
|
2012-05-01 11:55:12 -05:00 |
|
Matt Nash
|
a601af019e
|
Issue #448 aliasing works on tabs and such now too
Former-commit-id: 88b20d568e [formerly 88b20d568e [formerly 9dca1c46abc1d6eb4f81066c14a4b888f3c37b46]]
Former-commit-id: 4a0b1e36ca
Former-commit-id: f121499f7a
|
2012-05-01 10:28:20 -05:00 |
|
Matt Nash
|
7ce6186e51
|
Issue #448 further aliasing
Former-commit-id: 603b114ae7 [formerly 603b114ae7 [formerly 066671debfaf52427cc0584513edd11f6cf10689]]
Former-commit-id: efd6485647
Former-commit-id: b797bf94b9
|
2012-04-30 17:28:01 -05:00 |
|
Matt Nash
|
278729c19d
|
Issue #448 aliasing for group view
Former-commit-id: cb6aa40f42 [formerly cb6aa40f42 [formerly aa42c1600b675412a5ee73a7e2da48602f05e10f]]
Former-commit-id: 49bda84329
Former-commit-id: 77e3b905b0
|
2012-04-30 16:45:35 -05:00 |
|
Nate Jensen
|
226437c8a0
|
Issue #427 cleanup
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1
Former-commit-id: 6a034283b5 [formerly 6a034283b5 [formerly 4c8192e99f1ecb57bc6a4efeaa6d7ee3a8127ec1]]
Former-commit-id: eac55b7587
Former-commit-id: fafdf1de48
|
2012-04-30 15:49:44 -05:00 |
|
Nate Jensen
|
a844d4f24d
|
Issue #427 remove extraneous event buses
Change-Id: I958de58ba963609ada80529195d024077a901a0e
Former-commit-id: 7aa1e562d8 [formerly 7aa1e562d8 [formerly 1c0d5457c079880996fc75872870545ededb4316]]
Former-commit-id: bfd45d703f
Former-commit-id: 9f32676a86
|
2012-04-30 15:33:59 -05:00 |
|
Max Schenkelberg
|
37d9d12838
|
Issue #239 Made custom PointImageExtension that handles differencing for faster plot rendering
Change-Id: I2e22ee3eb6fe67ff754dd4689b8c8876eb3b893d
Former-commit-id: 9e2cf73f7a [formerly 9e2cf73f7a [formerly 2caf3e8ebb70ffd455cb9f354b1226e858898822]]
Former-commit-id: 60aac07962
Former-commit-id: 7bfaa9474b
|
2012-04-30 15:01:37 -05:00 |
|
Dave Hladky
|
d2e16d486b
|
Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.
Former-commit-id: 1b7473572f [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]
Former-commit-id: 5b7ecea866
Former-commit-id: 61e31c62ff
|
2012-04-30 13:43:34 -05:00 |
|
Bryan Kowal
|
4fcc1870b4
|
Issue #517 - ensure that plugin.xml is packaged in the com.raytheon.uf.viz.collaboration.radar jar file.
Former-commit-id: ed878bc13d [formerly ed878bc13d [formerly 22fb97b29a3e7fd310de9915b83ffcbd2c7771a0]]
Former-commit-id: 84e3c4704e
Former-commit-id: a2d1cc317d
|
2012-04-30 12:45:30 -05:00 |
|
Nate Jensen
|
a20cf866e5
|
Issue #427 remove dead code
Change-Id: I36e3f77f8c0176b72762abc311d8e4e3eab22e0e
Former-commit-id: d5a3acc97b [formerly d5a3acc97b [formerly 90a1888baffbb21ac3b2f555764c37a519d5efb1]]
Former-commit-id: bba6d5e400
Former-commit-id: 2e02578b63
|
2012-04-27 16:22:27 -05:00 |
|
Nate Jensen
|
03db8baf70
|
Issue #427 separated collaboration.ui into two plugins
Change-Id: I3085f2aae4c1c44b65749e587a9eb753d1d7a34b
Former-commit-id: e8f1c0159c [formerly e8f1c0159c [formerly f96302b439b39030e54a2b87a6e2387ebb63502f]]
Former-commit-id: 9454cbd1b9
Former-commit-id: 4a85e47ee9
|
2012-04-27 16:12:48 -05:00 |
|
Nate Jensen
|
e4afe7405c
|
Issue #427 better part listeners
Change-Id: I0787fdc7a086c87228e9f38ce85e23dd9edc4bd2
Former-commit-id: 855ec5dd4d [formerly 855ec5dd4d [formerly 008164a55b5720eaf8dbfd2d023fefc9ab705936]]
Former-commit-id: 866acb24b2
Former-commit-id: cc61a7a62f
|
2012-04-27 14:47:27 -05:00 |
|
Matt Nash
|
1e75e1b24d
|
Issue #448 add preference page for collaboration, currently only enabling and disabling notifications
Former-commit-id: cc313ebcac [formerly cc313ebcac [formerly 1a0bc57f249f3b757c6226526ba05b2f8d1ab2e6]]
Former-commit-id: 00d11cdeaa
Former-commit-id: af819b2e0d
|
2012-04-27 14:34:55 -05:00 |
|
David Gillingham
|
01f74fa2b5
|
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: c28bfaddee [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]
Former-commit-id: 292374ce21
Former-commit-id: 6f40ba77f1
|
2012-04-27 12:43:04 -05:00 |
|
Max Schenkelberg
|
8a4f34223e
|
Issue #239 Added render frame merging capability
Change-Id: Ie16e650693de6e07453357740b3c2bae21bd999d
Former-commit-id: ff0827b51d [formerly ff0827b51d [formerly ad6d31300e0ac41375a3eb65ce337a6105be72ee]]
Former-commit-id: df07bff0bc
Former-commit-id: e5e13fc3b3
|
2012-04-27 11:57:53 -05:00 |
|
Matt Nash
|
c930a63797
|
Issue #429 add better notification to chat
Former-commit-id: e0d11ae8b1 [formerly e0d11ae8b1 [formerly 40db7caa4b6bd45537f4cb37a3f034a907cd8f79]]
Former-commit-id: 3b2fdaa579
Former-commit-id: 91035ee253
|
2012-04-27 10:10:05 -05:00 |
|
Matt Nash
|
32772c5ecc
|
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: 25201fcbad [formerly 25201fcbad [formerly 9c0f7ee82b7a844620f1f2e00947a256582b86ef]]
Former-commit-id: 16de1dbafe
Former-commit-id: 501b74478e
|
2012-04-27 10:08:27 -05:00 |
|
Matt Nash
|
20b7f4c34b
|
Issue #448 remove listener to help prevent exceptions
Former-commit-id: 29b39a1df4 [formerly 29b39a1df4 [formerly 66ac99ff89a3347d528d09081d41c248f4ff4783]]
Former-commit-id: b69e13d795
Former-commit-id: fcecab2afb
|
2012-04-26 09:17:27 -05:00 |
|
Max Schenkelberg
|
936fa688c0
|
Added network logging for http traffic
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25
Former-commit-id: a912786429 [formerly a912786429 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]
Former-commit-id: f74b6b4a93
Former-commit-id: 2d25e8bb78
|
2012-04-25 17:28:52 -05:00 |
|
David Gillingham
|
aeba62a5d9
|
Issue #473: Properly archive text plugin records,
fix bugs in DatabaseArchiver.determineStartTime().
Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f
Former-commit-id: 526abfd36e [formerly 526abfd36e [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]
Former-commit-id: 04ab5d619b
Former-commit-id: 36717c7a3e
|
2012-04-25 17:08:21 -05:00 |
|
Nate Jensen
|
4eb455b7b1
|
Issue #427 remove sysouts
Change-Id: I82dd5bcd8e7eb20afcf516c0b8d33e37d72d45db
Former-commit-id: ed4303158c [formerly ed4303158c [formerly 5b87a033a88899b1ca033b18efc9532002b047c0]]
Former-commit-id: e17dad1b54
Former-commit-id: 0c523369c4
|
2012-04-25 16:56:19 -05:00 |
|
Max Schenkelberg
|
0ba535a60b
|
Got efficient sending of events working where it only sends if events changed
Change-Id: I499a38c1b9cbbd3ede5b04356d2f7788153f836b
Former-commit-id: 84b8ffa490 [formerly 84b8ffa490 [formerly 2f1f6dd97555c46547a7440c97a5314f7a26dc8d]]
Former-commit-id: 28693e6991
Former-commit-id: e608125f9d
|
2012-04-25 16:18:41 -05:00 |
|
Matt Nash
|
9d0fd819ff
|
Issue #448 slight changes to data provider and session leader indicators
Former-commit-id: 06d71f13ad [formerly 06d71f13ad [formerly 61bcce04de9bf4e4756140903ed3dd861333fd2b]]
Former-commit-id: 8f93192385
Former-commit-id: f212b1d1ae
|
2012-04-25 15:07:14 -05:00 |
|
Nate Jensen
|
9c7af0cfeb
|
Issue #427 renamed data provider rsc
Change-Id: I05b417c3f7d65908a52910f9d847cc188c7c4a9c
Former-commit-id: 069f809596 [formerly 069f809596 [formerly 35ef9c2c228ac97ef623edd1e50800495d9ab8f7]]
Former-commit-id: b3723bc986
Former-commit-id: a14bccc7ac
|
2012-04-25 14:41:37 -05:00 |
|
Matt Nash
|
23c3615fd6
|
Issue #448 first pass at alias
Former-commit-id: 7d870434f6 [formerly 7d870434f6 [formerly 34f230b550a886cad03e3ffeeeaeeaebe480defc]]
Former-commit-id: b20b9530fd
Former-commit-id: f3467023a2
|
2012-04-25 14:25:52 -05:00 |
|
Matt Nash
|
d51f16cd6c
|
Issue #429 color final fixes
Former-commit-id: 9bc3f0c75d [formerly 9bc3f0c75d [formerly 51b937b9be5c9f1a1e17317e241cd93337e9fd0c]]
Former-commit-id: 506d3e8989
Former-commit-id: 76e8b2e192
|
2012-04-25 14:22:12 -05:00 |
|
Max Schenkelberg
|
bf92452419
|
#Issue 239 Got bulk event sending and only sending events when previous frame changes.
Former-commit-id: 001c52bd3a [formerly 001c52bd3a [formerly 4ac2f1ac53970f57936d3b8cd5dfcd90f718c6ce]]
Former-commit-id: 9607d3dd41
Former-commit-id: 9d8dbba20b
|
2012-04-25 11:27:19 -05:00 |
|
Matt Nash
|
8739f702d0
|
Issue #429 colors matching between telestrator and chat room across clients
Former-commit-id: d84865ced9 [formerly d84865ced9 [formerly 46a327c929a09c21270f7b6de543e8d742476003]]
Former-commit-id: 09fc05162c
Former-commit-id: 563e76c313
|
2012-04-25 07:39:05 -05:00 |
|
Matt Nash
|
f614a5bb04
|
Issue #429 colors for collaboration session
Former-commit-id: 63dccd6b85 [formerly 63dccd6b85 [formerly 86a4ba1b10b58f266cfd46a257145717140a3778]]
Former-commit-id: bc1e35f4b4
Former-commit-id: d79ae59e19
|
2012-04-24 16:39:28 -05:00 |
|
Steve Harris
|
3ed3a665cb
|
12.4.1-10 baseline
Former-commit-id: 704b75e1a1 [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]
Former-commit-id: 01457fbbde
Former-commit-id: aabc3842ac
|
2012-04-24 15:38:29 -05:00 |
|
Nate Jensen
|
a867e1ab82
|
Issue #427 minor fix
Change-Id: I341e046bcde321ae70a2afeb745bedb0078758ca
Former-commit-id: fd1f337a92 [formerly fd1f337a92 [formerly 2d544b5c2fb48870173ea9d38b4c7370f6ebe49f]]
Former-commit-id: bcc435ac28
Former-commit-id: 7c727f5a0e
|
2012-04-24 15:28:36 -05:00 |
|
Steve Harris
|
5a3a53936f
|
12.4.1-7 baseline
Former-commit-id: 90ae4bbb36 [formerly 90ae4bbb36 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]]
Former-commit-id: cca73b3c62
Former-commit-id: d9f966008c
|
2012-04-24 15:24:39 -05:00 |
|
Nate Jensen
|
23bd871123
|
Issue #427 login data stored in preferences
Change-Id: I0ac9d34f6a7eaf8f6db80d6c573115bd43e2e11c
Former-commit-id: c4afe61f01 [formerly c4afe61f01 [formerly 287dae35ae3566f22a2d9e5a22760f3ef9d29ca2]]
Former-commit-id: bf3eb689cc
Former-commit-id: 0a7a5d44ff
|
2012-04-24 14:11:27 -05:00 |
|
Max Schenkelberg
|
836eec0684
|
Issue #239 Added persistence capability to Collaboration data events
Former-commit-id: f4193b0e4e [formerly f4193b0e4e [formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]]
Former-commit-id: 32ade1a1f7
Former-commit-id: 1ddbb3ef60
|
2012-04-24 13:44:16 -05:00 |
|
Matt Nash
|
2c8dfc611b
|
Issue #429 major refactor of UserId, make CollaborationGroupView use actual objects instead of wrappers
Former-commit-id: 0241e8857f [formerly 0241e8857f [formerly 68f7aaecfe8c78db56a70e8d33a9d990bf5fa467]]
Former-commit-id: fa360c90cf
Former-commit-id: b428da939c
|
2012-04-24 12:20:55 -05:00 |
|
Nate Jensen
|
776ef738f7
|
Issue #443 better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81
Former-commit-id: a4b0addeee [formerly a4b0addeee [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]
Former-commit-id: 39ebbc3913
Former-commit-id: 8130c22b64
|
2012-04-23 11:23:22 -05:00 |
|
Bryan Kowal
|
160a359b30
|
Issue #517 - fix the collaboration pde build.
Former-commit-id: 19eb596d88 [formerly 19eb596d88 [formerly 450b6ad4bb2c3e0b9069256977884d7b89224cae]]
Former-commit-id: d97819a8df
Former-commit-id: de9a48b0c3
|
2012-04-21 18:17:39 -05:00 |
|