Draft: remaining fixes

This commit is contained in:
Yorik van Havre
2012-06-07 19:58:56 -03:00
parent 181b7a258e
commit e7644fd3b3
2 changed files with 14 additions and 10 deletions

View File

@@ -339,7 +339,7 @@ class Snapper:
if view.getCameraType() == "Perspective":
camera = view.getCameraNode()
p = camera.getField("position").getValue()
vd = pt.sub(Vector(p[0],p[1],p[2]))
dv = pt.sub(Vector(p[0],p[1],p[2]))
else:
dv = view.getViewDirection()
return FreeCAD.DraftWorkingPlane.projectPoint(pt,dv)
@@ -390,15 +390,17 @@ class Snapper:
else:
if self.isEnabled('parallel'):
if last:
de = Part.Line(last,last.add(DraftGeomUtils.vec(e))).toShape()
np = self.getPerpendicular(de,point)
if (np.sub(point)).Length < self.radius:
if self.tracker:
self.tracker.setCoords(np)
self.tracker.setMarker(self.mk['parallel'])
self.tracker.on()
self.setCursor('parallel')
return np,de
ve = DraftGeomUtils.vec(e)
if not DraftVecUtils.isNull(ve):
de = Part.Line(last,last.add(ve)).toShape()
np = self.getPerpendicular(de,point)
if (np.sub(point)).Length < self.radius:
if self.tracker:
self.tracker.setCoords(np)
self.tracker.setMarker(self.mk['parallel'])
self.tracker.on()
self.setCursor('parallel')
return np,de
return point,eline
def snapToPolar(self,point,last):

View File

@@ -3823,6 +3823,8 @@ class ToggleGrid():
else:
FreeCADGui.Snapper.grid.on()
FreeCADGui.Snapper.forceGridOff=False
else:
FreeCADGui.Snapper.show()
#---------------------------------------------------------------------------
# Adds the icons & commands to the FreeCAD command manager, and sets defaults