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

Draft: Fixes in Draft edit

Browse Source
This commit is contained in:
Yorik van Havre 2014-01-13 14:12:28 -02:00
parent fee2bc4169
commit c1aea6337c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -543,6 +543,7 @@ class DraftToolBar:
FreeCADGui.draftToolBar.escape() FreeCADGui.draftToolBar.escape()
FreeCADGui.ActiveDocument.resetEdit() FreeCADGui.ActiveDocument.resetEdit()
return True return True
if not FreeCADGui.Control.activeDialog():
todo.delay(FreeCADGui.Control.showDialog,dummy()) todo.delay(FreeCADGui.Control.showDialog,dummy())
self.setTitle(title) self.setTitle(title)

4
src/Mod/Draft/DraftTools.py
View File

@ -3095,6 +3095,7 @@ class Edit(Modifier):
self.editing = None self.editing = None
self.editpoints = [] self.editpoints = []
self.pl = None self.pl = None
FreeCADGui.Snapper.setSelectMode(True)
if "Placement" in self.obj.PropertiesList: if "Placement" in self.obj.PropertiesList:
self.pl = self.obj.Placement self.pl = self.obj.Placement
self.invpl = self.pl.inverse() self.invpl = self.pl.inverse()
@ -3145,6 +3146,7 @@ class Edit(Modifier):
def finish(self,closed=False): def finish(self,closed=False):
"terminates the operation" "terminates the operation"
FreeCADGui.Snapper.setSelectMode(False)
if self.obj and closed: if self.obj and closed:
if "Closed" in self.obj.PropertiesList: if "Closed" in self.obj.PropertiesList:
if not self.obj.Closed: if not self.obj.Closed:
@ -3201,10 +3203,12 @@ class Edit(Modifier):
self.obj.ViewObject.Selectable = False self.obj.ViewObject.Selectable = False
if "Points" in self.obj.PropertiesList: if "Points" in self.obj.PropertiesList:
self.node.append(self.obj.Points[self.editing]) self.node.append(self.obj.Points[self.editing])
FreeCADGui.Snapper.setSelectMode(False)
else: else:
self.trackers[self.editing].on() self.trackers[self.editing].on()
if hasattr(self.obj.ViewObject,"Selectable"): if hasattr(self.obj.ViewObject,"Selectable"):
self.obj.ViewObject.Selectable = True self.obj.ViewObject.Selectable = True
FreeCADGui.Snapper.setSelectMode(True)
self.numericInput(self.trackers[self.editing].get()) self.numericInput(self.trackers[self.editing].get())
def update(self,v): def update(self,v):