Skip to content

Commit

Permalink
minor pep8 edits
Browse files Browse the repository at this point in the history
  • Loading branch information
ideasman42 committed Apr 10, 2011
1 parent 4170ad9 commit d944bc5
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 31 deletions.
38 changes: 19 additions & 19 deletions development_icon_get.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@
def create_icon_list_all():
icons = bpy.types.UILayout.bl_rna.functions['prop'].parameters['icon'].\
enum_items.keys()

icons.remove("NONE")

return icons


def create_icon_list():
icons = create_icon_list_all()
search = bpy.context.scene.icon_props.search.lower()

if search == "":
pass
else:
icons = [key for key in icons if search in key.lower()]

return icons


Expand All @@ -67,7 +67,7 @@ class WM_OT_icon_info(bpy.types.Operator):
bl_description = "Click to copy this icon name to the clipboard"
icon = bpy.props.StringProperty()
icon_scroll = bpy.props.IntProperty()

def invoke(self, context, event):
bpy.data.window_managers['WinMan'].clipboard = self.icon
self.report({'INFO'}, "Icon ID: %s" % self.icon)
Expand All @@ -78,11 +78,11 @@ class OBJECT_PT_icons(bpy.types.Panel):
bl_space_type = "TEXT_EDITOR"
bl_region_type = "UI"
bl_label = "All icons"

def __init__(self):
self.amount = 10
self.icon_list = create_icon_list()

def draw(self, context):
props = context.scene.icon_props
# polling for updates
Expand All @@ -92,7 +92,7 @@ def draw(self, context):
# IconProps.scroll = bpy.props.IntProperty(default=1, min=1,
# max=max(1, len(self.icon_list) - self.amount + 1),
# description="Drag to scroll icons")

box = self.layout.box()
# scroll view
if not props.expand:
Expand All @@ -107,7 +107,7 @@ def draw(self, context):
row = toprow.row()
row.active = props.bl_rna.scroll[1]['max'] > 1
row.prop(props, "scroll")

# icons
row = box.row(align=True)
if len(self.icon_list) == 0:
Expand All @@ -121,7 +121,7 @@ def draw(self, context):
for i in range(self.amount - len(self.icon_list) \
% self.amount):
row.label("")

# expanded view
else:
# expand button
Expand All @@ -135,7 +135,7 @@ def draw(self, context):
row = toprow.row()
row.active = False
row.prop(props, "scroll")

# icons
col = box.column(align=True)
if len(self.icon_list) == 0:
Expand All @@ -154,11 +154,11 @@ def draw(self, context):
class CONSOLE_HT_icons(bpy.types.Header):
bl_space_type = 'CONSOLE'
_search_old = ""

def __init__(self):
self.amount = 10
self.icon_list = create_icon_list()

def draw(self, context):
props = context.scene.icon_props
# polling for updates
Expand All @@ -169,7 +169,7 @@ def draw(self, context):
# IconProps.scroll = bpy.props.IntProperty(default=1, min=1,
# max=max(1, len(self.icon_list) - self.amount + 1),
# description="Drag to scroll icons")

# scroll view
if props.console:
layout = self.layout
Expand All @@ -181,7 +181,7 @@ def draw(self, context):
row = layout.row()
row.active = props.bl_rna.scroll[1]['max'] > 1
row.prop(props, "scroll")

# icons
row = layout.row(align=True)
if len(self.icon_list) == 0:
Expand All @@ -199,10 +199,10 @@ def menu_func(self, context):

def register():
global IconProps

icons_total = len(create_icon_list_all())
icons_per_row = 10

class IconProps(bpy.types.PropertyGroup):
"""
Fake module like class
Expand All @@ -217,7 +217,7 @@ class IconProps(bpy.types.PropertyGroup):
scroll = bpy.props.IntProperty(default=1, min=1,
max=max(1, icons_total - icons_per_row + 1),
description="Drag to scroll icons")

bpy.utils.register_module(__name__)
bpy.types.Scene.icon_props = bpy.props.PointerProperty(type=IconProps)
bpy.types.CONSOLE_MT_console.append(menu_func)
Expand All @@ -235,7 +235,7 @@ def unregister():
# unregistering is only done automatically when run as add-on
bpy.utils.unregister_class(OBJECT_PT_icons)
bpy.utils.unregister_class(CONSOLE_HT_icons)

bpy.utils.unregister_module(__name__)


Expand Down
2 changes: 0 additions & 2 deletions mesh_looptools.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#
# ##### END GPL LICENSE BLOCK #####

# <pep8 compliant>

bl_info = {
'name': "LoopTools",
'author': "Bart Crouch",
Expand Down
19 changes: 9 additions & 10 deletions render_povray/render.py
Original file line number Diff line number Diff line change
Expand Up @@ -1647,61 +1647,60 @@ def _render(self, scene):
self._process = subprocess.Popen([pov_binary, self._temp_file_ini] + extra_args)
# This would work too but means we have to wait until its done:
# os.system("%s %s" % (pov_binary, self._temp_file_ini))

except OSError:
# someone might run povray 32 bits on a 64 bits blender machine
try:
pov_binary = winreg.QueryValueEx(regKey, "Home")[0] + "\\bin\\pvengine"
self._process = subprocess.Popen([pov_binary, self._temp_file_ini] + extra_args)

except OSError:
# TODO, report api
print("POV-Ray 3.7: could not execute '%s', possibly POV-Ray isn't installed" % pov_binary)
import traceback
traceback.print_exc()
print ("***-DONE-***")
return False

else:
print("POV-Ray 3.7 64 bits could not execute, running 32 bits instead")
print("Command line arguments passed: " + str(extra_args))
return True

else:
print("POV-Ray 3.7 64 bits found")
print("Command line arguments passed: " + str(extra_args))
return True

#32 bits blender
else:
try:
pov_binary = winreg.QueryValueEx(regKey, "Home")[0] + "\\bin\\pvengine"
self._process = subprocess.Popen([pov_binary, self._temp_file_ini] + extra_args)

# someone might also run povray 64 bits with a 32 bits build of blender.
except OSError:
try:
pov_binary = winreg.QueryValueEx(regKey, "Home")[0] + "\\bin\\pvengine64"
self._process = subprocess.Popen([pov_binary, self._temp_file_ini] + extra_args)

except OSError:
# TODO, report api
print("POV-Ray 3.7: could not execute '%s', possibly POV-Ray isn't installed" % pov_binary)
import traceback
traceback.print_exc()
print ("***-DONE-***")
return False

else:
print("Running POV-Ray 3.7 64 bits build with 32 bits Blender, \nYou might want to run Blender 64 bits as well.")
print("Command line arguments passed: " + str(extra_args))
return True

else:
print("POV-Ray 3.7 32 bits found")
print("Command line arguments passed: " + str(extra_args))
return True


else:
# DH - added -d option to prevent render window popup which leads to segfault on linux
Expand Down

0 comments on commit d944bc5

Please sign in to comment.