-
Notifications
You must be signed in to change notification settings - Fork 350
appleseed.studio python module improvements #1578
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
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
|
|
||
| # | ||
| # This source file is part of appleseed. | ||
| # Visit http://appleseedhq.net/ for additional information and resources. | ||
| # | ||
| # This software is released under the MIT license. | ||
| # | ||
| # Copyright (c) 2017 Gleb Mishchenko, The appleseedhq Organization | ||
| # | ||
| # Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| # of this software and associated documentation files (the "Software"), to deal | ||
| # in the Software without restriction, including without limitation the rights | ||
| # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| # copies of the Software, and to permit persons to whom the Software is | ||
| # furnished to do so, subject to the following conditions: | ||
| # | ||
| # The above copyright notice and this permission notice shall be included in | ||
| # all copies or substantial portions of the Software. | ||
| # | ||
| # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| # THE SOFTWARE. | ||
| # | ||
|
|
||
| import Qt | ||
|
|
||
| def wrapinstance(addr, type): | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. type is maybe a reserved python keyword. We can rename the argument to cls (short for class) just in case.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I checked docs and made it consistent with what names are used in modules being wrapped
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok. Lets keep type then. |
||
| # Function won't change and will throw Exception for PySide2 and PyQt5. | ||
| raise Exception("No wrapinstance function defined for " + Qt.__binding__) | ||
|
||
|
|
||
| def resolve_wrapper(): | ||
| global wrapinstance | ||
|
|
||
| if Qt.__binding__ == 'PyQt4': | ||
| # Make an import to global namespace | ||
| global sip | ||
| import sip | ||
|
|
||
| def _wrapinstance(addr, type): | ||
| return sip.wrapinstance(addr, type) | ||
|
|
||
| wrapinstance = _wrapinstance | ||
|
|
||
| elif Qt.__binding__ == 'PySide': | ||
| # Make an import to global namespace | ||
| global shiboken | ||
| import shiboken | ||
|
|
||
| def _wrapinstance(addr, type): | ||
| return shiboken.wrapInstance(addr, type) | ||
|
|
||
| wrapinstance = _wrapinstance | ||
|
|
||
| resolve_wrapper() | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you need to make the same changes in cmake/config/windows.txt and the one for OSX too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah yes, forgot about it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't really like the target name I chose. Maybe you have some ideas?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think it's bad. I don't have anything better now.
It's an internal name that is not visible anywhere.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it is, that's why I wonder