Commit graph

1277 commits

Author SHA1 Message Date
Nate Jensen
94661e501c Issue #590 fix issue when exiting GFE
Change-Id: I6dd72855e80a49be5735f9d805fbc42e42c7f157

Former-commit-id: 75754040cb [formerly 75754040cb [formerly 258fead57d05a908b32b0b74a2e34ab19be0947f]]
Former-commit-id: c92f9ee705
Former-commit-id: c55862a1ab
2012-05-11 13:58:46 -05:00
Matt Nash
aa59e0a555 Issue #440 fix login dialog not popping up
Former-commit-id: fa89b0cf6e [formerly fa89b0cf6e [formerly 8b9c87c5e4fe04405ce1fa3cb86eeaed14e3aadb]]
Former-commit-id: a8c5c7b3ca
Former-commit-id: e19b5cb75c
2012-05-11 12:04:56 -05:00
Nate Jensen
814be4f5c8 Issue #590 Fix rsc so it can be recycled
Change-Id: I3cddf5d67c2e5dfb52380529f703a0d9558d8916

Former-commit-id: 798463a4cf [formerly 798463a4cf [formerly cd52bfbeb593a4b1891f4df7f7ae73c7193504d0]]
Former-commit-id: 78c1298085
Former-commit-id: 7be5ef8528
2012-05-11 10:04:36 -05:00
Max Schenkelberg
fc471eb557 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 31243a9dfe [formerly 24b673fcc45a4da27ac349bdebf8b48f6405607b]]
Former-commit-id: 074b9aba8c
Former-commit-id: d22b403f48
2012-05-10 18:03:00 -05:00
Matt Nash
8873bc3aa9 Issue #440 fix multiple login dialogs when trying to click 'Cancel'
Former-commit-id: 62ddaa6fa8 [formerly 62ddaa6fa8 [formerly e2c0426f38c59954e1e57d9dddce2bd93f54f36f]]
Former-commit-id: 4558d1bd41
Former-commit-id: 4f4b4a0e23
2012-05-10 11:37:52 -05:00
Matt Nash
d417baed67 Issue #444 fix rename
Former-commit-id: 267c83294d [formerly 267c83294d [formerly fc9ed4eb5ee470d309fea6af74d254728877c531]]
Former-commit-id: c05e57d3d2
Former-commit-id: 0f0f49249b
2012-05-10 10:09:48 -05:00
Matt Nash
d0621994c8 Isssue #444 rename project to better match structure
Former-commit-id: 8caf649518 [formerly 8caf649518 [formerly e644591a18b0a145c7db2151ebf06a17326d8572]]
Former-commit-id: ba377eae5c
Former-commit-id: ef6345493d
2012-05-10 10:06:06 -05:00
Matt Nash
a524ac4d99 Issue #429 clean up telestrator
Former-commit-id: d88d5ab229 [formerly d88d5ab229 [formerly 55a10673d6585098caf45aa4f19f0add42aaf4a5]]
Former-commit-id: 3cd13e285c
Former-commit-id: 9612df2217
2012-05-10 09:18:41 -05:00
Max Schenkelberg
baff521c40 Issue #588 Fix VizPainter.py bug from previous commit
Change-Id: I58c217f5abcefd637097bd5c9c6824015ea082b7

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

Former-commit-id: 78e1bd2c62 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 3ca8ca6f01
2012-05-09 15:02:30 -05:00
Steve Harris
7ee04eb560 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 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
2012-05-09 13:19:47 -05:00
Steve Harris
7978d3b640 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 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 58037cb5d1
Former-commit-id: 63ea8599d7
2012-05-09 13:14:00 -05:00
Nate Jensen
59e53aeec2 Issue #440 add listeners before connecting and fix populateGroups()
Change-Id: Ief028f153954484666d01f52b91da9c97490ef94

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

Former-commit-id: 5b0f431131 [formerly 5b0f431131 [formerly cbc0b8ba9936c6cad874e22e24fe38acb7855a3f]]
Former-commit-id: 51971ac305
Former-commit-id: 4a1d2d906e
2012-05-08 15:55:06 -05:00
Nate Jensen
7a5d0d7b53 Issue #440 fix errors
Change-Id: Ic4d3235727136d38a410f6e0452674aaaf9fab3b

Former-commit-id: ccccaf2d28 [formerly ccccaf2d28 [formerly dcbaf62a1edc168f0414078dc61323b7db32c9ee]]
Former-commit-id: 6c057c9d7a
Former-commit-id: 13d56f04f0
2012-05-08 14:37:24 -05:00
Matt Nash
a5caa90acf Issue #440 remove duplicate roster/presence classes
Former-commit-id: 01dc5ddbb3 [formerly 01dc5ddbb3 [formerly cc3031e4d2142f79d935e441ed0bed9824b54251]]
Former-commit-id: f91d457e5d
Former-commit-id: 76e037485f
2012-05-08 12:57:12 -05:00
Matt Nash
b9b4f9681c Issue #440 Login dialog off the UI thread
Former-commit-id: 1b12a27631 [formerly 1b12a27631 [formerly d37f9b0ee38028c3995ed76ef69385ee3b4a152f]]
Former-commit-id: 3f53ab4a89
Former-commit-id: 408263e5a7
2012-05-08 10:58:16 -05:00
Steve Harris
377ae76413 12.5.1-2 baseline
Former-commit-id: 84d191e7b6 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: b36c69cc67
Former-commit-id: a821111fbf
2012-05-03 19:17:13 -05:00
Max Schenkelberg
d57034bbff Issue #587 Fixed colorbar border flicker, made area have aspect ratio of data provider
Change-Id: If3a768ee5b61af7459ff8d22beab3270111f5286

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

Former-commit-id: d4c10e5548 [formerly d4c10e5548 [formerly 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe]]
Former-commit-id: c81c225a6e
Former-commit-id: c6edfad263
2012-05-03 13:07:43 -05:00
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