[Bf-extensions-cvs] [5f55d72] master: Cleanup: style, pep8

Campbell Barton noreply at git.blender.org
Tue Jul 26 06:21:40 CEST 2016


Commit: 5f55d725565335ae74e2467cc0f676135f8b2a65
Author: Campbell Barton
Date:   Tue Jul 26 14:17:16 2016 +1000
Branches: master
https://developer.blender.org/rBAC5f55d725565335ae74e2467cc0f676135f8b2a65

Cleanup: style, pep8

===================================================================

M	mesh_1d_scripts.py

===================================================================

diff --git a/mesh_1d_scripts.py b/mesh_1d_scripts.py
index 1c856de..f5378c5 100644
--- a/mesh_1d_scripts.py
+++ b/mesh_1d_scripts.py
@@ -28,20 +28,28 @@ bl_info = {
     "category": "Mesh"
 }
 
-# http://dl.dropboxusercontent.com/u/59609328/Blender-Rus/1D_Scripts.py
 
-import bpy,bmesh, mathutils, math
+import bpy
+import bmesh
+import mathutils
+import math
 from mathutils import Vector, Matrix
-from mathutils.geometry import intersect_line_plane, intersect_point_line, intersect_line_line
+from mathutils.geometry import (
+        intersect_line_plane,
+        intersect_point_line,
+        intersect_line_line,
+        )
 from math import sin, cos, pi, sqrt, degrees, tan, radians
-import os, urllib
-from bpy.props import (BoolProperty,
-                       FloatProperty,
-                       StringProperty,
-                       EnumProperty,
-                       IntProperty,
-                       CollectionProperty
-                       )
+import os
+import urllib
+from bpy.props import (
+        BoolProperty,
+        FloatProperty,
+        StringProperty,
+        EnumProperty,
+        IntProperty,
+        CollectionProperty
+        )
 from bpy_extras.io_utils import ExportHelper, ImportHelper
 from bpy.types import Operator
 import time
@@ -73,10 +81,14 @@ def a_rot(ang, rp, axis, q):
     return tmp2
 
 # ------ ------
+
+
 class f_buf():
     an = 0
 
 # ------ ------
+
+
 def f_edgefillet(bme, list_0, adj, n, radius, out, flip):
     check_lukap(bme)
 
@@ -159,16 +171,17 @@ def f_edgefillet(bme, list_0, adj, n, radius, out, flip):
     bme.verts.index_update()
     check_lukap(bme)
 
+
 class f_op0(bpy.types.Operator):
     bl_idname = 'f.op0_id'
     bl_label = 'Edge Fillet'
     bl_options = {'REGISTER', 'UNDO'}
 
-    adj = FloatProperty( name = '', default = 0.1, min = 0.00001, max = 100.0, step = 1, precision = 3 )
-    n = IntProperty( name = '', default = 3, min = 1, max = 100, step = 1 )
-    out = BoolProperty( name = 'Outside', default = False )
-    flip = BoolProperty( name = 'Flip', default = False )
-    radius = BoolProperty( name = 'Radius', default = False )
+    adj = FloatProperty(name='', default=0.1, min=0.00001, max=100.0, step=1, precision=3)
+    n = IntProperty(name='', default=3, min=1, max=100, step=1)
+    out = BoolProperty(name='Outside', default=False)
+    flip = BoolProperty(name='Flip', default=False)
+    radius = BoolProperty(name='Radius', default=False)
 
     def draw(self, context):
         layout = self.layout
@@ -180,19 +193,19 @@ class f_op0(bpy.types.Operator):
         else:
             box = layout.box()
             box.prop(self, 'radius')
-            row = box.split(0.35, align = True)
+            row = box.split(0.35, align=True)
 
             if self.radius == True:
                 row.label('Radius:')
             elif self.radius == False:
                 row.label('Distance:')
             row.prop(self, 'adj')
-            row1 = box.split(0.55, align = True)
+            row1 = box.split(0.55, align=True)
             row1.label('Number of sides:')
-            row1.prop(self, 'n', slider = True)
+            row1.prop(self, 'n', slider=True)
 
             if self.n > 1:
-                row2 = box.split(0.50, align = True)
+                row2 = box.split(0.50, align=True)
                 row2.prop(self, 'out')
                 if self.out == False:
                     row2.prop(self, 'flip')
@@ -214,10 +227,10 @@ class f_op0(bpy.types.Operator):
         if not list_0:
             list_v = [v.index for v in bme.verts if v.select and v.is_valid]
 
-        if not list_0 and len(list_v)==1:
+        if not list_0 and len(list_v) == 1:
             connected_edges = bme.verts[list_v[0]].link_edges
-            list_1 = [[v.index for v in e.verts ] for e in connected_edges if e.is_valid]
-            if len(list_1)!=2:
+            list_1 = [[v.index for v in e.verts] for e in connected_edges if e.is_valid]
+            if len(list_1) != 2:
                 self.report({'INFO'}, 'Two adjacent edges or single vert must be selected.')
                 edit_mode_in()
                 return {'CANCELLED'}
@@ -237,30 +250,36 @@ class f_op0(bpy.types.Operator):
 
         bme.to_mesh(ob_act.data)
         edit_mode_in()
-        bpy.ops.mesh.select_all(action = 'DESELECT')
+        bpy.ops.mesh.select_all(action='DESELECT')
         return {'FINISHED'}
 
 
-
 #----- Module: extrude along path -------
 # author this module: Zmj100
 # version 0.5.0.9
 # ref: http://blenderartists.org/forum/showthread.php?179375-Addon-Edge-fillet-and-other-bmesh-tools-Update-Jan-11
 
 def edit_mode_out():
-    bpy.ops.object.mode_set(mode = 'OBJECT')
+    bpy.ops.object.mode_set(mode='OBJECT')
+
 
 def edit_mode_in():
-    bpy.ops.object.mode_set(mode = 'EDIT')
+    bpy.ops.object.mode_set(mode='EDIT')
+
 
 def get_adj_v_(list_):
-        tmp = {}
-        for i in list_:
-                try:             tmp[i[0]].append(i[1])
-                except KeyError: tmp[i[0]] = [i[1]]
-                try:             tmp[i[1]].append(i[0])
-                except KeyError: tmp[i[1]] = [i[0]]
-        return tmp
+    tmp = {}
+    for i in list_:
+        try:
+            tmp[i[0]].append(i[1])
+        except KeyError:
+            tmp[i[0]] = [i[1]]
+        try:
+            tmp[i[1]].append(i[0])
+        except KeyError:
+            tmp[i[1]] = [i[0]]
+    return tmp
+
 
 def f_1(frst, list_, last):      # edge chain
     fi = frst
@@ -279,6 +298,7 @@ def f_1(frst, list_, last):      # edge chain
             break
     return tmp
 
+
 def f_2(frst, list_):      # edge loop
     fi = frst
     tmp = [frst]
@@ -296,9 +316,11 @@ def f_2(frst, list_):      # edge loop
             break
     return tmp
 
+
 def is_loop_(list_fl):
     return True if len(list_fl) == 0 else False
 
+
 def e_no_(bme, indx, p, p1):
     if hasattr(bme.verts, "ensure_lookup_table"):
         bme.verts.ensure_lookup_table()
@@ -306,19 +328,22 @@ def e_no_(bme, indx, p, p1):
     tmp1[0] += 0.1
     tmp1[1] += 0.1
     tmp1[2] += 0.1
-    ip1 = intersect_point_line( tmp1, p, p1)[0]
+    ip1 = intersect_point_line(tmp1, p, p1)[0]
     return tmp1 - ip1
 
 # ------ ------
+
+
 def f_(bme, dict_0, list_fl, loop):
     check_lukap(bme)
     if loop:
         list_1 = f_2(eap_buf.list_sp[0], eap_buf.list_ek)
         del list_1[-1]
     else:
-        list_1 = f_1(eap_buf.list_sp[0], eap_buf.list_ek, list_fl[1] if eap_buf.list_sp[0] == list_fl[0] else list_fl[0])
+        list_1 = f_1(eap_buf.list_sp[0], eap_buf.list_ek, list_fl[1]
+                     if eap_buf.list_sp[0] == list_fl[0] else list_fl[0])
 
-    list_2 = [ v.index for v in bme.verts if v.select and v.is_valid ]
+    list_2 = [v.index for v in bme.verts if v.select and v.is_valid]
     n1 = len(list_2)
 
     list_3 = list_2[:]
@@ -327,8 +352,6 @@ def f_(bme, dict_0, list_fl, loop):
     for k in list_2:
         dict_1[k] = [k]
 
-
-
     n = len(list_1)
     for i in range(n):
         p = (bme.verts[list_1[i]].co).copy()
@@ -362,7 +385,8 @@ def f_(bme, dict_0, list_fl, loop):
             if i == 0:
                 pass
             elif i == (n - 1):
-                pp_ = p - ((e_no_(bme, list_fl[1] if eap_buf.list_sp[0] == list_fl[0] else list_fl[0], p, p1)).normalized() * 0.1)
+                pp_ = p - ((e_no_(bme, list_fl[1] if eap_buf.list_sp[0] ==
+                                  list_fl[0] else list_fl[0], p, p1)).normalized() * 0.1)
                 pn_ = vec1.normalized()
                 for j in range(n1):
                     v = (bme.verts[list_3[j]].co).copy()
@@ -382,22 +406,31 @@ def f_(bme, dict_0, list_fl, loop):
                     dict_1[list_2[j]].append(bme.verts[-1].index)
 
     # -- -- -- --
-    list_4 = [[v.index for v in e.verts] for e in bme.edges if e.select and e.is_valid ]
+    list_4 = [[v.index for v in e.verts] for e in bme.edges if e.select and e.is_valid]
     n2 = len(list_4)
 
     for t in range(n2):
         for o in range(n if loop else (n - 1)):
-            bme.faces.new([bme.verts[dict_1[list_4[t][0]][o]], bme.verts[dict_1[list_4[t][1]][o]], bme.verts[dict_1[list_4[t][1]][(o + 1) % n]], bme.verts[dict_1[list_4[t][0]][(o + 1) % n]]])
+            bme.faces.new(
+                    [bme.verts[dict_1[list_4[t][0]][o]],
+                     bme.verts[dict_1[list_4[t][1]][o]],
+                     bme.verts[dict_1[list_4[t][1]][(o + 1) % n]],
+                     bme.verts[dict_1[list_4[t][0]][(o + 1) % n]],
+                     ])
             bme.faces.index_update()
             if hasattr(bme.faces, "ensure_lookup_table"):
                 bme.faces.ensure_lookup_table()
 
 # ------ ------
+
+
 class eap_buf():
     list_ek = []      # path
     list_sp = []      # start point
 
 # ------ operator 0 ------
+
+
 class eap_op0(bpy.types.Operator):
     bl_idname = 'eap.op0_id'
     bl_label = '....'
@@ -419,6 +452,8 @@ class eap_op0(bpy.types.Operator):
         return {'FINISHED'}
 
 # ------ operator 1 ------
+
+
 class eap_op1(bpy.types.Operator):
     bl_idname = 'eap.op1_id'
     bl_label = '....'
@@ -440,6 +475,8 @@ class eap_op1(bpy.types.Operator):
         return {'FINISHED'}
 
 # ------ operator 2 ------
+
+
 class eap_op2(bpy.types.Operator):
     bl_idname = 'eap.op2_id'
     bl_label = 'Extrude Along Path'
@@ -466,6 +503,8 @@ class eap_op2(bpy.types.Operator):
         return {'FINISHED'}
 
 #------ operator 3 ------
+
+
 class eap_op3(bpy.types.Operator):
     bl_idname = 'eap.op3_id'
     bl_label = '.......'
@@ -477,7 +516,7 @@ class eap_op3(bpy.types.Operator):
         bme.from_mesh(ob_act.data)
         check_lukap(bme)
         av = bm_vert_active_get(bme)
-        if av[1]=='V':
+        if av[1] == 'V':
             eap_buf.list_sp[:] = []
             v = bme.verts[av[0]]
             if v.select and v.is_valid:
@@ -495,7 +534,7 @@ class eap_op3(bpy.types.Operator):
 def find_index_of_selected_vertex(mesh):
     selected_verts = [i.index for i in mesh.vertices if i.select]
     verts_selected = len(selected_verts)
-    if verts_selected <1:
+    if verts_selected < 1:
         return None
     else:
         return selected_verts
@@ -514,8 +553,8 @@ def find_ext

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list