Commit graph

398 commits

Author SHA1 Message Date
Matt Nash
0f0f49249b Issue fix rename
Former-commit-id: 267c83294d [formerly fc9ed4eb5ee470d309fea6af74d254728877c531]
Former-commit-id: c05e57d3d2
2012-05-10 10:09:48 -05:00
Matt Nash
ef6345493d Isssue rename project to better match structure
Former-commit-id: 8caf649518 [formerly e644591a18b0a145c7db2151ebf06a17326d8572]
Former-commit-id: ba377eae5c
2012-05-10 10:06:06 -05:00
Matt Nash
9612df2217 Issue clean up telestrator
Former-commit-id: d88d5ab229 [formerly 55a10673d6585098caf45aa4f19f0add42aaf4a5]
Former-commit-id: 3cd13e285c
2012-05-10 09:18:41 -05:00
Max Schenkelberg
aa5f1d12db Issue Fix VizPainter.py bug from previous commit
Change-Id: I58c217f5abcefd637097bd5c9c6824015ea082b7

Former-commit-id: c2e1e83033 [formerly 0e70b319d47cd198b71426789671efeaa4ddb9f7]
Former-commit-id: ea2151970a
2012-05-09 15:38:03 -05:00
Matt Nash
618cf9b1ad Issue aliasing fixes to remove dups
Former-commit-id: 207ee2592e [formerly 7135fd439b20ed6e20bf3102e2e10505a6628026]
Former-commit-id: bd51ed2a52
2012-05-09 15:23:32 -05:00
Matt Nash
a5c11b2737 Issue clean up aliasing
Former-commit-id: 2d5fb5c15e [formerly 526a596475e803251c6405142a5cd0c59c3d5809]
Former-commit-id: 25eefc3709
2012-05-09 15:06:21 -05:00
Max Schenkelberg
3ca8ca6f01 Issue Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056

Former-commit-id: 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]
Former-commit-id: 1f5abc6e20
2012-05-09 15:02:30 -05:00
Steve Harris
63ea8599d7 Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java

Former-commit-id: 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]
Former-commit-id: 58037cb5d1
2012-05-09 13:14:00 -05:00
Nate Jensen
41ec3f0606 Issue add listeners before connecting and fix populateGroups()
Change-Id: Ief028f153954484666d01f52b91da9c97490ef94

Former-commit-id: f59d388be1 [formerly ea146f69c6fca818589587d37aace2afc75e7147]
Former-commit-id: cb3527bca8
2012-05-08 17:55:22 -05:00
Matt Nash
24d60a6d2e Issue fix spooky mistake of plugin customization file
Former-commit-id: 32552c7aca [formerly 24f52653518c0f0430ba13aea98b6b6d6ef1f494]
Former-commit-id: a32f40ce0a
2012-05-08 16:11:43 -05:00
Nate Jensen
4a1d2d906e Issue fix duplicate groups
Change-Id: I3bed636fa06de47d3dbdceb210284e624b626dae

Former-commit-id: 5b0f431131 [formerly cbc0b8ba9936c6cad874e22e24fe38acb7855a3f]
Former-commit-id: 51971ac305
2012-05-08 15:55:06 -05:00
Nate Jensen
13d56f04f0 Issue fix errors
Change-Id: Ic4d3235727136d38a410f6e0452674aaaf9fab3b

Former-commit-id: ccccaf2d28 [formerly dcbaf62a1edc168f0414078dc61323b7db32c9ee]
Former-commit-id: 6c057c9d7a
2012-05-08 14:37:24 -05:00
Matt Nash
76e037485f Issue remove duplicate roster/presence classes
Former-commit-id: 01dc5ddbb3 [formerly cc3031e4d2142f79d935e441ed0bed9824b54251]
Former-commit-id: f91d457e5d
2012-05-08 12:57:12 -05:00
Matt Nash
408263e5a7 Issue Login dialog off the UI thread
Former-commit-id: 1b12a27631 [formerly d37f9b0ee38028c3995ed76ef69385ee3b4a152f]
Former-commit-id: 3f53ab4a89
2012-05-08 10:58:16 -05:00
Max Schenkelberg
846ae30be9 Issue Fixed colorbar border flicker, made area have aspect ratio of data provider
Change-Id: If3a768ee5b61af7459ff8d22beab3270111f5286

Former-commit-id: af162bedf5 [formerly 14107837a06d36b75d2b4878a0c72a650c4b2579]
Former-commit-id: 3d15400eb7
2012-05-03 15:54:22 -05:00
Max Schenkelberg
c6edfad263 Issue Got colorbars rendering properly
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103

Former-commit-id: d4c10e5548 [formerly 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe]
Former-commit-id: c81c225a6e
2012-05-03 13:07:43 -05:00
Max Schenkelberg
01ae8134b2 Issue Got draw point calls working
Change-Id: I80f9061647a96e66acf70fb5c22aefb8916979b0

Former-commit-id: 65f8b18194 [formerly 39a9ae5047e2f873d9b09ba65eded740f6568cec]
Former-commit-id: 5d9da5e1ef
2012-05-02 16:40:55 -05:00
Matt Nash
df25bbf079 Issue add capability for session leader to change other's colors
Former-commit-id: 817bd297c8 [formerly 6cdc4cfa9e740988c01a73ec862fcaed72403b45]
Former-commit-id: c746441432
2012-05-02 14:36:58 -05:00
Matt Nash
1e4d656cf9 Issue fix change status, remove double posting
Former-commit-id: e9f75e7f50 [formerly 038bae22b932a1bdddeca4dd813920bf62b8db71]
Former-commit-id: 3c8143e8bc
2012-05-02 14:36:58 -05:00
Max Schenkelberg
6a1b035c2d Issue Fixed bug with mosaic being up and starting a session
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01

Former-commit-id: a045f6f3b9 [formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]
Former-commit-id: b82eb49055
2012-05-02 10:20:20 -05:00
Matt Nash
b0beab3044 Issue use aliased name in peer to peer if available, fixes the extra view that once was created
Former-commit-id: 167767dcbc [formerly 37181c07d14af1ab3cacd363d9ce150771139d3b]
Former-commit-id: d1f23b8dee
2012-05-02 09:42:50 -05:00
Max Schenkelberg
a608dcb59b Issue Fixed url path issue for joining late
Change-Id: Ibf11c6d12b93954aad6e3969fa9869e977d48de6

Former-commit-id: adabe413f6 [formerly 9879fcd8733798a96026b3459d66f5f9e757e182]
Former-commit-id: 0326936e85
2012-05-02 09:25:44 -05:00
Max Schenkelberg
878de45ee6 Issue Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]
Former-commit-id: e3d6962fe6
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: 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]
Former-commit-id: 7b75b781ad
2012-05-01 18:31:09 -05:00
Steve Harris
a28d70b5c5 12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 8485b90ff8
2012-05-01 18:06:13 -05:00
Nate Jensen
e89143161c Issue cleanup
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691

Former-commit-id: 9a992aab78 [formerly 2165fb7d4b1e2743110f647797b8f6017fc0a86c]
Former-commit-id: 0b6b92c9ff
2012-05-01 17:33:55 -05:00
Matt Nash
5d3c2686cd Issue clean up group code
Former-commit-id: ae7b40634e [formerly aad6d7178694bfe9b42171729b4185e65429a515]
Former-commit-id: 8791b7329a
2012-05-01 16:14:33 -05:00
Max Schenkelberg
0b5623654a Issue Got joining late working to load data participants don't have
Change-Id: I7c27e584b3b7f7331708689acee7f1b62fefe0eb

Former-commit-id: edacf7a4b3 [formerly ceabfd385103380f99bed2eaa4470cfbcb70cef9]
Former-commit-id: 4b8f81dbcb
2012-05-01 15:51:15 -05:00
Matt Nash
529444c746 Issue fix icons
Former-commit-id: fd515ad766 [formerly 6b6ef0c250f895f20e43a5b596be7189d8bc9d5f]
Former-commit-id: 9764210b93
2012-05-01 15:07:46 -05:00
Matt Nash
7a89fa8342 Issue problem where the file is not there and null is returned
Former-commit-id: cef6bd81a8 [formerly 41eb0413a8c68104532d4f302c4bed07a572b430]
Former-commit-id: 1872503cd8
2012-05-01 11:55:12 -05:00
Matt Nash
f121499f7a Issue aliasing works on tabs and such now too
Former-commit-id: 88b20d568e [formerly 9dca1c46abc1d6eb4f81066c14a4b888f3c37b46]
Former-commit-id: 4a0b1e36ca
2012-05-01 10:28:20 -05:00
Matt Nash
b797bf94b9 Issue further aliasing
Former-commit-id: 603b114ae7 [formerly 066671debfaf52427cc0584513edd11f6cf10689]
Former-commit-id: efd6485647
2012-04-30 17:28:01 -05:00
Matt Nash
77e3b905b0 Issue aliasing for group view
Former-commit-id: cb6aa40f42 [formerly aa42c1600b675412a5ee73a7e2da48602f05e10f]
Former-commit-id: 49bda84329
2012-04-30 16:45:35 -05:00
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