Skip to content
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

ENH: Add a parameter to invert an Aperture #922

Merged
merged 8 commits into from Jun 19, 2015

Conversation

@thomastweets
Copy link
Contributor

@thomastweets thomastweets commented Jun 17, 2015

Hello!

I needed a simple means to mask the shape of the Aperture and not everything BUT the shape. This should work (if the changed GL command does not have some terrible side effect that I am not aware of).

Thanks for your great work!

@thomastweets
Copy link
Contributor Author

@thomastweets thomastweets commented Jun 18, 2015

I just realized that this will probably break .contains().
I still like the easiness of the implementation. Maybe one could throw a warning in this case?

@peircej
Copy link
Member

@peircej peircej commented Jun 18, 2015

Yes, contains() won't work but here are other conditions where the use of a bitmap mask means that doesn't work and I don't think there's anything we can do about that.

I can't easily pull in your current changes though because they clash with your changes from the other branch. I think they're easy enough to fix but it might be better if you did it. Do you know how to merge them with a merge tool?

@thomastweets
Copy link
Contributor Author

@thomastweets thomastweets commented Jun 19, 2015

I now merged the latest commit from my feature-aperture-image branch to this PR/branch. So #925 is obsolete and I will close it. Still I have problems with the tests I implemented. Maybe you have a suggestion here?

@peircej

This comment has been minimized.

Your test is currently failing, I think because of an erroneous filename:
fileName = os.path.join(utils.TESTS_DATA_PATH, 'testwedges.jpg')
should be 'testwedges.png'

@thomastweets
Copy link
Contributor Author

@thomastweets thomastweets commented Jun 19, 2015

Great, thanks!

peircej added a commit that referenced this pull request Jun 19, 2015
ENH: Add a parameter to invert an Aperture
@peircej peircej merged commit ea55b38 into psychopy:master Jun 19, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.05%) to 50.35%
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants