suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draft: fixed bug in task panels

Browse Source
This commit is contained in:
Yorik van Havre 2016-01-31 16:28:13 -02:00
parent d1a02e8d35
commit 87da750d56
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Arch/ArchComponent.py
View File

@ -766,11 +766,13 @@ class ViewProviderComponent:
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()

6
src/Mod/Draft/Draft.py
View File

@ -3288,8 +3288,10 @@ class _ViewProviderDraft:
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:

6
src/Mod/Draft/DraftGui.py
View File

@ -204,8 +204,8 @@ class DraftTaskPanel:
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 @@ class DraftToolBar:
pass
else:
self.sourceCmd.offsetHandler(offset)
else:
elif (self.labelx.isVisible()):
try:
#numx=float(self.xValue.text())
numx = self.x
@ -1223,6 +1223,8 @@ class DraftToolBar:
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 '''