Matt Nash
d5871d8580
Issue #448 aliasing fixes to remove dups
...
Former-commit-id: bd51ed2a52207ee2592e207ee2592ed0090d22eb
2012-05-09 15:23:32 -05:00
Matt Nash
bd5dd0f638
Issue #448 clean up aliasing
...
Former-commit-id: 25eefc37092d5fb5c15e2d5fb5c15e8c8c8e7567
2012-05-09 15:06:21 -05:00
Max Schenkelberg
82298cb03b
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 1f5abc6e2078e1bd2c6278e1bd2c6206ee0bbf6f
2012-05-09 15:02:30 -05:00
Steve Harris
fc70139990
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: 31b3e87ffa092efd6072092efd6072d7f7c26582
2012-05-09 13:19:47 -05:00
Steve Harris
bcc12e03ed
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: 58037cb5d127bc36981827bc369818572e1bb476
2012-05-09 13:14:00 -05:00
Nate Jensen
617a1185a3
Issue #440 add listeners before connecting and fix populateGroups()
...
Change-Id: Ief028f153954484666d01f52b91da9c97490ef94
Former-commit-id: cb3527bca8f59d388be1f59d388be14152290029
2012-05-08 17:55:22 -05:00
Matt Nash
6878586deb
Issue #440 fix spooky mistake of plugin customization file
...
Former-commit-id: a32f40ce0a32552c7aca32552c7acae2388a1cdb
2012-05-08 16:11:43 -05:00
Nate Jensen
38576af210
Issue #440 fix duplicate groups
...
Change-Id: I3bed636fa06de47d3dbdceb210284e624b626dae
Former-commit-id: 51971ac3055b0f4311315b0f431131f4be87da62
2012-05-08 15:55:06 -05:00
Nate Jensen
a354c92edd
Issue #440 fix errors
...
Change-Id: Ic4d3235727136d38a410f6e0452674aaaf9fab3b
Former-commit-id: 6c057c9d7accccaf2d28ccccaf2d28880604feed
2012-05-08 14:37:24 -05:00
Matt Nash
9de9df2336
Issue #440 remove duplicate roster/presence classes
...
Former-commit-id: f91d457e5d01dc5ddbb301dc5ddbb38ab1597db7
2012-05-08 12:57:12 -05:00
Matt Nash
afe837e8eb
Issue #440 Login dialog off the UI thread
...
Former-commit-id: 3f53ab4a891b12a276311b12a27631ca4c0788f1
2012-05-08 10:58:16 -05:00
Steve Harris
c1bc408f84
12.5.1-2 baseline
...
Former-commit-id: b36c69cc6784d191e7b684d191e7b6ac708c050d
2012-05-03 19:17:13 -05:00
Max Schenkelberg
a1436f6b0a
Issue #587 Fixed colorbar border flicker, made area have aspect ratio of data provider
...
Change-Id: If3a768ee5b61af7459ff8d22beab3270111f5286
Former-commit-id: 3d15400eb7af162bedf5af162bedf57814fca6e9
2012-05-03 15:54:22 -05:00
Max Schenkelberg
120415f663
Issue #587 Got colorbars rendering properly
...
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103
Former-commit-id: c81c225a6ed4c10e5548d4c10e55480f6240eaea
2012-05-03 13:07:43 -05:00
Max Schenkelberg
a0d7197b99
Issue #584 Got draw point calls working
...
Change-Id: I80f9061647a96e66acf70fb5c22aefb8916979b0
Former-commit-id: 5d9da5e1ef65f8b1819465f8b18194eb948b3dc1
2012-05-02 16:40:55 -05:00
Matt Nash
6a8c6594ea
Issue #429 add capability for session leader to change other's colors
...
Former-commit-id: c746441432817bd297c8817bd297c8dee26f4fd5
2012-05-02 14:36:58 -05:00
Matt Nash
378772408e
Issue #437 fix change status, remove double posting
...
Former-commit-id: 3c8143e8bce9f75e7f50e9f75e7f508bb1342bfb
2012-05-02 14:36:58 -05:00
Max Schenkelberg
918a417e51
Issue #239 Fixed bug with mosaic being up and starting a session
...
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01
Former-commit-id: b82eb49055a045f6f3b9a045f6f3b93ffb18b767
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: d1f23b8dee167767dcbc167767dcbce1213ccea9
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: 0326936e85adabe413f6adabe413f669cb2ff5ee
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: e3d6962fe63fe183277b3fe183277b2ef208b263
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: 7b75b781ad2ed72496132ed72496134ec294b525
2012-05-01 18:31:09 -05:00
Steve Harris
7fa9dbd5fb
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff89f8cb727a59f8cb727a54bfbdad17d
2012-05-01 18:06:13 -05:00
Nate Jensen
dd1cb83f03
Issue #427 cleanup
...
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691
Former-commit-id: 0b6b92c9ff9a992aab789a992aab788bed608bc5
2012-05-01 17:33:55 -05:00
Matt Nash
543c9ae9cb
Issue #448 clean up group code
...
Former-commit-id: 8791b7329aae7b40634eae7b40634e9ca693dd1e
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: 4b8f81dbcbedacf7a4b3edacf7a4b3c72650baef
2012-05-01 15:51:15 -05:00
Matt Nash
c3b72c3873
Issue #448 fix icons
...
Former-commit-id: 9764210b93fd515ad766fd515ad7667b96d1e9bc
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: 1872503cd8cef6bd81a8cef6bd81a827ea55dad3
2012-05-01 11:55:12 -05:00
Matt Nash
2966485e68
Issue #448 aliasing works on tabs and such now too
...
Former-commit-id: 4a0b1e36ca88b20d568e88b20d568e8a0f32b639
2012-05-01 10:28:20 -05:00
Matt Nash
cb79489dcd
Issue #448 further aliasing
...
Former-commit-id: efd6485647603b114ae7603b114ae79c6768f254
2012-04-30 17:28:01 -05:00
Matt Nash
c270c99caa
Issue #448 aliasing for group view
...
Former-commit-id: 49bda84329cb6aa40f42cb6aa40f428ae54b2e0c
2012-04-30 16:45:35 -05:00
Nate Jensen
4fc32a8178
Issue #427 cleanup
...
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1
Former-commit-id: eac55b75876a034283b56a034283b5c958d3a471
2012-04-30 15:49:44 -05:00
Nate Jensen
2df5c95e6c
Issue #427 remove extraneous event buses
...
Change-Id: I958de58ba963609ada80529195d024077a901a0e
Former-commit-id: bfd45d703f7aa1e562d87aa1e562d856ae7eab86
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: 60aac079629e2cf73f7a9e2cf73f7a5e5e362f39
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: 5b7ecea8661b7473572f1b7473572f42a12fa7a5
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: 84e3c4704eed878bc13ded878bc13ded83cb8a52
2012-04-30 12:45:30 -05:00
Nate Jensen
e6d8ea11ba
Issue #427 remove dead code
...
Change-Id: I36e3f77f8c0176b72762abc311d8e4e3eab22e0e
Former-commit-id: bba6d5e400d5a3acc97bd5a3acc97b6de861e9b5
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: 9454cbd1b9e8f1c0159ce8f1c0159cd952fe084a
2012-04-27 16:12:48 -05:00
Nate Jensen
281f9b3232
Issue #427 better part listeners
...
Change-Id: I0787fdc7a086c87228e9f38ce85e23dd9edc4bd2
Former-commit-id: 866acb24b2855ec5dd4d855ec5dd4dcafa23c9d2
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: 00d11cdeaacc313ebcaccc313ebcac0a3a7bfba2
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: 98787936184aadd41fde4aadd41fde0ff2041959
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: 292374ce21c28bfaddeec28bfaddee6497272c1d
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: b11df888d3349adaeedd349adaeeddc33a392a8c
2012-04-27 12:08:29 -05:00
Max Schenkelberg
f4cd5ebfef
Issue #239 Added render frame merging capability
...
Change-Id: Ie16e650693de6e07453357740b3c2bae21bd999d
Former-commit-id: df07bff0bcff0827b51dff0827b51d4175affdc7
2012-04-27 11:57:53 -05:00
Matt Nash
18e07972ca
Issue #429 add better notification to chat
...
Former-commit-id: 3b2fdaa579e0d11ae8b1e0d11ae8b1590862b77d
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: 16de1dbafe25201fcbad25201fcbadc1983d295d
2012-04-27 10:08:27 -05:00
Matt Nash
1e27e69e3d
Issue #448 remove listener to help prevent exceptions
...
Former-commit-id: b69e13d79529b39a1df429b39a1df4331adad3a3
2012-04-26 09:17:27 -05:00
Max Schenkelberg
a31ad22113
Added network logging for http traffic
...
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25
Former-commit-id: f74b6b4a93a912786429a9127864292cc5794428
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: 04ab5d619b526abfd36e526abfd36e8592a9a50d
2012-04-25 17:08:21 -05:00
Nate Jensen
74a4671d33
Issue #427 remove sysouts
...
Change-Id: I82dd5bcd8e7eb20afcf516c0b8d33e37d72d45db
Former-commit-id: e17dad1b54ed4303158ced4303158c1ff944fc2d
2012-04-25 16:56:19 -05:00
