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

0000737: Draft selection

Browse Source
This commit is contained in:
Yorik van Havre 2012-06-11 14:56:38 -03:00
parent 2efc4915a1
commit 231786f579
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -697,7 +697,7 @@ class DraftToolBar:
if not self.taskmode: if not self.taskmode:
self.labelx.setText(translate("draft", "Pick Object")) self.labelx.setText(translate("draft", "Pick Object"))
self.labelx.show() self.labelx.show()
self.makeDumbTask() self.makeDumbTask()
def editUi(self): def editUi(self):
self.taskUi(translate("draft", "Edit")) self.taskUi(translate("draft", "Edit"))
@ -769,7 +769,7 @@ class DraftToolBar:
def __init__(self): def __init__(self):
pass pass
def getStandardButtons(self): def getStandardButtons(self):
return 0 return int(QtGui.QDialogButtonBox.Cancel)
panel = TaskPanel() panel = TaskPanel()
FreeCADGui.Control.showDialog(panel) FreeCADGui.Control.showDialog(panel)

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

@ -111,15 +111,15 @@ def selectObject(arg):
if (arg["Key"] == "ESCAPE"): if (arg["Key"] == "ESCAPE"):
FreeCAD.activeDraftCommand.finish() FreeCAD.activeDraftCommand.finish()
# TODO : this part raises a coin3D warning about scene traversal, to be fixed. # TODO : this part raises a coin3D warning about scene traversal, to be fixed.
if (arg["Type"] == "SoMouseButtonEvent"): elif (arg["Type"] == "SoMouseButtonEvent"):
if (arg["State"] == "DOWN") and (arg["Button"] == "BUTTON1"): if (arg["State"] == "DOWN") and (arg["Button"] == "BUTTON1"):
cursor = arg["Position"] cursor = arg["Position"]
snapped = Draft.get3DView().getObjectInfo((cursor[0],cursor[1])) snapped = Draft.get3DView().getObjectInfo((cursor[0],cursor[1]))
if snapped: if snapped:
obj = FreeCAD.ActiveDocument.getObject(snapped['Object']) obj = FreeCAD.ActiveDocument.getObject(snapped['Object'])
FreeCADGui.Selection.addSelection(obj) FreeCADGui.Selection.addSelection(obj)
FreeCAD.activeDraftCommand.component=snapped['Component'] FreeCAD.activeDraftCommand.component=snapped['Component']
FreeCAD.activeDraftCommand.proceed() FreeCAD.activeDraftCommand.proceed()
def getPoint(target,args,mobile=False,sym=False,workingplane=True): def getPoint(target,args,mobile=False,sym=False,workingplane=True):
''' '''
@ -1726,12 +1726,6 @@ class Modifier(DraftTool):
def __init__(self): def __init__(self):
DraftTool.__init__(self) DraftTool.__init__(self)
def IsActive(self):
if Draft.getSelection():
return True
else:
return False
class Move(Modifier): class Move(Modifier):
"The Draft_Move FreeCAD command definition" "The Draft_Move FreeCAD command definition"
@ -1771,9 +1765,11 @@ class Move(Modifier):
self.ui.cross(True) self.ui.cross(True)
def finish(self,closed=False,cont=False): def finish(self,closed=False,cont=False):
if self.ui: if self.ghost:
self.ghost.finalize() self.ghost.finalize()
if self.linetrack:
self.linetrack.finalize() self.linetrack.finalize()
if self.constraintrack:
self.constraintrack.finalize() self.constraintrack.finalize()
Modifier.finish(self) Modifier.finish(self)
if cont and self.ui: if cont and self.ui:
@ -1941,11 +1937,15 @@ class Rotate(Modifier):
def finish(self,closed=False,cont=False): def finish(self,closed=False,cont=False):
"finishes the arc" "finishes the arc"
Modifier.finish(self) Modifier.finish(self)
if self.ui: if self.linetrack:
self.linetrack.finalize() self.linetrack.finalize()
if self.constraintrack:
self.constraintrack.finalize() self.constraintrack.finalize()
if self.arctrack:
self.arctrack.finalize() self.arctrack.finalize()
if self.ghost:
self.ghost.finalize() self.ghost.finalize()
if self.doc:
self.doc.recompute() self.doc.recompute()
if cont and self.ui: if cont and self.ui:
if self.ui.continueMode: if self.ui.continueMode:
@ -2248,10 +2248,13 @@ class Offset(Modifier):
self.finish() self.finish()
def finish(self,closed=False): def finish(self,closed=False):
if self.ui and self.running: if self.running:
self.linetrack.finalize() if self.linetrack:
self.constraintrack.finalize() self.linetrack.finalize()
self.ghost.finalize() if self.constraintrack:
self.constraintrack.finalize()
if self.ghost:
self.ghost.finalize()
Modifier.finish(self) Modifier.finish(self)
def numericRadius(self,rad): def numericRadius(self,rad):
@ -2924,8 +2927,10 @@ class Trimex(Modifier):
Modifier.finish(self) Modifier.finish(self)
self.force = None self.force = None
if self.ui: if self.ui:
self.linetrack.finalize() if self.linetrack:
self.constraintrack.finalize() self.linetrack.finalize()
if self.constraintrack:
self.constraintrack.finalize()
if self.ghost: if self.ghost:
for g in self.ghost: for g in self.ghost:
g.finalize() g.finalize()
@ -2980,9 +2985,11 @@ class Scale(Modifier):
def finish(self,closed=False,cont=False): def finish(self,closed=False,cont=False):
Modifier.finish(self) Modifier.finish(self)
if self.ui: if self.ghost:
self.ghost.finalize() self.ghost.finalize()
if self.linetrack:
self.linetrack.finalize() self.linetrack.finalize()
if self.constraintrack:
self.constraintrack.finalize() self.constraintrack.finalize()
if cont and self.ui: if cont and self.ui:
if self.ui.continueMode: if self.ui.continueMode: