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

Draft: implemented OK button in task dialogs - fixes #2423

Browse Source
This commit is contained in:
Yorik van Havre 2016-01-30 15:07:29 -02:00
parent 287e741210
commit 15a4976c97
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,9 @@ def dimSymbol(symbol=None,invert=False):
if symbol == None: if symbol == None:
symbol = getParam("dimsymbol",0) symbol = getParam("dimsymbol",0)
from pivy import coin from pivy import coin
if symbol == 1: if symbol == 0:
return coin.SoSphere()
elif symbol == 1:
marker = coin.SoMarkerSet() marker = coin.SoMarkerSet()
marker.markerIndex = coin.SoMarkerSet.CIRCLE_LINE_9_9 marker.markerIndex = coin.SoMarkerSet.CIRCLE_LINE_9_9
return marker return marker
@ -272,7 +274,7 @@ def dimSymbol(symbol=None,invert=False):
return marker return marker
else: else:
print("Draft.dimsymbol: Not implemented") print("Draft.dimsymbol: Not implemented")
return coin.SoSphere() return coin.SoSphere()
def shapify(obj): def shapify(obj):
'''shapify(object): transforms a parametric shape object into '''shapify(object): transforms a parametric shape object into

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

@ -201,10 +201,14 @@ class DraftTaskPanel:
else: else:
self.form = widget self.form = widget
def getStandardButtons(self): def getStandardButtons(self):
return int(QtGui.QDialogButtonBox.Close) return int(QtGui.QDialogButtonBox.Ok) | int(QtGui.QDialogButtonBox.Close)
def accept(self): def accept(self):
FreeCADGui.ActiveDocument.resetEdit() if hasattr(FreeCADGui,"draftToolBar"):
return True print "validating"
FreeCADGui.draftToolBar.validatePoint()
else:
FreeCADGui.ActiveDocument.resetEdit()
return True
def reject(self): def reject(self):
FreeCADGui.draftToolBar.isTaskOn = False FreeCADGui.draftToolBar.isTaskOn = False
FreeCADGui.draftToolBar.escape() FreeCADGui.draftToolBar.escape()