diff options
author | lijenstina <lijenstina@gmail.com> | 2017-05-21 08:26:34 +0300 |
---|---|---|
committer | lijenstina <lijenstina@gmail.com> | 2017-05-21 08:26:34 +0300 |
commit | 48a69db5444591ba88ca9794dbdb2b8d3a2c9984 (patch) | |
tree | 9e33a71a39736a8472bf039f6685c4b49c8b11ff /mesh_extra_tools/vertex_align.py | |
parent | aaeb073354aa00abb198c52af42dfbafeb7e069a (diff) |
Mesh Extra Tools: Update to version 0.33, various fixes
Bump version to 0.33
Some Pep8 clean up and general fixes
Some UI updates
Replace Mesh to wall with a similar results script
mesh_edges_floor_plan (for reasons see T51483)
It is not 1 to 1 replacement but should be more stable
If someone wants to continue development it's absolutely
possible to be re-included later on
Vertex Align: cleanup and refactor code
introduce a stored alignment setting, proper help operator call
move the property group to init, remove register call
Mesh Check: cleanup
Move the UI element draw code from init
to the Face/Info select, cleanup
mesh_info_select:
Add a timer for redraw (not sure if it is the best solution)
Add settings remove refresh operator (as edit mode is available)
Mesh Edge Tools:
remove the Intersect_Line_Face operator, add general error handling
fix several crashes with non proper selections passed
Select tools - replace deprecated imp call
Diffstat (limited to 'mesh_extra_tools/vertex_align.py')
-rw-r--r-- | mesh_extra_tools/vertex_align.py | 359 |
1 files changed, 182 insertions, 177 deletions
diff --git a/mesh_extra_tools/vertex_align.py b/mesh_extra_tools/vertex_align.py index 8b3be88b..e5570fd1 100644 --- a/mesh_extra_tools/vertex_align.py +++ b/mesh_extra_tools/vertex_align.py @@ -1,63 +1,55 @@ # -*- coding: utf-8 -*- -# ***** BEGIN GPL LICENSE BLOCK ***** +# ##### BEGIN GPL LICENSE BLOCK ##### # +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# ***** END GPL LICENCE BLOCK ***** +# ##### END GPL LICENSE BLOCK ##### + +# Note: Property group was moved to __init__ -# ------ ------ bl_info = { - 'name': 'vertex align', - 'author': '', - 'version': (0, 1, 6), - 'blender': (2, 6, 1), - 'location': 'View3D > Tool Shelf', - 'description': '', - 'warning': '', - 'wiki_url': '', - 'tracker_url': '', - 'category': 'Mesh' } - -# ------ ------ + "name": "Vertex Align", + "author": "", + "version": (0, 1, 7), + "blender": (2, 6, 1), + "location": "View3D > Tool Shelf", + "description": "", + "warning": "", + "wiki_url": "", + "category": "Mesh"} + + import bpy from bpy.props import ( - BoolProperty, - EnumProperty, - PointerProperty, - FloatProperty, + BoolVectorProperty, + FloatVectorProperty, ) - from mathutils import Vector -from mathutils.geometry import ( - intersect_point_line, - intersect_line_plane, - ) -from bpy.types import ( - PropertyGroup, - ) +from bpy.types import Operator -# ------ Edit Mode Toggle------ + +# Edit Mode Toggle 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_mesh_data_(): edit_mode_out() ob_act = bpy.context.active_object @@ -65,160 +57,206 @@ def get_mesh_data_(): edit_mode_in() return me + def list_clear_(l): l[:] = [] return l -# -- -- Prpoerty Group-- -- -class va_property_group(PropertyGroup): - - en0 = EnumProperty( items =( ('vertex', 'Original vertex', ''), - ('coordinates', 'Custom coordinates', '')), - - name = 'Align to', - default = 'vertex' ) - - en1 = EnumProperty( items =( ('en1_opt0', 'x', ''), - ('en1_opt1', 'y', ''), - ('en1_opt2', 'z', '')), - name = 'Axis', - default = 'en1_opt0' ) -# ------ ------ class va_buf(): list_v = [] - list_f = [] list_0 = [] -# ------ operator 0 Store The Vert------ -class va_op0_store(bpy.types.Operator): - bl_idname = 'va.op0_store_id' - bl_label = '' - bl_description = "Store single vert as align point" - def execute(self, context): - me = get_mesh_data_() - list_clear_(va_buf.list_v) - for v in me.vertices: - if v.select: - va_buf.list_v.append(v.index) - bpy.ops.mesh.select_all(action = 'DESELECT') - return {'FINISHED'} +# Store The Vertex coordinates +class Vertex_align_store(Operator): + bl_idname = "vertex_align.store_id" + bl_label = "Active Vertex" + bl_description = ("Store Selected Vertex coordinates as an align point\n" + "Single Selected Vertex only") -# ------ operator 1 Append to list------ -class va_op1_list(bpy.types.Operator): - bl_idname = 'va.op1_id' - bl_label = '' - bl_description = "test2" + @classmethod + def poll(cls, context): + obj = context.active_object + return (obj and obj.type == 'MESH' and context.mode == 'EDIT_MESH') def execute(self, context): - me = get_mesh_data_() - list_clear_(va_buf.list_f) - for f in me.faces: - if f.select: - va_buf.list_f.append(f.index) - bpy.ops.mesh.select_all(action = 'DESELECT') + try: + me = get_mesh_data_() + list_0 = [v.index for v in me.vertices if v.select] + + if len(list_0) == 1: + list_clear_(va_buf.list_v) + for v in me.vertices: + if v.select: + va_buf.list_v.append(v.index) + bpy.ops.mesh.select_all(action='DESELECT') + else: + self.report({'WARNING'}, "Please select just One Vertex") + return {'CANCELLED'} + except: + self.report({'WARNING'}, "Storing selection could not be completed") + return {'CANCELLED'} + + self.report({'INFO'}, "Selected Vertex coordinates are stored") + return {'FINISHED'} -# ------ operator 2 ------ align to original -class va_op2_align(bpy.types.Operator): - bl_idname = 'va.op2_align_id' - bl_label = 'Align to original' + +# Align to original +class Vertex_align_original(Operator): + bl_idname = "vertex_align.align_original" + bl_label = "Align to original" + bl_description = "Align selection to stored single vertex coordinates" bl_options = {'REGISTER', 'UNDO'} - bl_description = "Align selection to stored single vert" + @classmethod + def poll(cls, context): + obj = context.active_object + return (obj and obj.type == 'MESH' and context.mode == 'EDIT_MESH') def draw(self, context): layout = self.layout - layout.label('Axis:') - layout.prop(context.scene.va_custom_props, 'en1', expand = True) + layout.label("Axis:") - def execute(self, context): + row = layout.row(align=True) + row.prop(context.scene.mesh_extra_tools, "vert_align_axis", + text="X", index=0, toggle=True) + row.prop(context.scene.mesh_extra_tools, "vert_align_axis", + text="Y", index=1, toggle=True) + row.prop(context.scene.mesh_extra_tools, "vert_align_axis", + text="Z", index=2, toggle=True) + def execute(self, context): edit_mode_out() ob_act = context.active_object me = ob_act.data - cen1 = context.scene.va_custom_props.en1 + cen1 = context.scene.mesh_extra_tools.vert_align_axis list_0 = [v.index for v in me.vertices if v.select] if len(va_buf.list_v) == 0: - self.report({'INFO'}, 'Original vertex not stored in memory') + self.report({'INFO'}, + "Original vertex not stored in memory. Operation Cancelled") edit_mode_in() return {'CANCELLED'} + elif len(va_buf.list_v) != 0: if len(list_0) == 0: - self.report({'INFO'}, 'No vertices selected') + self.report({'INFO'}, "No vertices selected. Operation Cancelled") edit_mode_in() return {'CANCELLED'} + elif len(list_0) != 0: vo = (me.vertices[va_buf.list_v[0]].co).copy() - if cen1 == 'en1_opt0': + if cen1[0] is True: for i in list_0: v = (me.vertices[i].co).copy() - me.vertices[i].co = Vector(( vo[0], v[1], v[2] )) - elif cen1 == 'en1_opt1': + me.vertices[i].co = Vector((vo[0], v[1], v[2])) + if cen1[1] is True: for i in list_0: v = (me.vertices[i].co).copy() - me.vertices[i].co = Vector(( v[0], vo[1], v[2] )) - elif cen1 == 'en1_opt2': + me.vertices[i].co = Vector((v[0], vo[1], v[2])) + if cen1[2] is True: for i in list_0: v = (me.vertices[i].co).copy() - me.vertices[i].co = Vector(( v[0], v[1], vo[2] )) + me.vertices[i].co = Vector((v[0], v[1], vo[2])) edit_mode_in() + return {'FINISHED'} -# ------ operator 3 ------ align to custom coordinates -class va_op3_coord_list(bpy.types.Operator): - bl_idname = 'va.op3_coord_list_id' - bl_label = '' + +# Align to custom coordinates +class Vertex_align_coord_list(Operator): + bl_idname = "vertex_align.coord_list_id" + bl_label = "" bl_description = "Align to custom coordinates" + @classmethod + def poll(cls, context): + obj = context.active_object + return (obj and obj.type == 'MESH' and context.mode == 'EDIT_MESH') + def execute(self, context): edit_mode_out() ob_act = context.active_object me = ob_act.data list_clear_(va_buf.list_0) va_buf.list_0 = [v.index for v in me.vertices if v.select][:] + if len(va_buf.list_0) == 0: - self.report({'INFO'}, 'No vertices selected') + self.report({'INFO'}, "No vertices selected. Operation Cancelled") edit_mode_in() return {'CANCELLED'} + elif len(va_buf.list_0) != 0: - bpy.ops.va.op4_id('INVOKE_DEFAULT') + bpy.ops.vertex_align.coord_menu_id('INVOKE_DEFAULT') + edit_mode_in() + return {'FINISHED'} -# ------ operator 4 ------ align to custom coordinates menu -class va_op4_coord_menu(bpy.types.Operator): - bl_idname = 'va.op4_id' - bl_label = 'Align to custom coordinates' + +# Align to custom coordinates menu +class Vertex_align_coord_menu(Operator): + bl_idname = "vertex_align.coord_menu_id" + bl_label = "Tweak custom coordinates" + bl_description = "Change the custom coordinates for aligning" bl_options = {'REGISTER', 'UNDO'} - bl_description = "Align to custom coordinates2" - x = y = z = FloatProperty( name = '', - default = 0.0, - min = -100.0, - max = 100.0, - step = 1, - precision = 3 ) - b_x = b_y = b_z = BoolProperty() + def_axis_coord = FloatVectorProperty( + name="", + description="Enter the values of coordinates", + default=(0.0, 0.0, 0.0), + min=-100.0, max=100.0, + step=1, size=3, + subtype='XYZ', + precision=3 + ) + use_axis_coord = BoolVectorProperty( + name="Axis", + description="Choose Custom Coordinates axis", + default=(False,) * 3, + size=3, + ) + is_not_undo = False + + @classmethod + def poll(cls, context): + obj = context.active_object + return (obj and obj.type == 'MESH') + + def using_store(self, context): + scene = context.scene + return scene.mesh_extra_tools.vert_align_use_stored def draw(self, context): layout = self.layout + + if self.using_store(context) and self.is_not_undo: + layout.label("Using Stored Coordinates", icon="INFO") + row = layout.split(0.25) - row.prop(self, 'b_x', text = 'x') - row.prop(self, 'x') + row.prop(self, "use_axis_coord", index=0, text="X") + row.prop(self, "def_axis_coord", index=0) + row = layout.split(0.25) - row.prop(self, 'b_y', text = 'y') - row.prop(self, 'y') + row.prop(self, "use_axis_coord", index=1, text="Y") + row.prop(self, "def_axis_coord", index=1) + row = layout.split(0.25) - row.prop(self, 'b_z', text = 'z') - row.prop(self, 'z') + row.prop(self, "use_axis_coord", index=2, text="Z") + row.prop(self, "def_axis_coord", index=2) def invoke(self, context, event): - return context.window_manager.invoke_props_dialog(self, width = 200) + self.is_not_undo = True + scene = context.scene + if self.using_store(context): + self.def_axis_coord = scene.mesh_extra_tools.vert_align_store_axis + + return context.window_manager.invoke_props_dialog(self, width=200) def execute(self, context): + self.is_not_undo = False edit_mode_out() ob_act = context.active_object me = ob_act.data @@ -226,71 +264,38 @@ class va_op4_coord_menu(bpy.types.Operator): for i in va_buf.list_0: v = (me.vertices[i].co).copy() tmp = Vector((v[0], v[1], v[2])) - if self.b_x == True: - tmp[0] = self.x - if self.b_y == True: - tmp[1] = self.y - if self.b_z == True: - tmp[2] = self.z - me.vertices[i].co = tmp - edit_mode_in() - return {'FINISHED'} -# ------ operator 7 Help------ -class va_op7_help(bpy.types.Operator): - - bl_idname = 'va.op7_help_id' - bl_label = '' - bl_description = "Info" - - def draw(self, context): - layout = self.layout - layout.label('Help:') - layout.label('To use select whatever you want vertices to be aligned to ') - layout.label('and click button next to store data label. ') - layout.label('Select vertices that you want to align and click Align button. ') - - def execute(self, context): - return {'FINISHED'} + if self.use_axis_coord[0] is True: + tmp[0] = self.def_axis_coord[0] + if self.use_axis_coord[1] is True: + tmp[1] = self.def_axis_coord[1] + if self.use_axis_coord[2] is True: + tmp[2] = self.def_axis_coord[2] + me.vertices[i].co = tmp - def invoke(self, context, event): - return context.window_manager.invoke_popup(self, width = 400) + edit_mode_in() -# ------ operator 8 ------ -class va_op8_execute(bpy.types.Operator): - bl_idname = 'va.op8_id' - bl_label = '' - bl_description = "Executs" - def execute(self, context): - bpy.ops.va.op7_id('INVOKE_DEFAULT') return {'FINISHED'} -# ------ Classes ------ +# Register classes = ( - va_property_group, - va_op0_store, - va_op1_list, - va_op2_align, - va_op3_coord_list, - va_op4_coord_menu, - va_op7_help, - va_op8_execute, + Vertex_align_store, + Vertex_align_original, + Vertex_align_coord_list, + Vertex_align_coord_menu, ) -# ------ Register ------ + + def register(): - for c in classes: - bpy.utils.register_class(c) + for cls in classes: + bpy.utils.register_class(cls) - bpy.types.Scene.va_custom_props = PointerProperty(type = va_property_group) -# ------ ------ def unregister(): - del bpy.types.Scene.va_custom_props + for cls in classes: + bpy.utils.unregister_class(cls) - for c in classes: - bpy.utils.unregister_class(c) -# ------ ------ if __name__ == "__main__": register() |