Nate Jensen
d4ba003ce0
Merge "Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session"." into 11-Collaboration
...
Former-commit-id: 8eb5665591
[formerly 34be3aaf6ea41ae8366d072723c3beb8151d1f84]
Former-commit-id: ac95fde3e5
2012-05-29 17:23:56 -05:00
Max Schenkelberg
8f377d3fb8
Issue #665 fixed bug with lat/lon vs pixel space for inspect
...
Change-Id: I038f9fec306e81725932ed5a17db885d251fed73
Former-commit-id: 1934bfa28c
[formerly 2be9620b338140fa27efba037d0cc321558bec62]
Former-commit-id: 76e99b4037
2012-05-29 15:15:05 -05:00
Max Schenkelberg
2cde39bc63
Issue #665 Made MPEGageResource use bulk rendering for strings and points for faster shared display rendering
...
Change-Id: I7a734784895d406ba769f558d4b321dfe3b8dbf9
Former-commit-id: 34a71dbee8
[formerly 18ca6f058d810781d93ea2d0bad9b2daa161fa3a]
Former-commit-id: c28a586d84
2012-05-29 15:00:42 -05:00
Bryan Kowal
0692230344
Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session".
...
Change-Id: Ie7e419bc47a2451eef5a25456fa767fc0156cc27
Former-commit-id: 14386ad818
[formerly 904a05e94386bd9d71a357e374ed3c757dc08016]
Former-commit-id: 25b2361923
2012-05-29 13:06:36 -05:00
Max Schenkelberg
5e8f886155
Issue #663 Removed references from ISerializableObject file
...
Former-commit-id: 76db032da7
[formerly 95da08aeabcc06f5ab46963cf4be4fb54457ff43]
Former-commit-id: fec288d4bd
2012-05-29 09:10:48 -05:00
Max Schenkelberg
11cb7bafb0
Issue #663 Fixed key binding issue, added cursor icon change when tool is selected
...
Change-Id: I9040da01355e64208ef54ccc6d8452ab57c9d3c5
Former-commit-id: 8c9c33ef9f
[formerly 5c240b5224ee93a36c5e05ddb15b373645222081]
Former-commit-id: 2058b7f0ea
2012-05-25 16:28:53 -05:00
Max Schenkelberg
d380895c56
Issue #663 Commented out drawing tool loading from group view and removed transfer role code
...
Change-Id: Ie910b19d477a1281231486bc8f96083ea7598a0b
Former-commit-id: 7bae56e8b5
[formerly 209d658e61d7b595d4effbfb87f65b87a5f196a9]
Former-commit-id: 854f41eb7f
2012-05-25 15:24:18 -05:00
Max Schenkelberg
dec7ce3551
Issue #663 Fixed clearing of display in D2D, resources can now be specified to be readded when unloaded during a session
...
Change-Id: I77b448ad4af60bf8d1afb3b50a5575ad82c4ae22
Former-commit-id: 8773dbdf62
[formerly d15821c57b49090863e9c22455d06c94da6fcaf9]
Former-commit-id: f6f2e1a4fb
2012-05-25 14:37:25 -05:00
Bryan Kowal
0211167d87
Issue #595 - openfire will now supply the httpd-collaboration port when a user successfully logs in. The port will be stored as part of the CAVE configuration. Change-Id: I76c8ce94ef140d8bb8b608dd07b59b89f1607d16
...
Change-Id: I5350ed2293b78a743fc0e5b4cd9bcd6f02eafbd1
Former-commit-id: a808bc245f
[formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]
Former-commit-id: 0f0bab6e54
2012-05-24 16:51:35 -05:00
Max Schenkelberg
696c2f4894
Issue #239 Got IColormapShadedShapeExtension implemented
...
Change-Id: Idb2b5a894530b739cd8b00f8f3b294f186d5143f
Former-commit-id: ae8236aa21
[formerly 6ddfe51e93d62145678d87ed3db208e90d3146e3]
Former-commit-id: 1c11323103
2012-05-23 09:14:21 -05:00
Max Schenkelberg
7b7e708092
Issue #239 Moved initialization code in GFE resources so recycle() works properly
...
Change-Id: I3a4e1f18a7246af504a6d1ce791bd94ab1f721d5
Former-commit-id: e81a9ee935
[formerly 1f092691e6e43bd8f6d10c2b8fab0a68eca38992]
Former-commit-id: 52a78af98c
2012-05-22 09:56:27 -05:00
Steve Harris
ce0422a34a
12.5.1-9 baseline
...
Former-commit-id: 8f3c9ebfb7
[formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]
Former-commit-id: 1f542697cb
2012-05-21 17:48:55 -05:00
Max Schenkelberg
084511ab6a
Issue #239 Cleaned up DispatchingWireframeShape code to send world coordinates separate from pixel coordinates
...
Change-Id: I1c7eb9b19ea8d816eb3e81901ecf5574877a5212
Former-commit-id: 9c1f14a0a6
[formerly 0a3d69b5bb8ca31d8db8148225f7e1ef85778919]
Former-commit-id: 2bc9a18957
2012-05-21 14:57:37 -05:00
Matt Nash
b6134f482f
Issue #642 match longest keyword
...
Former-commit-id: 94746c169e
[formerly 1dc9f3ad1f5c68dbe6a515eb990f23a8f20139d6]
Former-commit-id: eabc2032b4
2012-05-21 11:12:52 -05:00
Matt Nash
a438a35943
Issue #642 change font changer to FontDialog
...
Former-commit-id: f1301645e7
[formerly 8f4c3b9d9769bf34e7c4744dd80b603d445b6270]
Former-commit-id: 8b71b3058b
2012-05-21 10:39:03 -05:00
Matt Nash
bb957ec167
Issue #642 fix for finding double instances of words
...
Former-commit-id: 253b5fe2e8
[formerly 5d3001a8bdd5ab6b89efe54e7d3c6b3266e880ec]
Former-commit-id: bed5ec6876
2012-05-21 08:43:37 -05:00
Max Schenkelberg
c5fe70a6b0
Issue #239 Added support for rectangle drawing
...
Change-Id: I38c086a9a80652ce9e5da3ed4db1776877cc4635
Former-commit-id: da7b6ceb27
[formerly e4417a1f938ceddcc4d44d45af60b0f2d1b580fd]
Former-commit-id: cb4b153cad
2012-05-18 14:17:43 -05:00
Max Schenkelberg
c0a5e5bc81
Issue #239 Added drawing of lines so baslines would work
...
Change-Id: Id8ca06b2fc38ab0db5b167d33aeae5af974c30cc
Former-commit-id: 80828b8441
[formerly 063e7ac34a6b5a6c43cf7927a1a2980f79efb24c]
Former-commit-id: 0c92536bb3
2012-05-18 12:34:00 -05:00
Matt Nash
92765ecd1c
Issue #642 remove debugging code
...
Former-commit-id: ca6731acfc
[formerly 23669c3d390b3cc0aeb6228247ea0b0512bdfb80]
Former-commit-id: 385d7e3d7f
2012-05-18 11:02:27 -05:00
Matt Nash
3a3d320eb4
Issue #642 add ability for keywords in collaboration
...
Former-commit-id: d8e64039dc
[formerly 098e51414d1c148e55e6dd17b0f7b8d579f204fd]
Former-commit-id: 4e9b3ca786
2012-05-18 10:49:15 -05:00
Max Schenkelberg
f28f51f5a5
Issue #239 Added circle drawing, fixed jumpiness issues
...
Change-Id: I3003fc4fd132dde2108ada5cb5ad1152bb8b4566
Former-commit-id: 4add8c7c8e
[formerly fbf7ea43b20bff1c97dc38265d9dfae091e5dcb4]
Former-commit-id: ab314d0333
2012-05-17 16:07:23 -05:00
Max Schenkelberg
f6e74cc027
Issue #639 Cleaned up chat logging a bit
...
Change-Id: Iba4e2a935dfdca9518ac0184fc53acfad2306c32
Former-commit-id: d9c1499311
[formerly 19f338e41a81b50e57fe13b969c2b3a80f78ace0]
Former-commit-id: dce9ee1905
2012-05-17 13:58:33 -05:00
Brad Gonzales
06ebcfb533
Issue #639 added collaboration chat logging to localization.
...
Former-commit-id: 5935fd7091
[formerly bf4e1e674e7461871ce19fe7ea74da7ef4db48ae]
Former-commit-id: 892b6d83e5
2012-05-17 12:13:30 -05:00
Steve Harris
c452cce633
12.5.1-6 baseline
...
Former-commit-id: 24474489f9
[formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]
Former-commit-id: fa87dc6cf1
2012-05-16 16:41:22 -05:00
Max Schenkelberg
b764f03353
Issue #239 Added IShadedShape capability to remote target
...
Change-Id: I9616a1dff3ba7f73ed1382027dd725928587efad
Former-commit-id: 1ca2a9ce13
[formerly a2f8c091c08d47d7b8354071e0ceedc978168a29]
Former-commit-id: 0e5fd5cd15
2012-05-16 15:01:41 -05:00
Brad Gonzales
4b30085d9d
Issue #628 Nate's additional ncep pgen changes including PGEN's SymbolSetElement.java
...
Former-commit-id: 50eba2317a
[formerly 23e99f88390a6865e0ba5d449402b4ef2febbd34]
Former-commit-id: d7babbaebd
2012-05-16 10:12:27 -05:00
Matt Nash
9c36b710dc
Issue #440 username/password logging fixes, synchronize all times collaboratorShapes are manipulated
...
Former-commit-id: f1ea85ea44
[formerly 9255532085a1d43955345092d567e04222bbb06d]
Former-commit-id: 096b526e7a
2012-05-15 16:08:29 -05:00
Max Schenkelberg
5f2e758c25
Issue #588 Added canvas size to construction of editor
...
Change-Id: I72a634c2b15f654474557ec9824fa11550a6a2a7
Former-commit-id: f3ec9008f2
[formerly 82ef715dda2308686870e18aca6184ea2f0f71f2]
Former-commit-id: f3277ca807
2012-05-14 17:13:54 -05:00
Max Schenkelberg
900b55f292
Issue #588 Fixed bug with participant resizing window
...
Change-Id: I9a4fca76fdc0f81a8f55135402efcf187c684915
Former-commit-id: 7d02ae3404
[formerly c31c62f94799322fc5811c8f38afdb01c9c49c2c]
Former-commit-id: a709f9a491
2012-05-14 16:35:28 -05:00
Matt Nash
d88b7e7c33
Issue #444 minor cleanup
...
Former-commit-id: 1c7f6861e4
[formerly b601ea017e09c9fcd74e974d3f5ce2f0104a75fc]
Former-commit-id: ba73d47044
2012-05-14 15:25:03 -05:00
Max Schenkelberg
2204422d14
Issue #588 Made Canvas sizes stay in sync to fix text size issues
...
Change-Id: I1a9bff16168eda355850d47983fe479853e2e907
Former-commit-id: fdbd626715
[formerly 8b6bb90e6ba0f1b21e78594ff3b3604924662138]
Former-commit-id: c7ea0894bb
2012-05-14 12:38:19 -05:00
Matt Nash
fc9a902f04
Issue #444 add further capability of transferring session leader
...
Former-commit-id: 746fd1464c
[formerly 49a19d4b6a56252e4e17f4563cdd4f94ef0ab3cc]
Former-commit-id: b2621eb89e
2012-05-11 16:29:27 -05:00
Nate Jensen
a72d2b528f
Issue #427 clean up telestrator rsc on session exit
...
Change-Id: I14b5603f480e15537aa42eb2d8e5eebad87d09de
Former-commit-id: 46e165ef69
[formerly 9908d7d3de10ac919c550995ce0ba766f67096ee]
Former-commit-id: 56a8c1f937
2012-05-11 16:09:29 -05:00
Nate Jensen
e5a84290de
Issue #427 cleanup properly on exiting session
...
Change-Id: I4779ce49f9a9ee6d64cd908e04b007d808cb3bc6
Former-commit-id: e68e75d735
[formerly c42b670e619beaba9b22bfa3bbdc6e1f0b9da075]
Former-commit-id: 057b5eb3b9
2012-05-11 15:30:06 -05:00
Max Schenkelberg
85f2900333
Issue #588 fixed resizing of participant canvas
...
Change-Id: I17e0ce448682291948af7339fa8982e21cf3b220
Former-commit-id: d500f49208
[formerly 544c1226d807308c06037f98cad6ca2b037d69ce]
Former-commit-id: 21b7735e92
2012-05-11 14:41:11 -05:00
Nate Jensen
571eca8d57
Issue #443 improve zlib compression
...
Change-Id: If1ce4e4288ad45276d11a4d9a3bf5dc8435352e4
Former-commit-id: 105d703fbf
[formerly 5203a659ec0aaea45cbf281544b22b23b54a51d8]
Former-commit-id: 1838de6993
2012-05-11 14:04:41 -05:00
Nate Jensen
c55862a1ab
Issue #590 fix issue when exiting GFE
...
Change-Id: I6dd72855e80a49be5735f9d805fbc42e42c7f157
Former-commit-id: 75754040cb
[formerly 258fead57d05a908b32b0b74a2e34ab19be0947f]
Former-commit-id: c92f9ee705
2012-05-11 13:58:46 -05:00
Matt Nash
e19b5cb75c
Issue #440 fix login dialog not popping up
...
Former-commit-id: fa89b0cf6e
[formerly 8b9c87c5e4fe04405ce1fa3cb86eeaed14e3aadb]
Former-commit-id: a8c5c7b3ca
2012-05-11 12:04:56 -05:00
Nate Jensen
7be5ef8528
Issue #590 Fix rsc so it can be recycled
...
Change-Id: I3cddf5d67c2e5dfb52380529f703a0d9558d8916
Former-commit-id: 798463a4cf
[formerly cd52bfbeb593a4b1891f4df7f7ae73c7193504d0]
Former-commit-id: 78c1298085
2012-05-11 10:04:36 -05:00
Max Schenkelberg
d22b403f48
Issue #588 Got crude string rendering working. Doesn't quite look good if canvas bounds are not same size and legends are not handled specially
...
Change-Id: I8f3d0560869178598f160fb2e7914c45f656a860
Former-commit-id: 31243a9dfe
[formerly 24b673fcc45a4da27ac349bdebf8b48f6405607b]
Former-commit-id: 074b9aba8c
2012-05-10 18:03:00 -05:00
Matt Nash
4f4b4a0e23
Issue #440 fix multiple login dialogs when trying to click 'Cancel'
...
Former-commit-id: 62ddaa6fa8
[formerly e2c0426f38c59954e1e57d9dddce2bd93f54f36f]
Former-commit-id: 4558d1bd41
2012-05-10 11:37:52 -05:00
Matt Nash
0f0f49249b
Issue #444 fix rename
...
Former-commit-id: 267c83294d
[formerly fc9ed4eb5ee470d309fea6af74d254728877c531]
Former-commit-id: c05e57d3d2
2012-05-10 10:09:48 -05:00
Matt Nash
ef6345493d
Isssue #444 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 #429 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 #588 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 #448 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 #448 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 #588 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
98447412f8
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: 092efd6072
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]
Former-commit-id: 31b3e87ffa
2012-05-09 13:19:47 -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