From e7644fd3b32e487b915249ac86949495e9401ae6 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorikvanhavre@users.sourceforge.net>
Date: Thu, 7 Jun 2012 19:58:56 -0300
Subject: [PATCH] Draft: remaining fixes

---
 src/Mod/Draft/DraftSnap.py  | 22 ++++++++++++----------
 src/Mod/Draft/DraftTools.py |  2 ++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/Mod/Draft/DraftSnap.py b/src/Mod/Draft/DraftSnap.py
index 3e1673460e..ee2e2aab97 100644
--- a/src/Mod/Draft/DraftSnap.py
+++ b/src/Mod/Draft/DraftSnap.py
@@ -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):
diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index 9f31ff1e81..0407369277 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -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