Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/config/linux-gcc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ macro (add_copy_py_file_to_sandbox_py_module_command py_src module_name)
get_relative_path_from_module_name (relative_module_path ${module_name})
set(module_path "${py_path}/${relative_module_path}")

add_custom_command (TARGET appleseed.python POST_BUILD
add_custom_command (TARGET appleseed.python.copy_py_files POST_BUILD
Copy link
Copy Markdown
Member

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.

Copy link
Copy Markdown
Contributor Author

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

Copy link
Copy Markdown
Contributor Author

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?

Copy link
Copy Markdown
Member

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.

Copy link
Copy Markdown
Contributor Author

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

$ make 
[  0%] Built target lz4
[ 44%] Built target appleseed
[ 44%] Built target SANDBOX
[ 59%] Built target appleseed.shaders
[ 59%] Built target appleseed.shared
[ 60%] Built target appleseed.cli
[ 63%] Built target appleseed.python
[ 63%] Built target appleseed.python.copy_py_files
[ 98%] Built target appleseed.studio
[ 98%] Built target animatecamera
[ 98%] Built target convertmeshfile
[ 99%] Built target dumpmetadata
[ 99%] Built target makefluffy
[100%] Built target projecttool

COMMAND mkdir -p ${module_path}
COMMAND cp ${py_src} ${module_path}
)
Expand All @@ -320,7 +320,7 @@ macro (add_copy_dir_to_sandbox_py_module_command py_dir module_name)
get_relative_path_from_module_name (relative_module_path ${module_name})
set(module_path "${py_path}/${relative_module_path}")

add_custom_command (TARGET appleseed.python POST_BUILD
add_custom_target (TARGET appleseed.python.copy_py_files POST_BUILD
COMMAND mkdir -p ${module_path}
COMMAND cp -r ${py_dir} ${module_path}
)
Expand Down
2 changes: 2 additions & 0 deletions src/appleseed.python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ target_link_libraries (appleseed.python
# Post-build commands.
#--------------------------------------------------------------------------------------------------

add_custom_target(appleseed.python.copy_py_files ALL)

add_copy_target_to_sandbox_py_module_command (appleseed.python appleseed)
add_copy_py_file_to_sandbox_py_module_command (${PROJECT_SOURCE_DIR}/src/appleseed.python/__init__.py appleseed)
add_copy_py_file_to_sandbox_py_module_command (${PROJECT_SOURCE_DIR}/src/appleseed.python/logtarget.py appleseed)
Expand Down
58 changes: 58 additions & 0 deletions src/appleseed.python/studio/ui.py
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):
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The 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.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The 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
https://shiboken.readthedocs.io/en/latest/shibokenmodule.html
http://pyqt.sourceforge.net/Docs/sip4/python_api.html

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The 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__)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can do all in wrapinstance. I see that you are trying to import sip or shiboken only once, but importing a module that's already imported is not expensive, just a dictionary lookup, and this function is not going to be used in any kind of performance critical code.

I suggest:

if Qt.binding == 'PyQt4':
import sip
return sip.wrapInstance(...)
elif Qt.binding == 'PySide':
...
else:
raise Exception(...)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I tried to avoid if-elif chain and repetitive importing. If it's not too expensive I'll make function easier as you suggested


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()