Draft: fixed bug in task panels

FreeCAD · Jan 31, 2016 · 87da750 · 87da750
1 parent d1a02e8
commit 87da750
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py
@@ -766,11 +766,13 @@ def claimChildren(self):
         return []
 
     def setEdit(self,vobj,mode):
-        taskd = ComponentTaskPanel()
-        taskd.obj = self.Object
-        taskd.update()
-        FreeCADGui.Control.showDialog(taskd)
-        return True
+        if mode == 0:
+            taskd = ComponentTaskPanel()
+            taskd.obj = self.Object
+            taskd.update()
+            FreeCADGui.Control.showDialog(taskd)
+            return True
+        return False
 
     def unsetEdit(self,vobj,mode):
         FreeCADGui.Control.closeDialog()

diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
@@ -3288,8 +3288,10 @@ def execute(self,vobj):
         return
 
     def setEdit(self,vobj,mode=0):
-        FreeCADGui.runCommand("Draft_Edit")
-        return True
+        if mode == 0:
+            FreeCADGui.runCommand("Draft_Edit")
+            return True
+        return False
 
     def unsetEdit(self,vobj,mode=0):
         if FreeCAD.activeDraftCommand:

diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
@@ -204,8 +204,8 @@ def getStandardButtons(self):
         return int(QtGui.QDialogButtonBox.Ok) | int(QtGui.QDialogButtonBox.Close)
     def accept(self):
         if hasattr(FreeCADGui,"draftToolBar"):
-            print "validating"
             FreeCADGui.draftToolBar.validatePoint()
+            return True
         else:
             FreeCADGui.ActiveDocument.resetEdit()
             return True
@@ -1192,7 +1192,7 @@ def validatePoint(self):
                     pass
                 else:
                     self.sourceCmd.offsetHandler(offset)
-            else:
+            elif (self.labelx.isVisible()):
                 try:
                     #numx=float(self.xValue.text())
                     numx = self.x
@@ -1223,6 +1223,8 @@ def validatePoint(self):
                                 numy = last.y + v.y
                                 numz = last.z + v.z
                         self.sourceCmd.numericInput(numx,numy,numz)
+            else:
+                FreeCADGui.ActiveDocument.resetEdit()
 
     def validateSNumeric(self):
         ''' send valid numeric parameters to ShapeString '''