[Bf-extensions-cvs] [16c87dcf] master: Cleanup: formatting using autopep8
Germano Cavalcante
noreply at git.blender.org
Wed Apr 20 01:04:01 CEST 2022
Commit: 16c87dcfb5a79d64abae31c5a8371d87c0ae6321
Author: Germano Cavalcante
Date: Tue Apr 19 19:37:01 2022 -0300
Branches: master
https://developer.blender.org/rBA16c87dcfb5a79d64abae31c5a8371d87c0ae6321
Cleanup: formatting using autopep8
===================================================================
M mesh_snap_utilities_line/__init__.py
M mesh_snap_utilities_line/common_classes.py
M mesh_snap_utilities_line/common_utilities.py
M mesh_snap_utilities_line/drawing_utilities.py
M mesh_snap_utilities_line/keys.py
M mesh_snap_utilities_line/navigation_ops.py
M mesh_snap_utilities_line/op_line.py
M mesh_snap_utilities_line/preferences.py
M mesh_snap_utilities_line/widgets.py
===================================================================
diff --git a/mesh_snap_utilities_line/__init__.py b/mesh_snap_utilities_line/__init__.py
index c424a342..df73dd80 100644
--- a/mesh_snap_utilities_line/__init__.py
+++ b/mesh_snap_utilities_line/__init__.py
@@ -10,7 +10,7 @@ bl_info = {
"blender": (3, 2, 0),
"location": "View3D > TOOLS > Line Tool",
"description": "Extends Blender Snap controls",
- "doc_url" : "{BLENDER_MANUAL_URL}/addons/mesh/snap_utilities_line.html",
+ "doc_url": "{BLENDER_MANUAL_URL}/addons/mesh/snap_utilities_line.html",
"category": "Mesh",
}
@@ -28,15 +28,19 @@ else:
from . import op_line
from . import keys
+# autopep8: off
import bpy
from bpy.utils.toolsystem import ToolDef
+# autopep8: on
if not __package__:
__package__ = "mesh_snap_utilities_line"
+
@ToolDef.from_fn
def tool_line():
import os
+
def draw_settings(context, layout, tool):
addon_prefs = context.preferences.addons[__package__].preferences
@@ -60,7 +64,7 @@ def tool_line():
),
icon=os.path.join(icons_dir, "ops.mesh.snap_utilities_line"),
widget="MESH_GGT_snap_point",
- #operator="mesh.snap_utilities_line",
+ # operator="mesh.snap_utilities_line",
keymap=keys.km_tool_snap_utilities_line,
draw_settings=draw_settings,
)
@@ -91,7 +95,7 @@ def register_snap_tools():
def unregister_snap_tools():
tools = get_tool_list('VIEW_3D', 'EDIT_MESH')
- index = tools.index(tool_line) - 1 #None
+ index = tools.index(tool_line) - 1 # None
tools.pop(index)
tools.remove(tool_line)
@@ -109,11 +113,15 @@ def register_keymaps():
# TODO: find the user defined tool_mouse.
from bl_keymap_utils.io import keyconfig_init_from_data
- keyconfig_init_from_data(kc_defaultconf, keys.generate_empty_snap_utilities_tools_keymaps())
- keyconfig_init_from_data(kc_addonconf, keys.generate_snap_utilities_keymaps())
+ keyconfig_init_from_data(
+ kc_defaultconf, keys.generate_empty_snap_utilities_tools_keymaps())
+ keyconfig_init_from_data(
+ kc_addonconf, keys.generate_snap_utilities_keymaps())
#snap_modalkeymap = kc_addonconf.keymaps.find(keys.km_snap_utilities_modal_keymap)
- #snap_modalkeymap.assign("MESH_OT_snap_utilities_line")
+ # snap_modalkeymap.assign("MESH_OT_snap_utilities_line")
+
+
def unregister_keymaps():
keyconfigs = bpy.context.window_manager.keyconfigs
defaultmap = getattr(keyconfigs.get("Blender"), "keymaps", None)
@@ -152,6 +160,7 @@ classes = (
widgets.SnapPointWidgetGroup,
)
+
def register():
for cls in classes:
bpy.utils.register_class(cls)
diff --git a/mesh_snap_utilities_line/common_classes.py b/mesh_snap_utilities_line/common_classes.py
index 274c8f35..990f1e46 100644
--- a/mesh_snap_utilities_line/common_classes.py
+++ b/mesh_snap_utilities_line/common_classes.py
@@ -5,14 +5,14 @@ import bpy
from mathutils import (
Vector,
Matrix,
- )
+)
from mathutils.geometry import intersect_point_line
from .drawing_utilities import SnapDrawn
from .common_utilities import (
convert_distance,
get_units_info,
location_3d_to_region_2d,
- )
+)
class SnapNavigation():
@@ -26,7 +26,6 @@ class SnapNavigation():
'_ndof_orbit_zoom',
'_ndof_pan')
-
@staticmethod
def debug_key(key):
for member in dir(key):
@@ -53,34 +52,44 @@ class SnapNavigation():
for key in context.window_manager.keyconfigs.user.keymaps['3D View'].keymap_items:
if key.idname == 'view3d.rotate':
- self._rotate.add((self.convert_to_flag(key.shift, key.ctrl, key.alt), key.type, key.value))
+ self._rotate.add((self.convert_to_flag(
+ key.shift, key.ctrl, key.alt), key.type, key.value))
elif key.idname == 'view3d.move':
- self._move.add((self.convert_to_flag(key.shift, key.ctrl, key.alt), key.type, key.value))
+ self._move.add((self.convert_to_flag(
+ key.shift, key.ctrl, key.alt), key.type, key.value))
elif key.idname == 'view3d.zoom':
if key.type == 'WHEELINMOUSE':
- self._zoom.add((self.convert_to_flag(key.shift, key.ctrl, key.alt), 'WHEELUPMOUSE', key.value, key.properties.delta))
+ self._zoom.add((self.convert_to_flag(
+ key.shift, key.ctrl, key.alt), 'WHEELUPMOUSE', key.value, key.properties.delta))
elif key.type == 'WHEELOUTMOUSE':
- self._zoom.add((self.convert_to_flag(key.shift, key.ctrl, key.alt), 'WHEELDOWNMOUSE', key.value, key.properties.delta))
+ self._zoom.add((self.convert_to_flag(
+ key.shift, key.ctrl, key.alt), 'WHEELDOWNMOUSE', key.value, key.properties.delta))
else:
- self._zoom.add((self.convert_to_flag(key.shift, key.ctrl, key.alt), key.type, key.value, key.properties.delta))
+ self._zoom.add((self.convert_to_flag(
+ key.shift, key.ctrl, key.alt), key.type, key.value, key.properties.delta))
elif self.use_ndof:
if key.idname == 'view3d.ndof_all':
- self._ndof_all.add((self.convert_to_flag(key.shift, key.ctrl, key.alt), key.type))
+ self._ndof_all.add((self.convert_to_flag(
+ key.shift, key.ctrl, key.alt), key.type))
elif key.idname == 'view3d.ndof_orbit':
- self._ndof_orbit.add((self.convert_to_flag(key.shift, key.ctrl, key.alt), key.type))
+ self._ndof_orbit.add((self.convert_to_flag(
+ key.shift, key.ctrl, key.alt), key.type))
elif key.idname == 'view3d.ndof_orbit_zoom':
- self._ndof_orbit_zoom.add((self.convert_to_flag(key.shift, key.ctrl, key.alt), key.type))
+ self._ndof_orbit_zoom.add(
+ (self.convert_to_flag(key.shift, key.ctrl, key.alt), key.type))
elif key.idname == 'view3d.ndof_pan':
- self._ndof_pan.add((self.convert_to_flag(key.shift, key.ctrl, key.alt), key.type))
-
+ self._ndof_pan.add((self.convert_to_flag(
+ key.shift, key.ctrl, key.alt), key.type))
def run(self, context, event, snap_location):
- evkey = (self.convert_to_flag(event.shift, event.ctrl, event.alt), event.type, event.value)
+ evkey = (self.convert_to_flag(event.shift, event.ctrl,
+ event.alt), event.type, event.value)
if evkey in self._rotate:
if snap_location:
- bpy.ops.view3d.rotate_custom_pivot('INVOKE_DEFAULT', pivot=snap_location)
+ bpy.ops.view3d.rotate_custom_pivot(
+ 'INVOKE_DEFAULT', pivot=snap_location)
else:
bpy.ops.view3d.rotate('INVOKE_DEFAULT', use_cursor_init=True)
return True
@@ -93,7 +102,8 @@ class SnapNavigation():
if evkey == key[0:3]:
if key[3]:
if snap_location:
- bpy.ops.view3d.zoom_custom_target('INVOKE_DEFAULT', delta=key[3], target=snap_location)
+ bpy.ops.view3d.zoom_custom_target(
+ 'INVOKE_DEFAULT', delta=key[3], target=snap_location)
else:
bpy.ops.view3d.zoom('INVOKE_DEFAULT', delta=key[3])
else:
@@ -132,11 +142,11 @@ class CharMap:
"c", "m", "d", "k", "h", "a",
" ", "/", "*", "'", "\""
# "="
- }
+ }
type = {
'BACK_SPACE', 'DEL',
'LEFT_ARROW', 'RIGHT_ARROW'
- }
+ }
def __init__(self, context):
scale = context.scene.unit_settings.scale_length
@@ -155,28 +165,34 @@ class CharMap:
pos = self.line_pos
if ascii == ",":
ascii = "."
- self.length_entered = self.length_entered[:pos] + ascii + self.length_entered[pos:]
+ self.length_entered = self.length_entered[:pos] + \
+ ascii + self.length_entered[pos:]
self.line_pos += 1
if self.length_entered:
pos = self.line_pos
if type == 'BACK_SPACE':
- self.length_entered = self.length_entered[:pos - 1] + self.length_entered[pos:]
+ self.length_entered = self.length_entered[:pos -
+ 1] + self.length_entered[pos:]
self.line_pos -= 1
elif type == 'DEL':
- self.length_entered = self.length_entered[:pos] + self.length_entered[pos + 1:]
+ self.length_entered = self.length_entered[:pos] + \
+ self.length_entered[pos + 1:]
elif type == 'LEFT_ARROW':
- self.line_pos = (pos - 1) % (len(self.length_entered) + 1)
+ self.line_pos = (
+ pos - 1) % (len(self.length_entered) + 1)
elif type == 'RIGHT_ARROW':
- self.line_pos = (pos + 1) % (len(self.length_entered) + 1)
+ self.line_pos = (
+ pos + 1) % (len(self.length_entered) + 1)
try:
- self.length_entered_value = bpy.utils.units.to_value(self.unit_system, 'LENGTH', self.length_entered)
+ self.length_entered_value = bpy.utils.units.to_value(
+ self.unit_system, 'LENGTH', self.length_entered)
except: # ValueError:
- self.length_entered_value = 0.0 #invalid
+ self.length_entered_value = 0.0 # invalid
#self.report({'INFO'}, "Operation not supported yet")
else:
self.length_entered_value = 0.0
@@ -236,7 +25
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list