Max Schenkelberg
|
918a417e51
|
Issue #239 Fixed bug with mosaic being up and starting a session
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01
Former-commit-id: b82eb49055 [formerly a045f6f3b9 [formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]]
Former-commit-id: a045f6f3b9
Former-commit-id: 3ffb18b767
|
2012-05-02 10:20:20 -05:00 |
|
Matt Nash
|
ff25949b49
|
Issue #448 use aliased name in peer to peer if available, fixes the extra view that once was created
Former-commit-id: d1f23b8dee [formerly 167767dcbc [formerly 37181c07d14af1ab3cacd363d9ce150771139d3b]]
Former-commit-id: 167767dcbc
Former-commit-id: e1213ccea9
|
2012-05-02 09:42:50 -05:00 |
|
Max Schenkelberg
|
9d9e5bb8b7
|
Issue #239 Fixed url path issue for joining late
Change-Id: Ibf11c6d12b93954aad6e3969fa9869e977d48de6
Former-commit-id: 0326936e85 [formerly adabe413f6 [formerly 9879fcd8733798a96026b3459d66f5f9e757e182]]
Former-commit-id: adabe413f6
Former-commit-id: 69cb2ff5ee
|
2012-05-02 09:25:44 -05:00 |
|
Max Schenkelberg
|
e0a22310dc
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: e3d6962fe6 [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]
Former-commit-id: 3fe183277b
Former-commit-id: 2ef208b263
|
2012-05-01 18:36:09 -05:00 |
|
Steve Harris
|
fe946166ed
|
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: 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 2ed7249613
Former-commit-id: 4ec294b525
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
7fa9dbd5fb
|
12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
|
2012-05-01 18:06:13 -05:00 |
|
Nate Jensen
|
dd1cb83f03
|
Issue #427 cleanup
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691
Former-commit-id: 0b6b92c9ff [formerly 9a992aab78 [formerly 2165fb7d4b1e2743110f647797b8f6017fc0a86c]]
Former-commit-id: 9a992aab78
Former-commit-id: 8bed608bc5
|
2012-05-01 17:33:55 -05:00 |
|
Matt Nash
|
543c9ae9cb
|
Issue #448 clean up group code
Former-commit-id: 8791b7329a [formerly ae7b40634e [formerly aad6d7178694bfe9b42171729b4185e65429a515]]
Former-commit-id: ae7b40634e
Former-commit-id: 9ca693dd1e
|
2012-05-01 16:14:33 -05:00 |
|
Max Schenkelberg
|
caa38ef109
|
Issue #239 Got joining late working to load data participants don't have
Change-Id: I7c27e584b3b7f7331708689acee7f1b62fefe0eb
Former-commit-id: 4b8f81dbcb [formerly edacf7a4b3 [formerly ceabfd385103380f99bed2eaa4470cfbcb70cef9]]
Former-commit-id: edacf7a4b3
Former-commit-id: c72650baef
|
2012-05-01 15:51:15 -05:00 |
|
Matt Nash
|
c3b72c3873
|
Issue #448 fix icons
Former-commit-id: 9764210b93 [formerly fd515ad766 [formerly 6b6ef0c250f895f20e43a5b596be7189d8bc9d5f]]
Former-commit-id: fd515ad766
Former-commit-id: 7b96d1e9bc
|
2012-05-01 15:07:46 -05:00 |
|
Matt Nash
|
356ab7b820
|
Issue #448 problem where the file is not there and null is returned
Former-commit-id: 1872503cd8 [formerly cef6bd81a8 [formerly 41eb0413a8c68104532d4f302c4bed07a572b430]]
Former-commit-id: cef6bd81a8
Former-commit-id: 27ea55dad3
|
2012-05-01 11:55:12 -05:00 |
|
Matt Nash
|
2966485e68
|
Issue #448 aliasing works on tabs and such now too
Former-commit-id: 4a0b1e36ca [formerly 88b20d568e [formerly 9dca1c46abc1d6eb4f81066c14a4b888f3c37b46]]
Former-commit-id: 88b20d568e
Former-commit-id: 8a0f32b639
|
2012-05-01 10:28:20 -05:00 |
|
Matt Nash
|
cb79489dcd
|
Issue #448 further aliasing
Former-commit-id: efd6485647 [formerly 603b114ae7 [formerly 066671debfaf52427cc0584513edd11f6cf10689]]
Former-commit-id: 603b114ae7
Former-commit-id: 9c6768f254
|
2012-04-30 17:28:01 -05:00 |
|
Matt Nash
|
c270c99caa
|
Issue #448 aliasing for group view
Former-commit-id: 49bda84329 [formerly cb6aa40f42 [formerly aa42c1600b675412a5ee73a7e2da48602f05e10f]]
Former-commit-id: cb6aa40f42
Former-commit-id: 8ae54b2e0c
|
2012-04-30 16:45:35 -05:00 |
|
Nate Jensen
|
4fc32a8178
|
Issue #427 cleanup
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1
Former-commit-id: eac55b7587 [formerly 6a034283b5 [formerly 4c8192e99f1ecb57bc6a4efeaa6d7ee3a8127ec1]]
Former-commit-id: 6a034283b5
Former-commit-id: c958d3a471
|
2012-04-30 15:49:44 -05:00 |
|
Nate Jensen
|
2df5c95e6c
|
Issue #427 remove extraneous event buses
Change-Id: I958de58ba963609ada80529195d024077a901a0e
Former-commit-id: bfd45d703f [formerly 7aa1e562d8 [formerly 1c0d5457c079880996fc75872870545ededb4316]]
Former-commit-id: 7aa1e562d8
Former-commit-id: 56ae7eab86
|
2012-04-30 15:33:59 -05:00 |
|
Max Schenkelberg
|
b2ee1fc849
|
Issue #239 Made custom PointImageExtension that handles differencing for faster plot rendering
Change-Id: I2e22ee3eb6fe67ff754dd4689b8c8876eb3b893d
Former-commit-id: 60aac07962 [formerly 9e2cf73f7a [formerly 2caf3e8ebb70ffd455cb9f354b1226e858898822]]
Former-commit-id: 9e2cf73f7a
Former-commit-id: 5e5e362f39
|
2012-04-30 15:01:37 -05:00 |
|
Dave Hladky
|
37da8763eb
|
Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.
Former-commit-id: 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]
Former-commit-id: 1b7473572f
Former-commit-id: 42a12fa7a5
|
2012-04-30 13:43:34 -05:00 |
|
Bryan Kowal
|
e1b95c6c29
|
Issue #517 - ensure that plugin.xml is packaged in the com.raytheon.uf.viz.collaboration.radar jar file.
Former-commit-id: 84e3c4704e [formerly ed878bc13d [formerly 22fb97b29a3e7fd310de9915b83ffcbd2c7771a0]]
Former-commit-id: ed878bc13d
Former-commit-id: ed83cb8a52
|
2012-04-30 12:45:30 -05:00 |
|
Nate Jensen
|
e6d8ea11ba
|
Issue #427 remove dead code
Change-Id: I36e3f77f8c0176b72762abc311d8e4e3eab22e0e
Former-commit-id: bba6d5e400 [formerly d5a3acc97b [formerly 90a1888baffbb21ac3b2f555764c37a519d5efb1]]
Former-commit-id: d5a3acc97b
Former-commit-id: 6de861e9b5
|
2012-04-27 16:22:27 -05:00 |
|
Nate Jensen
|
084967f0fd
|
Issue #427 separated collaboration.ui into two plugins
Change-Id: I3085f2aae4c1c44b65749e587a9eb753d1d7a34b
Former-commit-id: 9454cbd1b9 [formerly e8f1c0159c [formerly f96302b439b39030e54a2b87a6e2387ebb63502f]]
Former-commit-id: e8f1c0159c
Former-commit-id: d952fe084a
|
2012-04-27 16:12:48 -05:00 |
|
Nate Jensen
|
281f9b3232
|
Issue #427 better part listeners
Change-Id: I0787fdc7a086c87228e9f38ce85e23dd9edc4bd2
Former-commit-id: 866acb24b2 [formerly 855ec5dd4d [formerly 008164a55b5720eaf8dbfd2d023fefc9ab705936]]
Former-commit-id: 855ec5dd4d
Former-commit-id: cafa23c9d2
|
2012-04-27 14:47:27 -05:00 |
|
Matt Nash
|
1749033fdd
|
Issue #448 add preference page for collaboration, currently only enabling and disabling notifications
Former-commit-id: 00d11cdeaa [formerly cc313ebcac [formerly 1a0bc57f249f3b757c6226526ba05b2f8d1ab2e6]]
Former-commit-id: cc313ebcac
Former-commit-id: 0a3a7bfba2
|
2012-04-27 14:34:55 -05:00 |
|
David Gillingham
|
ddd78ed32f
|
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: 9878793618 [formerly 4aadd41fde [formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]]
Former-commit-id: 4aadd41fde
Former-commit-id: 0ff2041959
|
2012-04-27 13:26:37 -05:00 |
|
David Gillingham
|
034cab5000
|
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: 292374ce21 [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]
Former-commit-id: c28bfaddee
Former-commit-id: 6497272c1d
|
2012-04-27 12:43:04 -05:00 |
|
Richard Peter
|
231d98b79e
|
Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: b11df888d3 [formerly 349adaeedd [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]
Former-commit-id: 349adaeedd
Former-commit-id: c33a392a8c
|
2012-04-27 12:08:29 -05:00 |
|
Max Schenkelberg
|
f4cd5ebfef
|
Issue #239 Added render frame merging capability
Change-Id: Ie16e650693de6e07453357740b3c2bae21bd999d
Former-commit-id: df07bff0bc [formerly ff0827b51d [formerly ad6d31300e0ac41375a3eb65ce337a6105be72ee]]
Former-commit-id: ff0827b51d
Former-commit-id: 4175affdc7
|
2012-04-27 11:57:53 -05:00 |
|
Matt Nash
|
18e07972ca
|
Issue #429 add better notification to chat
Former-commit-id: 3b2fdaa579 [formerly e0d11ae8b1 [formerly 40db7caa4b6bd45537f4cb37a3f034a907cd8f79]]
Former-commit-id: e0d11ae8b1
Former-commit-id: 590862b77d
|
2012-04-27 10:10:05 -05:00 |
|
Matt Nash
|
548e0c4b59
|
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: 16de1dbafe [formerly 25201fcbad [formerly 9c0f7ee82b7a844620f1f2e00947a256582b86ef]]
Former-commit-id: 25201fcbad
Former-commit-id: c1983d295d
|
2012-04-27 10:08:27 -05:00 |
|
Matt Nash
|
1e27e69e3d
|
Issue #448 remove listener to help prevent exceptions
Former-commit-id: b69e13d795 [formerly 29b39a1df4 [formerly 66ac99ff89a3347d528d09081d41c248f4ff4783]]
Former-commit-id: 29b39a1df4
Former-commit-id: 331adad3a3
|
2012-04-26 09:17:27 -05:00 |
|
Max Schenkelberg
|
a31ad22113
|
Added network logging for http traffic
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25
Former-commit-id: f74b6b4a93 [formerly a912786429 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]
Former-commit-id: a912786429
Former-commit-id: 2cc5794428
|
2012-04-25 17:28:52 -05:00 |
|
David Gillingham
|
be0570d2fe
|
Issue #473: Properly archive text plugin records,
fix bugs in DatabaseArchiver.determineStartTime().
Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f
Former-commit-id: 04ab5d619b [formerly 526abfd36e [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]
Former-commit-id: 526abfd36e
Former-commit-id: 8592a9a50d
|
2012-04-25 17:08:21 -05:00 |
|
Nate Jensen
|
74a4671d33
|
Issue #427 remove sysouts
Change-Id: I82dd5bcd8e7eb20afcf516c0b8d33e37d72d45db
Former-commit-id: e17dad1b54 [formerly ed4303158c [formerly 5b87a033a88899b1ca033b18efc9532002b047c0]]
Former-commit-id: ed4303158c
Former-commit-id: 1ff944fc2d
|
2012-04-25 16:56:19 -05:00 |
|
Max Schenkelberg
|
56add92c68
|
Got efficient sending of events working where it only sends if events changed
Change-Id: I499a38c1b9cbbd3ede5b04356d2f7788153f836b
Former-commit-id: 28693e6991 [formerly 84b8ffa490 [formerly 2f1f6dd97555c46547a7440c97a5314f7a26dc8d]]
Former-commit-id: 84b8ffa490
Former-commit-id: d77732bd7d
|
2012-04-25 16:18:41 -05:00 |
|
Matt Nash
|
7bedb0a6a8
|
Issue #448 slight changes to data provider and session leader indicators
Former-commit-id: 8f93192385 [formerly 06d71f13ad [formerly 61bcce04de9bf4e4756140903ed3dd861333fd2b]]
Former-commit-id: 06d71f13ad
Former-commit-id: 12426aba3b
|
2012-04-25 15:07:14 -05:00 |
|
Nate Jensen
|
063244b9d3
|
Issue #427 renamed data provider rsc
Change-Id: I05b417c3f7d65908a52910f9d847cc188c7c4a9c
Former-commit-id: b3723bc986 [formerly 069f809596 [formerly 35ef9c2c228ac97ef623edd1e50800495d9ab8f7]]
Former-commit-id: 069f809596
Former-commit-id: e816529d71
|
2012-04-25 14:41:37 -05:00 |
|
Matt Nash
|
0611debf5e
|
Issue #448 first pass at alias
Former-commit-id: b20b9530fd [formerly 7d870434f6 [formerly 34f230b550a886cad03e3ffeeeaeeaebe480defc]]
Former-commit-id: 7d870434f6
Former-commit-id: b480ccd3fe
|
2012-04-25 14:25:52 -05:00 |
|
Matt Nash
|
e4c9c05f36
|
Issue #429 color final fixes
Former-commit-id: 506d3e8989 [formerly 9bc3f0c75d [formerly 51b937b9be5c9f1a1e17317e241cd93337e9fd0c]]
Former-commit-id: 9bc3f0c75d
Former-commit-id: 03174d8f66
|
2012-04-25 14:22:12 -05:00 |
|
Max Schenkelberg
|
d68aa3b431
|
#Issue 239 Got bulk event sending and only sending events when previous frame changes.
Former-commit-id: 9607d3dd41 [formerly 001c52bd3a [formerly 4ac2f1ac53970f57936d3b8cd5dfcd90f718c6ce]]
Former-commit-id: 001c52bd3a
Former-commit-id: 4c3afb8f7c
|
2012-04-25 11:27:19 -05:00 |
|
Matt Nash
|
b92b22e13a
|
Issue #429 colors matching between telestrator and chat room across clients
Former-commit-id: 09fc05162c [formerly d84865ced9 [formerly 46a327c929a09c21270f7b6de543e8d742476003]]
Former-commit-id: d84865ced9
Former-commit-id: abbe0c3d6b
|
2012-04-25 07:39:05 -05:00 |
|
Matt Nash
|
9a8693fda1
|
Issue #429 colors for collaboration session
Former-commit-id: bc1e35f4b4 [formerly 63dccd6b85 [formerly 86a4ba1b10b58f266cfd46a257145717140a3778]]
Former-commit-id: 63dccd6b85
Former-commit-id: 190a951b26
|
2012-04-24 16:39:28 -05:00 |
|
Steve Harris
|
931087306f
|
12.4.1-10 baseline
Former-commit-id: 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]
Former-commit-id: 704b75e1a1
Former-commit-id: 418489e726
|
2012-04-24 15:38:29 -05:00 |
|
Nate Jensen
|
a8c7d99d18
|
Issue #427 minor fix
Change-Id: I341e046bcde321ae70a2afeb745bedb0078758ca
Former-commit-id: bcc435ac28 [formerly fd1f337a92 [formerly 2d544b5c2fb48870173ea9d38b4c7370f6ebe49f]]
Former-commit-id: fd1f337a92
Former-commit-id: 652c2a5411
|
2012-04-24 15:28:36 -05:00 |
|
Steve Harris
|
98c92073b5
|
12.4.1-7 baseline
Former-commit-id: cca73b3c62 [formerly 90ae4bbb36 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]]
Former-commit-id: 90ae4bbb36
Former-commit-id: 6d585942fe
|
2012-04-24 15:24:39 -05:00 |
|
Nate Jensen
|
45bf1150e6
|
Issue #427 login data stored in preferences
Change-Id: I0ac9d34f6a7eaf8f6db80d6c573115bd43e2e11c
Former-commit-id: bf3eb689cc [formerly c4afe61f01 [formerly 287dae35ae3566f22a2d9e5a22760f3ef9d29ca2]]
Former-commit-id: c4afe61f01
Former-commit-id: a2a6d2d61d
|
2012-04-24 14:11:27 -05:00 |
|
Max Schenkelberg
|
a2d730a537
|
Issue #239 Added persistence capability to Collaboration data events
Former-commit-id: 32ade1a1f7 [formerly f4193b0e4e [formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]]
Former-commit-id: f4193b0e4e
Former-commit-id: 34f80169fe
|
2012-04-24 13:44:16 -05:00 |
|
Matt Nash
|
9c5efdfd26
|
Issue #429 major refactor of UserId, make CollaborationGroupView use actual objects instead of wrappers
Former-commit-id: fa360c90cf [formerly 0241e8857f [formerly 68f7aaecfe8c78db56a70e8d33a9d990bf5fa467]]
Former-commit-id: 0241e8857f
Former-commit-id: b7b1429f2c
|
2012-04-24 12:20:55 -05:00 |
|
Nate Jensen
|
36c4c4e66e
|
Issue #443 better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81
Former-commit-id: 39ebbc3913 [formerly a4b0addeee [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]
Former-commit-id: a4b0addeee
Former-commit-id: 14f70d1122
|
2012-04-23 11:23:22 -05:00 |
|
Bryan Kowal
|
70d956f8ca
|
Issue #517 - fix the collaboration pde build.
Former-commit-id: d97819a8df [formerly 19eb596d88 [formerly 450b6ad4bb2c3e0b9069256977884d7b89224cae]]
Former-commit-id: 19eb596d88
Former-commit-id: 611fc324ea
|
2012-04-21 18:17:39 -05:00 |
|
Matt Nash
|
31510dae8d
|
Issue #429 fixes for colors, needs to refactor user id to make work
Former-commit-id: 7f7bd73014 [formerly b418af8aa9 [formerly a0f919d73ea4d1da7d79e721800079f0698070db]]
Former-commit-id: b418af8aa9
Former-commit-id: ac53206f1f
|
2012-04-20 15:30:58 -05:00 |
|