New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix TextCombined used wrong #1616

Merged
merged 2 commits into from Oct 19, 2015

Conversation

Projects
None yet
3 participants
@chaosphere2112
Contributor

chaosphere2112 commented Oct 15, 2015

Fixes where TextCombined was passed into vcs2vtk.prepTextProperty; now uses TextOrientation and TextTable instead.

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented Oct 15, 2015

Fixes #1606

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Oct 15, 2015

@chaosphere2112 is Jerry going to approve this branch? Changes looks reasonable to me 👍

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented Oct 16, 2015

@glpotter, you can try this branch out; I was able to reproduce every time I was placing a label in the VCS Interactive layer.

Update textcombined.py
added colormap attribute to textcombined
@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Oct 16, 2015

@chaosphere2112 I added colormap to textcombined as well. Let's wait for the bots.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Oct 17, 2015

@chaosphere2112 LGTM. If okay with @doutriaux1 please feel free to merge.

doutriaux1 added a commit that referenced this pull request Oct 19, 2015

Merge pull request #1616 from UV-CDAT/fix_1606
Fix TextCombined used wrong

@doutriaux1 doutriaux1 merged commit 9bdd87f into master Oct 19, 2015

6 of 8 checks passed

cont-int/LLNL/Darwin-Mac2 10.10.5 (FULL) running 'make -j4' (Fri Oct 16 10:05:14 2015)
Details
continuous-integration/kitware-buildbot/uvcdat-garant-linux-release/ Build done.
Details
cont-int/LLNL/Darwin-Mac 10.10.5 (LEAN) running 'ctest -j4 -D Experimental' (Fri Oct 16 10:03:19 2015)
Details
cont-int/LLNL/Darwin-Mac1 10.10.5 (NOGUI) running 'ctest -j4 -D Experimental' (Fri Oct 16 11:02:37 2015)
Details
cont-int/LLNL/Linux-crunchy RH6 (FULL) running 'ctest -j12 -D Experimental' (Fri Oct 16 10:23:07 2015)
Details
cont-int/LLNL/Linux-oceanonly RH6 (MESA/NOGUI) running 'ctest -j12 -D Experimental' (Fri Oct 16 10:14:49 2015)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@doutriaux1 doutriaux1 deleted the fix_1606 branch Oct 19, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment