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

Fixed merge issues

Browse Source
This commit is contained in:
Markus Lampert
2022-09-09 20:22:35 -07:00
parent 93af3a13e5
commit 38a7826dde
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Path/Path/Base/FeedRate.py
View File

@@ -65,7 +65,7 @@ def setFeedRate(commandlist, ToolController):
else currentposition.z
)
endpoint = FreeCAD.Vector(x, y, z)
if PathGeom.pointsCoincide(currentposition, endpoint):
if Path.Geom.pointsCoincide(currentposition, endpoint):
return True
return Path.Geom.isVertical(Part.makeLine(currentposition, endpoint))

4
src/Mod/Path/Path/Base/SetupSheetOpPrototype.py
View File

@@ -65,11 +65,11 @@ class Property(object):
def setupProperty(self, obj, name, category, value):
created = False
if not hasattr(obj, name):
PathLog.track('add', obj.Name, name, self.propType)
Path.Log.track('add', obj.Name, name, self.propType)
obj.addProperty(self.propType, name, category, self.info)
self.initProperty(obj, name)
created = True
PathLog.track('set', obj.Name, name, value, type(value))
Path.Log.track('set', obj.Name, name, value, type(value))
setattr(obj, name, value)
return created