kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: Edit bugfix in Wire/BSpline curve editing

Browse Source
This commit is contained in:
carlopav
2020-05-24 14:52:49 +02:00
committed by Yorik van Havre
parent 8926651c0e
commit aa92bfba80
2 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/Draft/draftguitools/gui_edit.py
View File

@@ -220,6 +220,7 @@ class Edit(gui_base_original.Modifier):
self.running = False
self.trackers = {'object': []}
self.overNode = None # preselected node with mouseover
self.edited_objects = []
self.obj = None
self.editing = None
@@ -340,7 +341,8 @@ class Edit(gui_base_original.Modifier):
if self.ui:
self.removeTrackers()
self.deformat_objects_after_editing(self.edited_objects)
if self.edited_objects:
self.deformat_objects_after_editing(self.edited_objects)
super(Edit, self).finish()
App.DraftWorkingPlane.restore()
@@ -848,7 +850,7 @@ class Edit(gui_base_original.Modifier):
doc = self.overNode.get_doc_name()
obj = App.getDocument(doc).getObject(self.overNode.get_obj_name())
ep = self.overNode.get_subelement_index()
if utils.get_type(obj) in ["Line", "Wire"]:
if utils.get_type(obj) in ["Line", "Wire", "BSpline"]:
actions = ["delete point"]
elif utils.get_type(obj) in ["Circle"]:
if obj.FirstAngle != obj.LastAngle:
@@ -1004,8 +1006,7 @@ class Edit(gui_base_original.Modifier):
self.update_object(obj, nodeIndex, v)
App.ActiveDocument.commitTransaction()
if not utils.get_type(obj) in ["Wire", "BSpline"]:
self.resetTrackers(obj)
self.resetTrackers(obj)
try:
gui_tool_utils.redraw_3d_view()
@@ -1019,7 +1020,7 @@ class Edit(gui_base_original.Modifier):
edit_draft.updateWire(obj, nodeIndex, v)
elif objectType == "BezCurve":
edit_draft.updateWire(obj, nodeIndex, v)
edit_draft.updateBezCurve(obj, nodeIndex, v)
elif objectType == "Circle":
edit_draft.updateCircle(obj, nodeIndex, v, self.alt_edit_mode)

66
src/Mod/Draft/draftguitools/gui_edit_draft_objects.py
View File

@@ -25,7 +25,7 @@
All functions in this module work with Object coordinate space.
No conversion to global coordinate system is needed.
To support an new Object Draft_Edit needs at least two functions:
To support an new Object, Draft_Edit needs at least two functions:
getObjectPts(obj): returns a list of points on which Draft_Edit will display
edit trackers
updateObject(obj, nodeIndex, v): update the give object according to the
@@ -57,7 +57,7 @@ def get_supported_draft_objects():
# -------------------------------------------------------------------------
# EDIT OBJECT TOOLS : Line/Wire/Bspline/Bezcurve
# EDIT OBJECT TOOLS : Line/Wire/Bspline
# -------------------------------------------------------------------------
def getWirePts(obj):
@@ -66,28 +66,60 @@ def getWirePts(obj):
editpoints.append(p)
return editpoints
def updateWire(obj, nodeIndex, v): #TODO: Fix it
def updateWire(obj, nodeIndex, v):
pts = obj.Points
tol = 0.001 # TODO : Use default precision
if (nodeIndex == 0 and (v - pts[-1]).Length < tol ):
# DNC: user moved first point over last point -> Close curve
obj.Closed = True
pts[0] = v
del pts[-1]
obj.Points = pts
return
elif nodeIndex == len(pts) - 1 and (v - pts[0]).Length < tol:
# DNC: user moved last point over first point -> Close curve
obj.Closed = True
del pts[-1]
obj.Points = pts
return
elif v in pts:
# DNC: checks if point enter is equal to other, this could cause a OCC problem
_err = translate("draft", "This object does not support possible "
"coincident points, please try again.")
App.Console.PrintMessage(_err + "\n")
return
if obj.Closed:
# DNC: project the new point to the plane of the face if present
if hasattr(obj.Shape, "normalAt"):
normal = obj.Shape.normalAt(0,0)
point_on_plane = obj.Shape.Vertexes[0].Point
v.projectToPlane(point_on_plane, normal)
pts[nodeIndex] = v
obj.Points = pts
# -------------------------------------------------------------------------
# EDIT OBJECT TOOLS : BezCurve
# -------------------------------------------------------------------------
def updateBezCurve(obj, nodeIndex, v): #TODO: Fix it
pts = obj.Points
editPnt = v
# DNC: allows to close the curve by placing ends close to each other
# DNC: check for coincident startpoint/endpoint to auto close the curve
tol = 0.001
if ( ( nodeIndex == 0 ) and ( (editPnt - pts[-1]).Length < tol) ) or (
nodeIndex == len(pts) - 1 ) and ( (editPnt - pts[0]).Length < tol):
obj.Closed = True
# DNC: fix error message if edited point coincides with one of the existing points
if ( editPnt in pts ) == True: # checks if point enter is equal to other, this could cause a OCC problem
App.Console.PrintMessage(translate("draft",
"This object does not support possible "
"coincident points, please try again.")
+ "\n")
if utils.get_type(obj) in ["BezCurve"]: # TODO: Remove code to recompute trackers
self.resetTrackers(obj)
else:
self.trackers[obj.Name][nodeIndex].set(obj.getGlobalPlacement().
multVec(obj.Points[nodeIndex]))
# DNC: checks if point enter is equal to other, this could cause a OCC problem
if editPnt in pts:
_err = translate("draft", "This object does not support possible "
"coincident points, please try again.")
App.Console.PrintMessage(_err + "\n")
return
if utils.get_type(obj) in ["BezCurve"]:
pts = recomputePointsBezier(obj,pts,nodeIndex,v,obj.Degree,moveTrackers=False)
pts = recomputePointsBezier(obj,pts,nodeIndex,v,obj.Degree,moveTrackers=False)
if obj.Closed:
# check that the new point lies on the plane of the wire