Max Schenkelberg
|
6163af0b98
|
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: 3682b81e6b [formerly 5fca70461f] [formerly 31243a9dfe] [formerly 3682b81e6b [formerly 5fca70461f] [formerly 31243a9dfe] [formerly 074b9aba8c [formerly 31243a9dfe [formerly 24b673fcc45a4da27ac349bdebf8b48f6405607b]]]]
Former-commit-id: 074b9aba8c
Former-commit-id: d37d5bafb5 [formerly d2d6a4d1eb] [formerly 43b689e5c63e3b6456373be48d379fad297a3633 [formerly d22b403f48]]
Former-commit-id: 398ffadb9fe15e12cd189ef2b9e89a167f43b5b4 [formerly fc471eb557]
Former-commit-id: 0f3d4cf0e4
|
2012-05-10 18:03:00 -05:00 |
|
Matt Nash
|
501cb6aa64
|
Issue #440 fix multiple login dialogs when trying to click 'Cancel'
Former-commit-id: c50fc8b423 [formerly cfcfb84668] [formerly 62ddaa6fa8] [formerly c50fc8b423 [formerly cfcfb84668] [formerly 62ddaa6fa8] [formerly 4558d1bd41 [formerly 62ddaa6fa8 [formerly e2c0426f38c59954e1e57d9dddce2bd93f54f36f]]]]
Former-commit-id: 4558d1bd41
Former-commit-id: c5e62bc5db [formerly 88bfafe9f2] [formerly c838967dca55840a49c7aff0c256a0eab70f03c2 [formerly 4f4b4a0e23]]
Former-commit-id: da29d9efb3f41188c7238725352825689403c894 [formerly 8873bc3aa9]
Former-commit-id: 41520eb43f
|
2012-05-10 11:37:52 -05:00 |
|
Matt Nash
|
10d2abcd38
|
Issue #444 fix rename
Former-commit-id: 3d99f78745 [formerly 44d23c36e7] [formerly 267c83294d] [formerly 3d99f78745 [formerly 44d23c36e7] [formerly 267c83294d] [formerly c05e57d3d2 [formerly 267c83294d [formerly fc9ed4eb5ee470d309fea6af74d254728877c531]]]]
Former-commit-id: c05e57d3d2
Former-commit-id: b1957cdd66 [formerly 87250a5585] [formerly 844e8d8c5aeedfa2bbbb79ce8e611ce8f0bd6682 [formerly 0f0f49249b]]
Former-commit-id: ca67a0fc12061121348ed7aebf2378ba5c358d41 [formerly d417baed67]
Former-commit-id: eb4dacb7a6
|
2012-05-10 10:09:48 -05:00 |
|
Matt Nash
|
71b7191735
|
Isssue #444 rename project to better match structure
Former-commit-id: 4a752e44b1 [formerly 4733741c0c] [formerly 8caf649518] [formerly 4a752e44b1 [formerly 4733741c0c] [formerly 8caf649518] [formerly ba377eae5c [formerly 8caf649518 [formerly e644591a18b0a145c7db2151ebf06a17326d8572]]]]
Former-commit-id: ba377eae5c
Former-commit-id: 4b7115440c [formerly 9e7f6df610] [formerly 500cc73c98436cc0e93295639d2c35f68881564c [formerly ef6345493d]]
Former-commit-id: 69cf24a3ec64ac76c7d8fbffb4f27ef14455b98a [formerly d0621994c8]
Former-commit-id: e9e6782125
|
2012-05-10 10:06:06 -05:00 |
|
Matt Nash
|
c0ee3fb6af
|
Issue #429 clean up telestrator
Former-commit-id: 66055c4d7a [formerly ccb859576c] [formerly d88d5ab229] [formerly 66055c4d7a [formerly ccb859576c] [formerly d88d5ab229] [formerly 3cd13e285c [formerly d88d5ab229 [formerly 55a10673d6585098caf45aa4f19f0add42aaf4a5]]]]
Former-commit-id: 3cd13e285c
Former-commit-id: 7e273f834d [formerly 4eda4ab762] [formerly 31d654a1c7477c74d429f93884414426f541af1b [formerly 9612df2217]]
Former-commit-id: 6508de686a348da928a89ee27e71048327640bee [formerly a524ac4d99]
Former-commit-id: ec77c5d583
|
2012-05-10 09:18:41 -05:00 |
|
Max Schenkelberg
|
2f174128da
|
Issue #588 Fix VizPainter.py bug from previous commit
Change-Id: I58c217f5abcefd637097bd5c9c6824015ea082b7
Former-commit-id: 8f74ccc2b8 [formerly c3ec79ef6c] [formerly c2e1e83033] [formerly 8f74ccc2b8 [formerly c3ec79ef6c] [formerly c2e1e83033] [formerly ea2151970a [formerly c2e1e83033 [formerly 0e70b319d47cd198b71426789671efeaa4ddb9f7]]]]
Former-commit-id: ea2151970a
Former-commit-id: 29c1030f74 [formerly 0f3aae5fd7] [formerly d49721bccbaf90673aa998f0da0bdca12a7f79d9 [formerly aa5f1d12db]]
Former-commit-id: 16eae6ac05b012b2723b3edef8c2d2fa8c12f99e [formerly baff521c40]
Former-commit-id: 6a11940974
|
2012-05-09 15:38:03 -05:00 |
|
Matt Nash
|
adb8a2962e
|
Issue #448 aliasing fixes to remove dups
Former-commit-id: d5871d8580 [formerly d0090d22eb] [formerly 207ee2592e] [formerly d5871d8580 [formerly d0090d22eb] [formerly 207ee2592e] [formerly bd51ed2a52 [formerly 207ee2592e [formerly 7135fd439b20ed6e20bf3102e2e10505a6628026]]]]
Former-commit-id: bd51ed2a52
Former-commit-id: dff0c8a5ec [formerly 18228ffa0b] [formerly 10515064d1db261ded8909afaa10f7e2c4049f74 [formerly 618cf9b1ad]]
Former-commit-id: 4a9e13ad0feb9932cf5cfe4af6ac12c6f8bcb187 [formerly b018e18fdc]
Former-commit-id: 9e1d2e5858
|
2012-05-09 15:23:32 -05:00 |
|
Matt Nash
|
af9eb8859a
|
Issue #448 clean up aliasing
Former-commit-id: bd5dd0f638 [formerly 8c8c8e7567] [formerly 2d5fb5c15e] [formerly bd5dd0f638 [formerly 8c8c8e7567] [formerly 2d5fb5c15e] [formerly 25eefc3709 [formerly 2d5fb5c15e [formerly 526a596475e803251c6405142a5cd0c59c3d5809]]]]
Former-commit-id: 25eefc3709
Former-commit-id: a788dd26b0 [formerly 909d080746] [formerly df88d6bbae1043933fbaef0fda73c9e62993920f [formerly a5c11b2737]]
Former-commit-id: 4b3f5798a6bcdf32a51ee00db2189591219690ce [formerly 3f4c1898fd]
Former-commit-id: 5319b7d788
|
2012-05-09 15:06:21 -05:00 |
|
Max Schenkelberg
|
2d167af343
|
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 82298cb03b [formerly 06ee0bbf6f] [formerly 78e1bd2c62] [formerly 82298cb03b [formerly 06ee0bbf6f] [formerly 78e1bd2c62] [formerly 1f5abc6e20 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 985ee5a034 [formerly 2db836b296] [formerly 0465afe50a2e0abf332ee9d7e74c28a75a577f5d [formerly 3ca8ca6f01]]
Former-commit-id: ae5df9ba1774095dd47fab5b8b61888b552632fc [formerly 6cd18a09dc]
Former-commit-id: 5729c0acc5
|
2012-05-09 15:02:30 -05:00 |
|
Steve Harris
|
2f6ae50479
|
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: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: fe7ac96625 [formerly 53d2822329] [formerly 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]]
Former-commit-id: 3940ab38fea505f445ec4019600081324e15e68d [formerly 7ee04eb560]
Former-commit-id: d040b14742
|
2012-05-09 13:19:47 -05:00 |
|
Steve Harris
|
c76fddc7e4
|
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: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c [formerly 9c9e01dbda] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640]
Former-commit-id: 1d2ad9224a
|
2012-05-09 13:14:00 -05:00 |
|
Nate Jensen
|
72055722a5
|
Issue #440 add listeners before connecting and fix populateGroups()
Change-Id: Ief028f153954484666d01f52b91da9c97490ef94
Former-commit-id: 617a1185a3 [formerly 4152290029] [formerly f59d388be1] [formerly 617a1185a3 [formerly 4152290029] [formerly f59d388be1] [formerly cb3527bca8 [formerly f59d388be1 [formerly ea146f69c6fca818589587d37aace2afc75e7147]]]]
Former-commit-id: cb3527bca8
Former-commit-id: bc232148ec [formerly a5806f837b] [formerly fb05ec405f13f5fa593966daeeff87398f68990a [formerly 41ec3f0606]]
Former-commit-id: 713a3f089f510780a8a1964072fe6d143b83042b [formerly 59e53aeec2]
Former-commit-id: 7ca2d0ddce
|
2012-05-08 17:55:22 -05:00 |
|
Matt Nash
|
9a20abd3a6
|
Issue #440 fix spooky mistake of plugin customization file
Former-commit-id: 6878586deb [formerly e2388a1cdb] [formerly 32552c7aca] [formerly 6878586deb [formerly e2388a1cdb] [formerly 32552c7aca] [formerly a32f40ce0a [formerly 32552c7aca [formerly 24f52653518c0f0430ba13aea98b6b6d6ef1f494]]]]
Former-commit-id: a32f40ce0a
Former-commit-id: 7b62b89d1e [formerly 198ab99bb2] [formerly 23444601f4e3869b306daa1e156008766b1c792a [formerly 24d60a6d2e]]
Former-commit-id: f885e515af17647fbc1054cbcaec917c840773a0 [formerly 28a75a17cc]
Former-commit-id: c498777a09
|
2012-05-08 16:11:43 -05:00 |
|
Nate Jensen
|
d11f89443f
|
Issue #440 fix duplicate groups
Change-Id: I3bed636fa06de47d3dbdceb210284e624b626dae
Former-commit-id: 38576af210 [formerly f4be87da62] [formerly 5b0f431131] [formerly 38576af210 [formerly f4be87da62] [formerly 5b0f431131] [formerly 51971ac305 [formerly 5b0f431131 [formerly cbc0b8ba9936c6cad874e22e24fe38acb7855a3f]]]]
Former-commit-id: 51971ac305
Former-commit-id: 66845b067d [formerly cda9247d09] [formerly 9cb3ec68606a5110907ad0fe4ee1d2fcdd53423e [formerly 4a1d2d906e]]
Former-commit-id: 27ff3026113bcb9b2b695638f02fb22ea8e3021c [formerly ecca734ba7]
Former-commit-id: 75b33212f8
|
2012-05-08 15:55:06 -05:00 |
|
Nate Jensen
|
32ca529ed9
|
Issue #440 fix errors
Change-Id: Ic4d3235727136d38a410f6e0452674aaaf9fab3b
Former-commit-id: a354c92edd [formerly 880604feed] [formerly ccccaf2d28] [formerly a354c92edd [formerly 880604feed] [formerly ccccaf2d28] [formerly 6c057c9d7a [formerly ccccaf2d28 [formerly dcbaf62a1edc168f0414078dc61323b7db32c9ee]]]]
Former-commit-id: 6c057c9d7a
Former-commit-id: fddb2b1a47 [formerly a7fb88f5bf] [formerly bae21a022d30e8d755163549841930bd7ba18c2d [formerly 13d56f04f0]]
Former-commit-id: 938d47659b44834681b65b2c73ffa59ced2a43a4 [formerly 7a5d0d7b53]
Former-commit-id: dd08e8b239
|
2012-05-08 14:37:24 -05:00 |
|
Matt Nash
|
93751542e0
|
Issue #440 remove duplicate roster/presence classes
Former-commit-id: 9de9df2336 [formerly 8ab1597db7] [formerly 01dc5ddbb3] [formerly 9de9df2336 [formerly 8ab1597db7] [formerly 01dc5ddbb3] [formerly f91d457e5d [formerly 01dc5ddbb3 [formerly cc3031e4d2142f79d935e441ed0bed9824b54251]]]]
Former-commit-id: f91d457e5d
Former-commit-id: 3989c8702f [formerly b06f5e43dd] [formerly a6365585b90c465fb7ff92344a15d101f17ca6e3 [formerly 76e037485f]]
Former-commit-id: 84bd3597285bc65d5442edc902f4869b22d9b92b [formerly a5caa90acf]
Former-commit-id: 4385bf7334
|
2012-05-08 12:57:12 -05:00 |
|
Matt Nash
|
60f848aa37
|
Issue #440 Login dialog off the UI thread
Former-commit-id: afe837e8eb [formerly ca4c0788f1] [formerly 1b12a27631] [formerly afe837e8eb [formerly ca4c0788f1] [formerly 1b12a27631] [formerly 3f53ab4a89 [formerly 1b12a27631 [formerly d37f9b0ee38028c3995ed76ef69385ee3b4a152f]]]]
Former-commit-id: 3f53ab4a89
Former-commit-id: 8449535d28 [formerly 61b1fe7314] [formerly 8d60eab75cde7aa90162befc251b4fa7fa7185b9 [formerly 408263e5a7]]
Former-commit-id: 144038c4179d1b7b521420a5258b460eba917569 [formerly b9b4f9681c]
Former-commit-id: 69a4b3ea5a
|
2012-05-08 10:58:16 -05:00 |
|
Steve Harris
|
6715112613
|
12.5.1-2 baseline
Former-commit-id: c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]]
Former-commit-id: b36c69cc67
Former-commit-id: 8025cc609e [formerly f6300cd995] [formerly 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf]]
Former-commit-id: db29a95fc27cec97c5d6fcf7b21e22c5e97b5236 [formerly 377ae76413]
Former-commit-id: ef49f63d8d
|
2012-05-03 19:17:13 -05:00 |
|
Max Schenkelberg
|
96d727d49d
|
Issue #587 Fixed colorbar border flicker, made area have aspect ratio of data provider
Change-Id: If3a768ee5b61af7459ff8d22beab3270111f5286
Former-commit-id: a1436f6b0a [formerly 7814fca6e9] [formerly af162bedf5] [formerly a1436f6b0a [formerly 7814fca6e9] [formerly af162bedf5] [formerly 3d15400eb7 [formerly af162bedf5 [formerly 14107837a06d36b75d2b4878a0c72a650c4b2579]]]]
Former-commit-id: 3d15400eb7
Former-commit-id: 7768702058 [formerly abb74d20fe] [formerly 63d9bc13201c8722c88b4447310a4c626184a6f5 [formerly 846ae30be9]]
Former-commit-id: 363372db31a51a4f84a8c7399f14f2fd676528c8 [formerly d57034bbff]
Former-commit-id: 558cb37f97
|
2012-05-03 15:54:22 -05:00 |
|
Max Schenkelberg
|
c94d7965b5
|
Issue #587 Got colorbars rendering properly
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103
Former-commit-id: 120415f663 [formerly 0f6240eaea] [formerly d4c10e5548] [formerly 120415f663 [formerly 0f6240eaea] [formerly d4c10e5548] [formerly c81c225a6e [formerly d4c10e5548 [formerly 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe]]]]
Former-commit-id: c81c225a6e
Former-commit-id: 5056e1689b [formerly 726c543266] [formerly 26da60b90fed75fefa7c7b072d9e37d5dceb286f [formerly c6edfad263]]
Former-commit-id: 17e817f125710b8e9fd9aa72d95c5754ccb32543 [formerly 1189dba8a7]
Former-commit-id: 42c569430b
|
2012-05-03 13:07:43 -05:00 |
|
Max Schenkelberg
|
ca3ecdc5ef
|
Issue #584 Got draw point calls working
Change-Id: I80f9061647a96e66acf70fb5c22aefb8916979b0
Former-commit-id: a0d7197b99 [formerly eb948b3dc1] [formerly 65f8b18194] [formerly a0d7197b99 [formerly eb948b3dc1] [formerly 65f8b18194] [formerly 5d9da5e1ef [formerly 65f8b18194 [formerly 39a9ae5047e2f873d9b09ba65eded740f6568cec]]]]
Former-commit-id: 5d9da5e1ef
Former-commit-id: b26422d08c [formerly 06871710c3] [formerly 76a293686c0c992159fda79ea854e7016c01cacf [formerly 01ae8134b2]]
Former-commit-id: a99bdf5f9f646e0f6a41aafd0cdfe218c9e774ba [formerly a3baaa9ae8]
Former-commit-id: 78925afe73
|
2012-05-02 16:40:55 -05:00 |
|
Matt Nash
|
03be3d829c
|
Issue #429 add capability for session leader to change other's colors
Former-commit-id: 6a8c6594ea [formerly dee26f4fd5] [formerly 817bd297c8] [formerly 6a8c6594ea [formerly dee26f4fd5] [formerly 817bd297c8] [formerly c746441432 [formerly 817bd297c8 [formerly 6cdc4cfa9e740988c01a73ec862fcaed72403b45]]]]
Former-commit-id: c746441432
Former-commit-id: 208d22623b [formerly f62991f7b2] [formerly 8eccfce550c24254f53426cefffc6a489b93c2ce [formerly df25bbf079]]
Former-commit-id: ffc559da8a503d8b8d3200e4768df07750dcab3f [formerly 5aecb3340e]
Former-commit-id: 6f5a90b259
|
2012-05-02 14:36:58 -05:00 |
|
Matt Nash
|
e3c8219136
|
Issue #437 fix change status, remove double posting
Former-commit-id: 378772408e [formerly 8bb1342bfb] [formerly e9f75e7f50] [formerly 378772408e [formerly 8bb1342bfb] [formerly e9f75e7f50] [formerly 3c8143e8bc [formerly e9f75e7f50 [formerly 038bae22b932a1bdddeca4dd813920bf62b8db71]]]]
Former-commit-id: 3c8143e8bc
Former-commit-id: 4c6451f056 [formerly bdd71c5347] [formerly 9f37b3ecfdd9ed5688155a30e80979ee332e5a38 [formerly 1e4d656cf9]]
Former-commit-id: 91dcbb364319b63cd86a0c674070b24a924e890d [formerly 2da26e7ed5]
Former-commit-id: 9100e0e372
|
2012-05-02 14:36:58 -05:00 |
|
Max Schenkelberg
|
0a5e7d6a0a
|
Issue #239 Fixed bug with mosaic being up and starting a session
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01
Former-commit-id: 918a417e51 [formerly 3ffb18b767] [formerly a045f6f3b9] [formerly 918a417e51 [formerly 3ffb18b767] [formerly a045f6f3b9] [formerly b82eb49055 [formerly a045f6f3b9 [formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]]]]
Former-commit-id: b82eb49055
Former-commit-id: a77524a3c5 [formerly 887177aa84] [formerly 57f260c947b3fc3c2e2883f06031b6787b085456 [formerly 6a1b035c2d]]
Former-commit-id: 791d1c7e80ed49ab6bdd71028cc768d0a89c5b65 [formerly f4bd13133e]
Former-commit-id: e9e4327ec9
|
2012-05-02 10:20:20 -05:00 |
|
Matt Nash
|
50cae42293
|
Issue #448 use aliased name in peer to peer if available, fixes the extra view that once was created
Former-commit-id: ff25949b49 [formerly e1213ccea9] [formerly 167767dcbc] [formerly ff25949b49 [formerly e1213ccea9] [formerly 167767dcbc] [formerly d1f23b8dee [formerly 167767dcbc [formerly 37181c07d14af1ab3cacd363d9ce150771139d3b]]]]
Former-commit-id: d1f23b8dee
Former-commit-id: 7a5ef764f7 [formerly 3dbdc7246f] [formerly 24d74e2fdbc4cf9b4faedcf06aaa5b35ecd3d8d0 [formerly b0beab3044]]
Former-commit-id: 8204aa3555a8d919dcc3f2f324663e38502735bf [formerly 49fa359d9a]
Former-commit-id: 75ace5ee68
|
2012-05-02 09:42:50 -05:00 |
|
Max Schenkelberg
|
590641ad79
|
Issue #239 Fixed url path issue for joining late
Change-Id: Ibf11c6d12b93954aad6e3969fa9869e977d48de6
Former-commit-id: 9d9e5bb8b7 [formerly 69cb2ff5ee] [formerly adabe413f6] [formerly 9d9e5bb8b7 [formerly 69cb2ff5ee] [formerly adabe413f6] [formerly 0326936e85 [formerly adabe413f6 [formerly 9879fcd8733798a96026b3459d66f5f9e757e182]]]]
Former-commit-id: 0326936e85
Former-commit-id: 66a1338a59 [formerly edf13162a6] [formerly ccae8d70f6e4cbd9c0d75dc71e716ed0c4104489 [formerly a608dcb59b]]
Former-commit-id: 2b46319a4eb8d835dccb63170353fbfccacfeea3 [formerly 11cf1f3a23]
Former-commit-id: 6340cddacc
|
2012-05-02 09:25:44 -05:00 |
|
Max Schenkelberg
|
50caaa47a4
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e3d6962fe6 [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]]
Former-commit-id: e3d6962fe6
Former-commit-id: c5b45b0265 [formerly 338f80fa87] [formerly b0a578678016a097651cd359f6c7d0ad3223db18 [formerly 878de45ee6]]
Former-commit-id: 9ffb2ad0cd59863353c63a130f22384e8bd16572 [formerly 9f72069996]
Former-commit-id: 4ddcccc3c7
|
2012-05-01 18:36:09 -05:00 |
|
Steve Harris
|
3419f72215
|
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: fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 3992b18e28 [formerly 7c7fc97131] [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]]
Former-commit-id: 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b [formerly fd9e226b35]
Former-commit-id: 491aa53a0c
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
7f90924706
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
|
2012-05-01 18:06:13 -05:00 |
|
Nate Jensen
|
f63e9e2093
|
Issue #427 cleanup
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691
Former-commit-id: dd1cb83f03 [formerly 8bed608bc5] [formerly 9a992aab78] [formerly dd1cb83f03 [formerly 8bed608bc5] [formerly 9a992aab78] [formerly 0b6b92c9ff [formerly 9a992aab78 [formerly 2165fb7d4b1e2743110f647797b8f6017fc0a86c]]]]
Former-commit-id: 0b6b92c9ff
Former-commit-id: eb89648334 [formerly 8c88416642] [formerly 57dc35d7b3200d377fbe132557e432bf08e6a4f8 [formerly e89143161c]]
Former-commit-id: f3a5ec4c9b25ea93adf9ce6e85feb63e24e3562a [formerly 6bcab11947]
Former-commit-id: 069394a973
|
2012-05-01 17:33:55 -05:00 |
|
Matt Nash
|
4363f319cf
|
Issue #448 clean up group code
Former-commit-id: 543c9ae9cb [formerly 9ca693dd1e] [formerly ae7b40634e] [formerly 543c9ae9cb [formerly 9ca693dd1e] [formerly ae7b40634e] [formerly 8791b7329a [formerly ae7b40634e [formerly aad6d7178694bfe9b42171729b4185e65429a515]]]]
Former-commit-id: 8791b7329a
Former-commit-id: af638d02e0 [formerly e2260c94a7] [formerly 535d306b6d2225a943f13598dc3863c24ec1486f [formerly 5d3c2686cd]]
Former-commit-id: 28916c8547cd848ce86dd7d967a3df84a5104363 [formerly f99b59b0fd]
Former-commit-id: fcb1eac45b
|
2012-05-01 16:14:33 -05:00 |
|
Max Schenkelberg
|
670b81f310
|
Issue #239 Got joining late working to load data participants don't have
Change-Id: I7c27e584b3b7f7331708689acee7f1b62fefe0eb
Former-commit-id: caa38ef109 [formerly c72650baef] [formerly edacf7a4b3] [formerly caa38ef109 [formerly c72650baef] [formerly edacf7a4b3] [formerly 4b8f81dbcb [formerly edacf7a4b3 [formerly ceabfd385103380f99bed2eaa4470cfbcb70cef9]]]]
Former-commit-id: 4b8f81dbcb
Former-commit-id: bed4dc9522 [formerly 55ecffce8b] [formerly 685cf1c6847c76bee5059129d41c7b3beecf8b24 [formerly 0b5623654a]]
Former-commit-id: 2e5da25c9053ad35f363a170901e003840b3cc2f [formerly 37077c6b3e]
Former-commit-id: 59ffa4cbed
|
2012-05-01 15:51:15 -05:00 |
|
Matt Nash
|
47a65c2f1e
|
Issue #448 fix icons
Former-commit-id: c3b72c3873 [formerly 7b96d1e9bc] [formerly fd515ad766] [formerly c3b72c3873 [formerly 7b96d1e9bc] [formerly fd515ad766] [formerly 9764210b93 [formerly fd515ad766 [formerly 6b6ef0c250f895f20e43a5b596be7189d8bc9d5f]]]]
Former-commit-id: 9764210b93
Former-commit-id: 2a38c6222d [formerly cd36f4cd8a] [formerly 410584a46ea01b45ddc16b1807f81978115b9068 [formerly 529444c746]]
Former-commit-id: d0af18fbbce1df30a4bbd343ed5db8ab1315d931 [formerly a55f4c6402]
Former-commit-id: d9787cab1c
|
2012-05-01 15:07:46 -05:00 |
|
Matt Nash
|
443d4772b7
|
Issue #448 problem where the file is not there and null is returned
Former-commit-id: 356ab7b820 [formerly 27ea55dad3] [formerly cef6bd81a8] [formerly 356ab7b820 [formerly 27ea55dad3] [formerly cef6bd81a8] [formerly 1872503cd8 [formerly cef6bd81a8 [formerly 41eb0413a8c68104532d4f302c4bed07a572b430]]]]
Former-commit-id: 1872503cd8
Former-commit-id: 0786b47f2d [formerly 72a6207eb7] [formerly f7ee48cfe756484bc1c1554d823c0ace7f6b8905 [formerly 7a89fa8342]]
Former-commit-id: ca62111e6a117efbb897cb2817484a1d65b77f12 [formerly e39edb5776]
Former-commit-id: 0b42e393c9
|
2012-05-01 11:55:12 -05:00 |
|
Matt Nash
|
6aafe52036
|
Issue #448 aliasing works on tabs and such now too
Former-commit-id: 2966485e68 [formerly 8a0f32b639] [formerly 88b20d568e] [formerly 2966485e68 [formerly 8a0f32b639] [formerly 88b20d568e] [formerly 4a0b1e36ca [formerly 88b20d568e [formerly 9dca1c46abc1d6eb4f81066c14a4b888f3c37b46]]]]
Former-commit-id: 4a0b1e36ca
Former-commit-id: 6944cd202d [formerly b7a2b627f6] [formerly 1696cd103d9cda276a8531c4f38d12adfb70ec83 [formerly f121499f7a]]
Former-commit-id: b9a90bcfac4aec4f0a1ec3695d7db1cfa1554c2f [formerly a601af019e]
Former-commit-id: 2b31a87bc2
|
2012-05-01 10:28:20 -05:00 |
|
Matt Nash
|
fbf130b939
|
Issue #448 further aliasing
Former-commit-id: cb79489dcd [formerly 9c6768f254] [formerly 603b114ae7] [formerly cb79489dcd [formerly 9c6768f254] [formerly 603b114ae7] [formerly efd6485647 [formerly 603b114ae7 [formerly 066671debfaf52427cc0584513edd11f6cf10689]]]]
Former-commit-id: efd6485647
Former-commit-id: 7c935c51ab [formerly 77e0495f50] [formerly 93d8c9b52ab8f8845146412f77caa7c4737791a8 [formerly b797bf94b9]]
Former-commit-id: acfa1e7900a98ee9dea71507487e24fbf639e9b5 [formerly 7ce6186e51]
Former-commit-id: f9848ce8bf
|
2012-04-30 17:28:01 -05:00 |
|
Matt Nash
|
c18ffbd169
|
Issue #448 aliasing for group view
Former-commit-id: c270c99caa [formerly 8ae54b2e0c] [formerly cb6aa40f42] [formerly c270c99caa [formerly 8ae54b2e0c] [formerly cb6aa40f42] [formerly 49bda84329 [formerly cb6aa40f42 [formerly aa42c1600b675412a5ee73a7e2da48602f05e10f]]]]
Former-commit-id: 49bda84329
Former-commit-id: 2f37ddf632 [formerly f7f9e9fee7] [formerly 3ad31f8dfb2b731bf4b7c221eb9efa19f639cc4e [formerly 77e3b905b0]]
Former-commit-id: 5cd6297f080b741a11bb4e8c420aee67f1890f4d [formerly 278729c19d]
Former-commit-id: d843a72dd6
|
2012-04-30 16:45:35 -05:00 |
|
Nate Jensen
|
062a5f2972
|
Issue #427 cleanup
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1
Former-commit-id: 4fc32a8178 [formerly c958d3a471] [formerly 6a034283b5] [formerly 4fc32a8178 [formerly c958d3a471] [formerly 6a034283b5] [formerly eac55b7587 [formerly 6a034283b5 [formerly 4c8192e99f1ecb57bc6a4efeaa6d7ee3a8127ec1]]]]
Former-commit-id: eac55b7587
Former-commit-id: 326f7b8197 [formerly d91295cf0a] [formerly c85a6928e18e8149f4d53c868d1e99c25d96cb2d [formerly fafdf1de48]]
Former-commit-id: 0797189ade7b60c678275577e32b7480d3cf2a23 [formerly 226437c8a0]
Former-commit-id: 9952659521
|
2012-04-30 15:49:44 -05:00 |
|
Nate Jensen
|
4816fc4082
|
Issue #427 remove extraneous event buses
Change-Id: I958de58ba963609ada80529195d024077a901a0e
Former-commit-id: 2df5c95e6c [formerly 56ae7eab86] [formerly 7aa1e562d8] [formerly 2df5c95e6c [formerly 56ae7eab86] [formerly 7aa1e562d8] [formerly bfd45d703f [formerly 7aa1e562d8 [formerly 1c0d5457c079880996fc75872870545ededb4316]]]]
Former-commit-id: bfd45d703f
Former-commit-id: 7c1b7ee98f [formerly 85067c02b7] [formerly 83fb7f2bcb2a8555dd49a709baa58d57198620f0 [formerly 9f32676a86]]
Former-commit-id: 1679dd174ae7e18d7b3237ba80004ec1737b7c5c [formerly a844d4f24d]
Former-commit-id: 97d6aa8701
|
2012-04-30 15:33:59 -05:00 |
|
Max Schenkelberg
|
f6d0103e92
|
Issue #239 Made custom PointImageExtension that handles differencing for faster plot rendering
Change-Id: I2e22ee3eb6fe67ff754dd4689b8c8876eb3b893d
Former-commit-id: b2ee1fc849 [formerly 5e5e362f39] [formerly 9e2cf73f7a] [formerly b2ee1fc849 [formerly 5e5e362f39] [formerly 9e2cf73f7a] [formerly 60aac07962 [formerly 9e2cf73f7a [formerly 2caf3e8ebb70ffd455cb9f354b1226e858898822]]]]
Former-commit-id: 60aac07962
Former-commit-id: ddf8f4cbb9 [formerly b060788489] [formerly 6eae10aeb570077e3e808a98a06d092a3a64c545 [formerly 7bfaa9474b]]
Former-commit-id: 7deac05508f12d4c05a6bd923f8835da4548cfbb [formerly 37d9d12838]
Former-commit-id: e95bc35d1a
|
2012-04-30 15:01:37 -05:00 |
|
Dave Hladky
|
8f500ff6d6
|
Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.
Former-commit-id: 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]]
Former-commit-id: 5b7ecea866
Former-commit-id: 9ae2445f9f [formerly a1a3a361dd] [formerly d98bc5d5887a016d68a6737704a6fb5e552d838c [formerly 61e31c62ff]]
Former-commit-id: 07953e4b449645e4adcfef80f1595ec0513eb00f [formerly d2e16d486b]
Former-commit-id: 7fc0c65ef4
|
2012-04-30 13:43:34 -05:00 |
|
Bryan Kowal
|
b500c9d2a8
|
Issue #517 - ensure that plugin.xml is packaged in the com.raytheon.uf.viz.collaboration.radar jar file.
Former-commit-id: e1b95c6c29 [formerly ed83cb8a52] [formerly ed878bc13d] [formerly e1b95c6c29 [formerly ed83cb8a52] [formerly ed878bc13d] [formerly 84e3c4704e [formerly ed878bc13d [formerly 22fb97b29a3e7fd310de9915b83ffcbd2c7771a0]]]]
Former-commit-id: 84e3c4704e
Former-commit-id: 20ca51800b [formerly b75ff37fd3] [formerly 5fcf69d7e9bef889e37b3001c45ce69988cce28a [formerly a2d1cc317d]]
Former-commit-id: 3eb3c018344ae627270f7bc1e6d3039a72987054 [formerly 4fcc1870b4]
Former-commit-id: 354eda8407
|
2012-04-30 12:45:30 -05:00 |
|
Nate Jensen
|
d558104eae
|
Issue #427 remove dead code
Change-Id: I36e3f77f8c0176b72762abc311d8e4e3eab22e0e
Former-commit-id: e6d8ea11ba [formerly 6de861e9b5] [formerly d5a3acc97b] [formerly e6d8ea11ba [formerly 6de861e9b5] [formerly d5a3acc97b] [formerly bba6d5e400 [formerly d5a3acc97b [formerly 90a1888baffbb21ac3b2f555764c37a519d5efb1]]]]
Former-commit-id: bba6d5e400
Former-commit-id: c42763e6af [formerly 844946764c] [formerly 77605eece2f1b2d40c2c6e5c3ca69b0be8b0c890 [formerly 2e02578b63]]
Former-commit-id: d28a1371f58de07e898161724ce9f14017377614 [formerly a20cf866e5]
Former-commit-id: 946adcfb0c
|
2012-04-27 16:22:27 -05:00 |
|
Nate Jensen
|
4676b01be6
|
Issue #427 separated collaboration.ui into two plugins
Change-Id: I3085f2aae4c1c44b65749e587a9eb753d1d7a34b
Former-commit-id: 084967f0fd [formerly d952fe084a] [formerly e8f1c0159c] [formerly 084967f0fd [formerly d952fe084a] [formerly e8f1c0159c] [formerly 9454cbd1b9 [formerly e8f1c0159c [formerly f96302b439b39030e54a2b87a6e2387ebb63502f]]]]
Former-commit-id: 9454cbd1b9
Former-commit-id: 11acde5199 [formerly 99e561a26e] [formerly 5c1f8f7212b1ee91e91f199da04bae0530630539 [formerly 4a85e47ee9]]
Former-commit-id: debb715f3ddebb303992a1736ba203f3ef86a33f [formerly 03db8baf70]
Former-commit-id: 829c6621e9
|
2012-04-27 16:12:48 -05:00 |
|
Nate Jensen
|
efb801fb84
|
Issue #427 better part listeners
Change-Id: I0787fdc7a086c87228e9f38ce85e23dd9edc4bd2
Former-commit-id: 281f9b3232 [formerly cafa23c9d2] [formerly 855ec5dd4d] [formerly 281f9b3232 [formerly cafa23c9d2] [formerly 855ec5dd4d] [formerly 866acb24b2 [formerly 855ec5dd4d [formerly 008164a55b5720eaf8dbfd2d023fefc9ab705936]]]]
Former-commit-id: 866acb24b2
Former-commit-id: be090ce8f3 [formerly 19dfa62f58] [formerly f09a041c433c49f244db95e8e48ea63cd51c1a93 [formerly cc61a7a62f]]
Former-commit-id: 3a5f57a95a88f3410e7ded30a1c7d5750e60c765 [formerly e4afe7405c]
Former-commit-id: 79c99ecfe5
|
2012-04-27 14:47:27 -05:00 |
|
Matt Nash
|
c7764f2783
|
Issue #448 add preference page for collaboration, currently only enabling and disabling notifications
Former-commit-id: 1749033fdd [formerly 0a3a7bfba2] [formerly cc313ebcac] [formerly 1749033fdd [formerly 0a3a7bfba2] [formerly cc313ebcac] [formerly 00d11cdeaa [formerly cc313ebcac [formerly 1a0bc57f249f3b757c6226526ba05b2f8d1ab2e6]]]]
Former-commit-id: 00d11cdeaa
Former-commit-id: 1f3088a776 [formerly aea9b34499] [formerly b731ef00aa8afa7e0eff5fbdcbe011b4ee37d716 [formerly af819b2e0d]]
Former-commit-id: 308aad6e970acb56c0abaca1062c1d5b55de3722 [formerly 1e75e1b24d]
Former-commit-id: 203dae601a
|
2012-04-27 14:34:55 -05:00 |
|
David Gillingham
|
d189b66b1f
|
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: 034cab5000 [formerly 6497272c1d] [formerly c28bfaddee] [formerly 034cab5000 [formerly 6497272c1d] [formerly c28bfaddee] [formerly 292374ce21 [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]]]
Former-commit-id: 292374ce21
Former-commit-id: eeb836f5eb [formerly 1107eac65d] [formerly 4ffd35492e1f4e3a22ff89cb2e9d2d09bf68492e [formerly 6f40ba77f1]]
Former-commit-id: e167e02e805072fdf1b2f36d3706605647061458 [formerly 01f74fa2b5]
Former-commit-id: 64df9d3b46
|
2012-04-27 12:43:04 -05:00 |
|
Max Schenkelberg
|
7b05f6f4d6
|
Issue #239 Added render frame merging capability
Change-Id: Ie16e650693de6e07453357740b3c2bae21bd999d
Former-commit-id: f4cd5ebfef [formerly 4175affdc7] [formerly ff0827b51d] [formerly f4cd5ebfef [formerly 4175affdc7] [formerly ff0827b51d] [formerly df07bff0bc [formerly ff0827b51d [formerly ad6d31300e0ac41375a3eb65ce337a6105be72ee]]]]
Former-commit-id: df07bff0bc
Former-commit-id: c921fd3508 [formerly c0a47ede0d] [formerly c0ecddd455d169d50d27cb31f597a127111a78fe [formerly e5e13fc3b3]]
Former-commit-id: b408bb14cbb7ec7d910d34c0325c4a6b50c149fe [formerly 8a4f34223e]
Former-commit-id: e98537b537
|
2012-04-27 11:57:53 -05:00 |
|
Matt Nash
|
07409b4137
|
Issue #429 add better notification to chat
Former-commit-id: 18e07972ca [formerly 590862b77d] [formerly e0d11ae8b1] [formerly 18e07972ca [formerly 590862b77d] [formerly e0d11ae8b1] [formerly 3b2fdaa579 [formerly e0d11ae8b1 [formerly 40db7caa4b6bd45537f4cb37a3f034a907cd8f79]]]]
Former-commit-id: 3b2fdaa579
Former-commit-id: 21ac4d37be [formerly e94eaf4752] [formerly a873337238e14b1e9af1b91cd3bd0b55656415ad [formerly 91035ee253]]
Former-commit-id: 781f573d2445450af1afebadcc1b9b2dc442a124 [formerly c930a63797]
Former-commit-id: 249b72e35d
|
2012-04-27 10:10:05 -05:00 |
|
Matt Nash
|
f360cb14b8
|
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: 548e0c4b59 [formerly c1983d295d] [formerly 25201fcbad] [formerly 548e0c4b59 [formerly c1983d295d] [formerly 25201fcbad] [formerly 16de1dbafe [formerly 25201fcbad [formerly 9c0f7ee82b7a844620f1f2e00947a256582b86ef]]]]
Former-commit-id: 16de1dbafe
Former-commit-id: cb2d3b6d30 [formerly 051b9397f7] [formerly 7dc402eb1ed2afb56772e897b0da23e2a02c2b07 [formerly 501b74478e]]
Former-commit-id: 67266fc08258b22e624d6c7c8a221ad31ef341ea [formerly 32772c5ecc]
Former-commit-id: de1fe44cfc
|
2012-04-27 10:08:27 -05:00 |
|