From 8c62f106849015a8185a5b5f43e40fd009b878e5 Mon Sep 17 00:00:00 2001 From: ThaHobbyist Date: Wed, 22 Jan 2025 15:04:40 +0530 Subject: Fixed error where user was able to add more than one vertex to an arc type edge --- __init__.py | 8 -------- models/edges_panel_operators.py | 11 +++++++++-- views/mainpanel/view.py | 5 ----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/__init__.py b/__init__.py index 854b95b..c9633e3 100755 --- a/__init__.py +++ b/__init__.py @@ -359,11 +359,6 @@ def register(): bpy.types.Scene.vert_index = IntProperty(name="Vertex Index", default=0) - # Temporary Vertex Properties. To be changed later - bpy.types.Scene.vertx = FloatProperty(name="X", default=0.0) - bpy.types.Scene.verty = FloatProperty(name="Y", default=0.0) - bpy.types.Scene.vertz = FloatProperty(name="Z", default=0.0) - bpy.types.Scene.edge_control_methods = EnumProperty( items=[("IP", "Interpolation Points", ""), ("AA", "Axis angle", "")], default="IP", @@ -569,9 +564,6 @@ def unregister(): del bpy.types.Scene.ecustom del bpy.types.Scene.ecustom_index del bpy.types.Scene.vert_index - del bpy.types.Scene.vertx - del bpy.types.Scene.verty - del bpy.types.Scene.vertz del bpy.types.Scene.cnt del bpy.types.Scene.mode del bpy.types.Scene.bdclist diff --git a/models/edges_panel_operators.py b/models/edges_panel_operators.py index 67fc40e..a293d92 100644 --- a/models/edges_panel_operators.py +++ b/models/edges_panel_operators.py @@ -67,6 +67,15 @@ class VNT_OT_new_vert(Operator): bl_idname = "vnt.new_vert" bl_label = "Generate new Vertex" + @classmethod + def poll(cls, context): + cs = context.scene + if len(cs.ecustom) == 0: + return True + else: + curr_edge = cs.ecustom[cs.ecustom_index] + return curr_edge.edge_type != 'ARC' or len(curr_edge.vert_collection) == 0 + def execute(self, context): cs = context.scene try: @@ -120,8 +129,6 @@ class VNT_OT_new_vert(Operator): for i in range(3): coord[i] = (x[i] + y[i])/1.5 - - # coord = [cs.vertx, cs.verty, cs.vertz] self.curr_edge.vert_collection.add() self.curr_edge.vert_collection[0].vert_loc=coord diff --git a/views/mainpanel/view.py b/views/mainpanel/view.py index b1363ab..5407d01 100755 --- a/views/mainpanel/view.py +++ b/views/mainpanel/view.py @@ -251,11 +251,6 @@ class layout_controller: row2 = layout.row() row2.operator('vnt.new_vert') row2.operator('vnt.remove_vert') - # row3 = layout.row(align=True) - # row3.label(text="Vertex Coordinates") - # row3.prop(cs, "vertx") - # row3.prop(cs, "verty") - # row3.prop(cs, "vertz") if len(ec): layout.prop(ec[cs.ecustom_index], "color") -- cgit