From f476cfdd3149e75d7ee40887230339b927d52da9 Mon Sep 17 00:00:00 2001 From: Antonioya Date: Tue, 9 Aug 2016 13:45:46 +0200 Subject: Archimesh: Cleanup - Replace generic import Replace generic import by the list of used functions or types --- archimesh/achm_window_panel.py | 310 +++++++++++++++++++++-------------------- 1 file changed, 156 insertions(+), 154 deletions(-) (limited to 'archimesh/achm_window_panel.py') diff --git a/archimesh/achm_window_panel.py b/archimesh/achm_window_panel.py index 4c5e5dd0..27f0dd6f 100644 --- a/archimesh/achm_window_panel.py +++ b/archimesh/achm_window_panel.py @@ -28,9 +28,11 @@ # ---------------------------------------------------------- # noinspection PyUnresolvedReferences import bpy -import math -# noinspection PyUnresolvedReferences -import mathutils +from math import cos, sin, radians, sqrt, pi +from mathutils import Vector +from bpy.types import Operator, PropertyGroup, Object, Panel +from bpy.props import StringProperty, FloatProperty, BoolProperty, IntProperty, FloatVectorProperty, \ + CollectionProperty, EnumProperty from .achm_tools import * @@ -194,7 +196,7 @@ def set_defaults(s): # ------------------------------------------------------------------ # Define operator class to create window panels # ------------------------------------------------------------------ -class AchmWinPanel(bpy.types.Operator): +class AchmWinPanel(Operator): bl_idname = "mesh.archimesh_winpanel" bl_label = "Panel Window" bl_description = "Generate editable flat windows" @@ -380,7 +382,7 @@ def do_ctrl_box(myobject): parentobject(myempty, myobject) myobject["archimesh.hole_enable"] = True # Rotate Empty - myempty.rotation_euler.z = math.radians(op.r) + myempty.rotation_euler.z = radians(op.r) # Create control box to open wall holes myctrl = create_ctrl_box(myobject, "CTRL_Hole") @@ -679,16 +681,16 @@ def generate_vertex_data(op, myvertex, myfaces): if h1 < 0.07: h1 = 0.07 - h = math.sqrt(u ** 2 + h1 ** 2) / 2 + h = sqrt(u ** 2 + h1 ** 2) / 2 e = h * (u / h1) - c = math.sqrt(h ** 2 + e ** 2) + c = sqrt(h ** 2 + e ** 2) t1 = zlist[-1] - h1 elif op.DT2 == '2': c = op.VL2 / 100 if c < u + 0.01: c = u + 0.01 # op.VL2 = c * 100 - t1 = math.sqrt(c ** 2 - u ** 2) + zlist[-1] - c + t1 = sqrt(c ** 2 - u ** 2) + zlist[-1] - c r = c - k1 z = zlist[-1] - c @@ -697,15 +699,15 @@ def generate_vertex_data(op, myvertex, myfaces): myvertex[son[0]][2] = t1 myvertex[son[1]][2] = t1 for i in alt: - myvertex[i][2] = math.sqrt(r ** 2 - myvertex[i][0] ** 2) + z + myvertex[i][2] = sqrt(r ** 2 - myvertex[i][0] ** 2) + z on = [son[0]] u1 = [] for i in range(0, res): - a = i * math.pi / res - x = math.cos(a) * c + a = i * pi / res + x = cos(a) * c if -u < x < u: - myvertex.append([x, -k1 / 2, math.sin(a) * c + z]) + myvertex.append([x, -k1 / 2, sin(a) * c + z]) on.append(len(myvertex) - 1) u1.extend(on) u1.append(ust[0]) @@ -721,10 +723,10 @@ def generate_vertex_data(op, myvertex, myfaces): t1 = [alt[i + 0]] t2 = [alt[i + 1]] for j in range(0, res): - a = j * math.pi / res - x = -math.cos(a) * r + a = j * pi / res + x = -cos(a) * r if x1 < x < x2: - myvertex.extend([[x, -k1 / 2, math.sin(a) * r + z], [x, k1 / 2, math.sin(a) * r + z]]) + myvertex.extend([[x, -k1 / 2, sin(a) * r + z], [x, k1 / 2, sin(a) * r + z]]) on.append(len(myvertex) - 2) ar.append(len(myvertex) - 1) t1.append(len(myvertex) - 2) @@ -738,10 +740,10 @@ def generate_vertex_data(op, myvertex, myfaces): ar.append(son[1]) u2 = [son[1]] for i in range(0, res): - a = i * math.pi / res - x = math.cos(a) * c + a = i * pi / res + x = cos(a) * c if -u < x < u: - myvertex.append([x, k1 / 2, math.sin(a) * c + z]) + myvertex.append([x, k1 / 2, sin(a) * c + z]) ar.append(len(myvertex) - 1) u2.append(len(myvertex) - 1) ar.append(ust[1]) @@ -790,31 +792,31 @@ def generate_vertex_data(op, myvertex, myfaces): [[n - 8, n - 7, n - 3, n - 4], [n - 7, n - 6, n - 2, n - 3], [n - 6, n - 5, n - 1, n - 2], [n - 5, n - 8, n - 4, n - 1]]) alt = [n - 16, n - 15, n - 14, n - 13, n - 4, n - 3, n - 2, n - 1] - myvertex[alt[0]][2] = math.sqrt(r ** 2 - myvertex[alt[0]][0] ** 2) + z - myvertex[alt[1]][2] = math.sqrt(k ** 2 - myvertex[alt[1]][0] ** 2) + z - myvertex[alt[2]][2] = math.sqrt(k ** 2 - myvertex[alt[2]][0] ** 2) + z - myvertex[alt[3]][2] = math.sqrt(r ** 2 - myvertex[alt[3]][0] ** 2) + z - myvertex[alt[4]][2] = math.sqrt(r ** 2 - myvertex[alt[4]][0] ** 2) + z - myvertex[alt[5]][2] = math.sqrt(k ** 2 - myvertex[alt[5]][0] ** 2) + z - myvertex[alt[6]][2] = math.sqrt(k ** 2 - myvertex[alt[6]][0] ** 2) + z - myvertex[alt[7]][2] = math.sqrt(r ** 2 - myvertex[alt[7]][0] ** 2) + z + myvertex[alt[0]][2] = sqrt(r ** 2 - myvertex[alt[0]][0] ** 2) + z + myvertex[alt[1]][2] = sqrt(k ** 2 - myvertex[alt[1]][0] ** 2) + z + myvertex[alt[2]][2] = sqrt(k ** 2 - myvertex[alt[2]][0] ** 2) + z + myvertex[alt[3]][2] = sqrt(r ** 2 - myvertex[alt[3]][0] ** 2) + z + myvertex[alt[4]][2] = sqrt(r ** 2 - myvertex[alt[4]][0] ** 2) + z + myvertex[alt[5]][2] = sqrt(k ** 2 - myvertex[alt[5]][0] ** 2) + z + myvertex[alt[6]][2] = sqrt(k ** 2 - myvertex[alt[6]][0] ** 2) + z + myvertex[alt[7]][2] = sqrt(r ** 2 - myvertex[alt[7]][0] ** 2) + z d1 = [] d2 = [] t1 = [] t2 = [] for i in range(0, res): - a = i * math.pi / res - y1 = math.cos(a) * r - y2 = -math.cos(a) * k + a = i * pi / res + y1 = cos(a) * r + y2 = -cos(a) * k if x1 < y1 < x2: - myvertex.extend([[y1, fr - k2 / 2, math.sin(a) * r + z], [y1, fr + k2 / 2, - math.sin(a) * r + z]]) + myvertex.extend([[y1, fr - k2 / 2, sin(a) * r + z], [y1, fr + k2 / 2, + sin(a) * r + z]]) t1.append(len(myvertex) - 2) t2.append(len(myvertex) - 1) if x1 + k2 < y2 < x2 - k2: - myvertex.extend([[y2, fr - k2 / 2, math.sin(a) * k + z], [y2, fr + k2 / 2, - math.sin(a) * k + z]]) + myvertex.extend([[y2, fr - k2 / 2, sin(a) * k + z], [y2, fr + k2 / 2, + sin(a) * k + z]]) d1.append(len(myvertex) - 2) d2.append(len(myvertex) - 1) on = [alt[1], alt[0]] @@ -887,29 +889,29 @@ def generate_vertex_data(op, myvertex, myfaces): m = len(myfaces) ftl.extend([m - 1, m - 2, m - 3, m - 4, m - 5, m - 6, m - 7, m - 8, m - 9]) alt = [n - 16, n - 15, n - 14, n - 13, n - 4, n - 3, n - 2, n - 1] - myvertex[alt[0]][2] = math.sqrt(r ** 2 - myvertex[alt[0]][0] ** 2) + z - myvertex[alt[1]][2] = math.sqrt(k ** 2 - myvertex[alt[1]][0] ** 2) + z - myvertex[alt[2]][2] = math.sqrt(k ** 2 - myvertex[alt[2]][0] ** 2) + z - myvertex[alt[3]][2] = math.sqrt(r ** 2 - myvertex[alt[3]][0] ** 2) + z - myvertex[alt[4]][2] = math.sqrt(r ** 2 - myvertex[alt[4]][0] ** 2) + z - myvertex[alt[5]][2] = math.sqrt(k ** 2 - myvertex[alt[5]][0] ** 2) + z - myvertex[alt[6]][2] = math.sqrt(k ** 2 - myvertex[alt[6]][0] ** 2) + z - myvertex[alt[7]][2] = math.sqrt(r ** 2 - myvertex[alt[7]][0] ** 2) + z + myvertex[alt[0]][2] = sqrt(r ** 2 - myvertex[alt[0]][0] ** 2) + z + myvertex[alt[1]][2] = sqrt(k ** 2 - myvertex[alt[1]][0] ** 2) + z + myvertex[alt[2]][2] = sqrt(k ** 2 - myvertex[alt[2]][0] ** 2) + z + myvertex[alt[3]][2] = sqrt(r ** 2 - myvertex[alt[3]][0] ** 2) + z + myvertex[alt[4]][2] = sqrt(r ** 2 - myvertex[alt[4]][0] ** 2) + z + myvertex[alt[5]][2] = sqrt(k ** 2 - myvertex[alt[5]][0] ** 2) + z + myvertex[alt[6]][2] = sqrt(k ** 2 - myvertex[alt[6]][0] ** 2) + z + myvertex[alt[7]][2] = sqrt(r ** 2 - myvertex[alt[7]][0] ** 2) + z d1 = [] d2 = [] t1 = [] t2 = [] for i in range(0, res): - a = i * math.pi / res - y1 = math.cos(a) * r - y2 = -math.cos(a) * k + a = i * pi / res + y1 = cos(a) * r + y2 = -cos(a) * k if x1 < y1 < x2: - myvertex.extend([[y1, fr - k3, math.sin(a) * r + z], [y1, fr + k3, math.sin(a) * r + z]]) + myvertex.extend([[y1, fr - k3, sin(a) * r + z], [y1, fr + k3, sin(a) * r + z]]) t1.append(len(myvertex) - 2) t2.append(len(myvertex) - 1) ftl.extend([len(myfaces) - 1, len(myfaces) - 2]) if x1 + k3 * 2 < y2 < x2 - k3 * 2: - myvertex.extend([[y2, fr - k3, math.sin(a) * k + z], [y2, fr + k3, math.sin(a) * k + z]]) + myvertex.extend([[y2, fr - k3, sin(a) * k + z], [y2, fr + k3, sin(a) * k + z]]) d1.append(len(myvertex) - 2) d2.append(len(myvertex) - 1) ftl.extend([len(myfaces) - 1, len(myfaces) - 2]) @@ -944,21 +946,21 @@ def generate_vertex_data(op, myvertex, myfaces): on = [] ar = [] for i in range(0, res): - a = i * math.pi / res - y1 = -math.cos(a) * k + a = i * pi / res + y1 = -cos(a) * k if x1 < y1 < x2: - myvertex.extend([[y1, fr - 0.005, math.sin(a) * k + z], [y1, fr + 0.005, math.sin(a) * k + z]]) + myvertex.extend([[y1, fr - 0.005, sin(a) * k + z], [y1, fr + 0.005, sin(a) * k + z]]) n = len(myvertex) on.append(n - 1) ar.append(n - 2) myvertex.extend( - [[x1, fr - 0.005, math.sqrt(k ** 2 - x1 ** 2) + z], [x1, fr + 0.005, - math.sqrt(k ** 2 - x1 ** 2) + z]]) + [[x1, fr - 0.005, sqrt(k ** 2 - x1 ** 2) + z], [x1, fr + 0.005, + sqrt(k ** 2 - x1 ** 2) + z]]) myvertex.extend([[x1, fr - 0.005, zlist[-3] + ek + k3 * 2], [x1, fr + 0.005, zlist[-3] + ek + k3 * 2]]) myvertex.extend([[x2, fr - 0.005, zlist[-3] + ek + k3 * 2], [x2, fr + 0.005, zlist[-3] + ek + k3 * 2]]) myvertex.extend( - [[x2, fr - 0.005, math.sqrt(k ** 2 - x2 ** 2) + z], [x2, fr + 0.005, - math.sqrt(k ** 2 - x2 ** 2) + z]]) + [[x2, fr - 0.005, sqrt(k ** 2 - x2 ** 2) + z], [x2, fr + 0.005, + sqrt(k ** 2 - x2 ** 2) + z]]) n = len(myvertex) on.extend([n - 1, n - 3, n - 5, n - 7]) ar.extend([n - 2, n - 4, n - 6, n - 8]) @@ -974,10 +976,10 @@ def generate_vertex_data(op, myvertex, myfaces): elif op.DT3 == '2': h1 = op.VL3 / 100 elif op.DT3 == '3': - h1 = math.sin(op.VL4 * math.pi / 180) / math.cos(op.VL4 * math.pi / 180) - z = math.sqrt(k1 ** 2 + (k1 * h1) ** 2) - k = math.sqrt(k2 ** 2 + (k2 * h1) ** 2) - f = math.sqrt(k3 ** 2 + (k3 * h1) ** 2) * 2 + h1 = sin(op.VL4 * pi / 180) / cos(op.VL4 * pi / 180) + z = sqrt(k1 ** 2 + (k1 * h1) ** 2) + k = sqrt(k2 ** 2 + (k2 * h1) ** 2) + f = sqrt(k3 ** 2 + (k3 * h1) ** 2) * 2 myvertex[ust[0]][2] = zlist[-1] + myvertex[ust[0]][0] * h1 myvertex[ust[1]][2] = zlist[-1] + myvertex[ust[1]][0] * h1 for i in alt: @@ -1048,10 +1050,10 @@ def generate_vertex_data(op, myvertex, myfaces): elif op.DT3 == '2': h1 = op.VL3 / 100 elif op.DT3 == '3': - h1 = math.sin(op.VL4 * math.pi / 180) / math.cos(op.VL4 * math.pi / 180) - z = math.sqrt(k1 ** 2 + (k1 * h1) ** 2) - k = math.sqrt(k2 ** 2 + (k2 * h1) ** 2) - f = math.sqrt(k3 ** 2 + (k3 * h1) ** 2) * 2 + h1 = sin(op.VL4 * pi / 180) / cos(op.VL4 * pi / 180) + z = sqrt(k1 ** 2 + (k1 * h1) ** 2) + k = sqrt(k2 ** 2 + (k2 * h1) ** 2) + f = sqrt(k3 ** 2 + (k3 * h1) ** 2) * 2 myvertex[ust[0]][2] = zlist[-1] + myvertex[ust[0]][0] * h1 myvertex[ust[1]][2] = zlist[-1] + myvertex[ust[1]][0] * h1 for i in alt: @@ -1375,8 +1377,8 @@ class Cpoint: # Get angle between two vectors # --------------------------------------------------------- def get_angle(p1, p2): - v1 = mathutils.Vector((p1[0], 0.0, p1[1])) - v2 = mathutils.Vector((p2[0], 0.0, p2[1])) + v1 = Vector((p1[0], 0.0, p1[1])) + v2 = Vector((p2[0], 0.0, p2[1])) a = v1.angle(v2) return a @@ -1407,7 +1409,7 @@ def get_circle_center(a, b, c): center = Cpoint(s2.x + l * d2.x, s2.y + l * d2.y) dx = center.x - a.x dy = center.y - a.y - radio = math.sqrt(dx * dx + dy * dy) + radio = sqrt(dx * dx + dy * dy) # angle v1 = (a.x - center.x, a.y - center.y) @@ -1500,14 +1502,14 @@ def create_ctrl_box(parentobj, objname): cz = center.y sg = op.res - arc = ((math.pi / 2) + ang) - ((math.pi / 2) - ang) + arc = ((pi / 2) + ang) - ((pi / 2) - ang) step = arc / sg - a = (math.pi / 2) + ang + a = (pi / 2) + ang myvertex.extend([(lb, ypos, lt), (lb, -ypos, lt)]) for x in range(0, sg): - myvertex.extend([(r * math.cos(a), ypos, r * math.sin(a) + cz), - (r * math.cos(a), -ypos, r * math.sin(a) + cz)]) + myvertex.extend([(r * cos(a), ypos, r * sin(a) + cz), + (r * cos(a), -ypos, r * sin(a) + cz)]) a -= step # close sides @@ -1549,8 +1551,8 @@ def create_ctrl_box(parentobj, objname): # ------------------------------------------------------------------ # Define property group class to create or modify # ------------------------------------------------------------------ -class GeneralPanelProperties(bpy.types.PropertyGroup): - prs = bpy.props.EnumProperty( +class GeneralPanelProperties(PropertyGroup): + prs = EnumProperty( items=( ('1', "WINDOW 250X200", ""), ('2', "WINDOW 200X200", ""), @@ -1566,40 +1568,40 @@ class GeneralPanelProperties(bpy.types.PropertyGroup): update=update_using_default, ) son = prs - gen = bpy.props.IntProperty( + gen = IntProperty( name='H Count', min=1, max=8, default=3, description='Horizontal Panes', update=update_window, ) - yuk = bpy.props.IntProperty( + yuk = IntProperty( name='V Count', min=1, max=5, default=1, description='Vertical Panes', update=update_window, ) - kl1 = bpy.props.IntProperty( + kl1 = IntProperty( name='Outer Frame', min=2, max=50, default=5, description='Outside Frame Thickness', update=update_window, ) - kl2 = bpy.props.IntProperty( + kl2 = IntProperty( name='Risers', min=2, max=50, default=5, description='Risers Width', update=update_window, ) - fk = bpy.props.IntProperty( + fk = IntProperty( name='Inner Frame', min=1, max=20, default=2, description='Inside Frame Thickness', update=update_window, ) - mr = bpy.props.BoolProperty(name='Sill', default=True, description='Window Sill', update=update_window) - mr1 = bpy.props.IntProperty(name='', min=1, max=20, default=4, description='Height', update=update_window) - mr2 = bpy.props.IntProperty(name='', min=0, max=20, default=4, description='First Depth', update=update_window) - mr3 = bpy.props.IntProperty(name='', min=1, max=50, default=20, description='Second Depth', update=update_window) - mr4 = bpy.props.IntProperty(name='', min=0, max=50, default=0, description='Extrusion for Jamb', + mr = BoolProperty(name='Sill', default=True, description='Window Sill', update=update_window) + mr1 = IntProperty(name='', min=1, max=20, default=4, description='Height', update=update_window) + mr2 = IntProperty(name='', min=0, max=20, default=4, description='First Depth', update=update_window) + mr3 = IntProperty(name='', min=1, max=50, default=20, description='Second Depth', update=update_window) + mr4 = IntProperty(name='', min=0, max=50, default=0, description='Extrusion for Jamb', update=update_window) - mt1 = bpy.props.EnumProperty( + mt1 = EnumProperty( items=( ('1', "PVC", ""), ('2', "WOOD", ""), @@ -1610,7 +1612,7 @@ class GeneralPanelProperties(bpy.types.PropertyGroup): description='Material to use', update=update_window, ) - mt2 = bpy.props.EnumProperty( + mt2 = EnumProperty( items=( ('1', "PVC", ""), ('2', "WOOD", ""), @@ -1622,14 +1624,14 @@ class GeneralPanelProperties(bpy.types.PropertyGroup): update=update_window, ) - r = bpy.props.FloatProperty( + r = FloatProperty( name='Rotation', min=0, max=360, default=0, precision=1, description='Panel rotation', update=update_window, ) - UST = bpy.props.EnumProperty( + UST = EnumProperty( items=( ('1', "Flat", ""), ('2', "Arch", ""), @@ -1640,7 +1642,7 @@ class GeneralPanelProperties(bpy.types.PropertyGroup): description='Type of window upper section', update=update_window, ) - DT2 = bpy.props.EnumProperty( + DT2 = EnumProperty( items=( ('1', "Difference", ""), ('2', "Radius", ""), @@ -1649,7 +1651,7 @@ class GeneralPanelProperties(bpy.types.PropertyGroup): default='1', update=update_window, ) - DT3 = bpy.props.EnumProperty( + DT3 = EnumProperty( items=( ('1', "Difference", ""), ('2', "Incline %", ""), @@ -1659,102 +1661,102 @@ class GeneralPanelProperties(bpy.types.PropertyGroup): default='1', update=update_window, ) - VL1 = bpy.props.IntProperty(name='', min=-10000, max=10000, default=30, update=update_window) # Fark - VL2 = bpy.props.IntProperty(name='', min=1, max=10000, default=30, update=update_window) # Cap - VL3 = bpy.props.IntProperty(name='', min=-100, max=100, default=30, update=update_window) # Egim % - VL4 = bpy.props.IntProperty(name='', min=-45, max=45, default=30, update=update_window) # Egim Aci + VL1 = IntProperty(name='', min=-10000, max=10000, default=30, update=update_window) # Fark + VL2 = IntProperty(name='', min=1, max=10000, default=30, update=update_window) # Cap + VL3 = IntProperty(name='', min=-100, max=100, default=30, update=update_window) # Egim % + VL4 = IntProperty(name='', min=-45, max=45, default=30, update=update_window) # Egim Aci - res = bpy.props.IntProperty(name='Resolution', min=2, max=360, default=36, update=update_window) # Res + res = IntProperty(name='Resolution', min=2, max=360, default=36, update=update_window) # Res - gnx0 = bpy.props.IntProperty(name='', min=1, max=300, default=60, description='1st Window Width', + gnx0 = IntProperty(name='', min=1, max=300, default=60, description='1st Window Width', update=update_window) - gnx1 = bpy.props.IntProperty(name='', min=1, max=300, default=110, description='2nd Window Width', + gnx1 = IntProperty(name='', min=1, max=300, default=110, description='2nd Window Width', update=update_window) - gnx2 = bpy.props.IntProperty(name='', min=1, max=300, default=60, description='3rd Window Width', + gnx2 = IntProperty(name='', min=1, max=300, default=60, description='3rd Window Width', update=update_window) - gnx3 = bpy.props.IntProperty(name='', min=1, max=300, default=60, description='4th Window Width', + gnx3 = IntProperty(name='', min=1, max=300, default=60, description='4th Window Width', update=update_window) - gnx4 = bpy.props.IntProperty(name='', min=1, max=300, default=60, description='5th Window Width', + gnx4 = IntProperty(name='', min=1, max=300, default=60, description='5th Window Width', update=update_window) - gnx5 = bpy.props.IntProperty(name='', min=1, max=300, default=60, description='6th Window Width', + gnx5 = IntProperty(name='', min=1, max=300, default=60, description='6th Window Width', update=update_window) - gnx6 = bpy.props.IntProperty(name='', min=1, max=300, default=60, description='7th Window Width', + gnx6 = IntProperty(name='', min=1, max=300, default=60, description='7th Window Width', update=update_window) - gnx7 = bpy.props.IntProperty(name='', min=1, max=300, default=60, description='8th Window Width', + gnx7 = IntProperty(name='', min=1, max=300, default=60, description='8th Window Width', update=update_window) - gny0 = bpy.props.IntProperty(name='', min=1, max=300, default=190, description='1st Row Height', + gny0 = IntProperty(name='', min=1, max=300, default=190, description='1st Row Height', update=update_window) - gny1 = bpy.props.IntProperty(name='', min=1, max=300, default=45, description='2nd Row Height', + gny1 = IntProperty(name='', min=1, max=300, default=45, description='2nd Row Height', update=update_window) - gny2 = bpy.props.IntProperty(name='', min=1, max=300, default=45, description='3rd Row Height', + gny2 = IntProperty(name='', min=1, max=300, default=45, description='3rd Row Height', update=update_window) - gny3 = bpy.props.IntProperty(name='', min=1, max=300, default=45, description='4th Row Height', + gny3 = IntProperty(name='', min=1, max=300, default=45, description='4th Row Height', update=update_window) - gny4 = bpy.props.IntProperty(name='', min=1, max=300, default=45, description='5th Row Height', + gny4 = IntProperty(name='', min=1, max=300, default=45, description='5th Row Height', update=update_window) - k00 = bpy.props.BoolProperty(name='', default=True, update=update_window) - k01 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k02 = bpy.props.BoolProperty(name='', default=True, update=update_window) - k03 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k04 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k05 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k06 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k07 = bpy.props.BoolProperty(name='', default=False, update=update_window) - - k10 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k11 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k12 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k13 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k14 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k15 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k16 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k17 = bpy.props.BoolProperty(name='', default=False, update=update_window) - - k20 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k21 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k22 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k23 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k24 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k25 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k26 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k27 = bpy.props.BoolProperty(name='', default=False, update=update_window) - - k30 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k31 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k32 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k33 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k34 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k35 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k36 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k37 = bpy.props.BoolProperty(name='', default=False, update=update_window) - - k40 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k41 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k42 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k43 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k44 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k45 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k46 = bpy.props.BoolProperty(name='', default=False, update=update_window) - k47 = bpy.props.BoolProperty(name='', default=False, update=update_window) + k00 = BoolProperty(name='', default=True, update=update_window) + k01 = BoolProperty(name='', default=False, update=update_window) + k02 = BoolProperty(name='', default=True, update=update_window) + k03 = BoolProperty(name='', default=False, update=update_window) + k04 = BoolProperty(name='', default=False, update=update_window) + k05 = BoolProperty(name='', default=False, update=update_window) + k06 = BoolProperty(name='', default=False, update=update_window) + k07 = BoolProperty(name='', default=False, update=update_window) + + k10 = BoolProperty(name='', default=False, update=update_window) + k11 = BoolProperty(name='', default=False, update=update_window) + k12 = BoolProperty(name='', default=False, update=update_window) + k13 = BoolProperty(name='', default=False, update=update_window) + k14 = BoolProperty(name='', default=False, update=update_window) + k15 = BoolProperty(name='', default=False, update=update_window) + k16 = BoolProperty(name='', default=False, update=update_window) + k17 = BoolProperty(name='', default=False, update=update_window) + + k20 = BoolProperty(name='', default=False, update=update_window) + k21 = BoolProperty(name='', default=False, update=update_window) + k22 = BoolProperty(name='', default=False, update=update_window) + k23 = BoolProperty(name='', default=False, update=update_window) + k24 = BoolProperty(name='', default=False, update=update_window) + k25 = BoolProperty(name='', default=False, update=update_window) + k26 = BoolProperty(name='', default=False, update=update_window) + k27 = BoolProperty(name='', default=False, update=update_window) + + k30 = BoolProperty(name='', default=False, update=update_window) + k31 = BoolProperty(name='', default=False, update=update_window) + k32 = BoolProperty(name='', default=False, update=update_window) + k33 = BoolProperty(name='', default=False, update=update_window) + k34 = BoolProperty(name='', default=False, update=update_window) + k35 = BoolProperty(name='', default=False, update=update_window) + k36 = BoolProperty(name='', default=False, update=update_window) + k37 = BoolProperty(name='', default=False, update=update_window) + + k40 = BoolProperty(name='', default=False, update=update_window) + k41 = BoolProperty(name='', default=False, update=update_window) + k42 = BoolProperty(name='', default=False, update=update_window) + k43 = BoolProperty(name='', default=False, update=update_window) + k44 = BoolProperty(name='', default=False, update=update_window) + k45 = BoolProperty(name='', default=False, update=update_window) + k46 = BoolProperty(name='', default=False, update=update_window) + k47 = BoolProperty(name='', default=False, update=update_window) # opengl internal data - glpoint_a = bpy.props.FloatVectorProperty( + glpoint_a = FloatVectorProperty( name="glpointa", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_b = bpy.props.FloatVectorProperty( + glpoint_b = FloatVectorProperty( name="glpointb", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_c = bpy.props.FloatVectorProperty( + glpoint_c = FloatVectorProperty( name="glpointc", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_d = bpy.props.FloatVectorProperty( + glpoint_d = FloatVectorProperty( name="glpointc", description="Hidden property for opengl", default=(0, 0, 0), @@ -1762,13 +1764,13 @@ class GeneralPanelProperties(bpy.types.PropertyGroup): bpy.utils.register_class(GeneralPanelProperties) -bpy.types.Object.WindowPanelGenerator = bpy.props.CollectionProperty(type=GeneralPanelProperties) +Object.WindowPanelGenerator = CollectionProperty(type=GeneralPanelProperties) # ------------------------------------------------------------------ # Define panel class to modify myobjects. # ------------------------------------------------------------------ -class AchmWindowEditPanel(bpy.types.Panel): +class AchmWindowEditPanel(Panel): bl_idname = "window.edit_panel2" bl_label = "Window Panel" bl_space_type = 'VIEW_3D' -- cgit v1.2.3