Commit graph

15 commits

Author SHA1 Message Date
Ben Steffensmeier
3ade0c85eb Omaha #3163 Add support for reading colored text styles from future versions of collaboration.
Former-commit-id: 08f7d7b8dd [formerly 67e68732d6] [formerly 08f7d7b8dd [formerly 67e68732d6] [formerly 79ef4a5301 [formerly 63d4e9f1e2bf95792fa82d101ce59f23e2cbdaf9]]]
Former-commit-id: 79ef4a5301
Former-commit-id: fcbd4cc9ee [formerly 126f47f725]
Former-commit-id: e38c19dd1d
2014-05-16 12:50:48 -05:00
Ben Steffensmeier
b81d14f2ea Issue #2920 Fix serialization of DrawStringEvent.
Former-commit-id: d09b87736a [formerly 0abf71f719] [formerly d09b87736a [formerly 0abf71f719] [formerly d43e5abf29 [formerly d88bdcccb805896e32766373bc07185364741d4e]]]
Former-commit-id: d43e5abf29
Former-commit-id: 41e508b0da [formerly 6327c3a673]
Former-commit-id: 4e33194b36
2014-04-09 09:21:45 -05:00
Nate Jensen
7d8ea4b1cb Merge "Issue #2920 Allow strings to use mulitple styles." into development
Former-commit-id: b793ce20bc [formerly 811364eb73] [formerly b793ce20bc [formerly 811364eb73] [formerly 3fff4e77d4 [formerly 1b07e87178947df4d579dbc32057e883b61a7de2]]]
Former-commit-id: 3fff4e77d4
Former-commit-id: 41a7098166 [formerly 2fdac5fec2]
Former-commit-id: a87b131d94
2014-04-08 14:28:44 -05:00
Nate Jensen
a2d09fd948 Issue #2968 fix buffer thread safety issues
Change-Id: I8c8cbf69ea9821ce82fc72b98cf17b0b5f1a93c2

Former-commit-id: 5c775618e3 [formerly e11a5c4559] [formerly 5c775618e3 [formerly e11a5c4559] [formerly f2b18b76f2 [formerly edc629d4b63f2a873752a232ee8f6530ec314595]]]
Former-commit-id: f2b18b76f2
Former-commit-id: f5d594bddc [formerly ae9c53fd05]
Former-commit-id: e936e5cac3
2014-04-07 17:30:27 -05:00
Ben Steffensmeier
0ab850c00f Issue #2920 Allow strings to use mulitple styles.
Former-commit-id: ddc97933b8 [formerly 32016d5401] [formerly ddc97933b8 [formerly 32016d5401] [formerly bb205cdef9 [formerly ba3638effd48445bd00b8ef5e3771f05910c2af1]]]
Former-commit-id: bb205cdef9
Former-commit-id: 963901f6b1 [formerly 5b55eb6e39]
Former-commit-id: 5b23b2f5b0
2014-04-04 16:16:06 -05:00
Nate Jensen
45ff104294 Issue #2826 fix collaboration mosaic image disposed issue
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614

Former-commit-id: d9af17287d [formerly 7fa8bf636f] [formerly d9af17287d [formerly 7fa8bf636f] [formerly 7bfad8ce17 [formerly 50b3e6bb7fcee54f1199b78354d404f325b32773]]]
Former-commit-id: 7bfad8ce17
Former-commit-id: cb81644412 [formerly 04d7ef0e7a]
Former-commit-id: 69bdf2bd60
2014-03-06 18:07:40 -06:00
Ben Steffensmeier
abc97d429c Issue #2831 Fix No Data Value in collaboration images.
Former-commit-id: c9eb976b65 [formerly 82b8790050] [formerly c9eb976b65 [formerly 82b8790050] [formerly 6962f80c5a [formerly 30a2518e0f780e4c344ec0e8fcdac39c9e3d617c]]]
Former-commit-id: 6962f80c5a
Former-commit-id: 346cd75e59 [formerly 062e3ddb48]
Former-commit-id: 4bc84e916d
2014-03-06 13:37:08 -06:00
Ben Steffensmeier
4b966138f6 Issue #2843 Harden recycle.
Former-commit-id: 22adc336df [formerly 26c1a8e494] [formerly 22adc336df [formerly 26c1a8e494] [formerly 3cd6b29e75 [formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]]
Former-commit-id: 3cd6b29e75
Former-commit-id: ed0ec90407 [formerly af1bdf1b53]
Former-commit-id: 2c687a4064
2014-03-05 11:16:12 -06:00
Ben Steffensmeier
07ffe9f711 Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: 780dc19fac [formerly 70ae372303] [formerly 780dc19fac [formerly 70ae372303] [formerly e08d4f77c3 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]
Former-commit-id: e08d4f77c3
Former-commit-id: 7aca322faa [formerly a6bf896593]
Former-commit-id: 7e29aa25a9
2014-02-21 17:37:19 -06:00
Max Schenkelberg
7383be61c1 Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing.
Change-Id: Ic82f45447113425a08909be4c5229502882db022

Former-commit-id: 2f794486e3 [formerly e58a5df04b] [formerly 2f794486e3 [formerly e58a5df04b] [formerly bd903f6641 [formerly 58ccc575973ea9a1778659e17daff8577747dec5]]]
Former-commit-id: bd903f6641
Former-commit-id: 3f3b244b0d [formerly c85532a180]
Former-commit-id: 60616f7ef0
2013-11-11 11:09:00 -06:00
Max Schenkelberg
fddc9ce779 Issue #2189 Added a FontType option when initializing a font from a file.
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments

Change-Id: Ia5608cb7ffd0b760b3922e65107e66c971fa3e63

Former-commit-id: 52110961b4 [formerly c386533867] [formerly 52110961b4 [formerly c386533867] [formerly 3381c0016e [formerly 9250700e425983156dd2d226556647d6a2bf43af]]]
Former-commit-id: 3381c0016e
Former-commit-id: 473c2f2659 [formerly a8972da606]
Former-commit-id: 2efabffe80
2013-07-24 16:35:50 -05:00
Ben Steffensmeier
866c873f71 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
2013-02-28 17:00:56 -06:00
Ben Steffensmeier
c300faa186 Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390

Former-commit-id: 1940a92596 [formerly aa4c7526ff] [formerly 1940a92596 [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: 086f6aabe9 [formerly 455aa4628f]
Former-commit-id: 49b700da85
2013-02-14 15:34:25 -06:00
Richard Peter
398b47967d Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28 [formerly 6a5a0d7d09]
Former-commit-id: 709af3b25e
2013-01-09 17:55:05 -06:00
Steve Harris
35e34308c5 12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
2012-10-16 13:27:07 -05:00