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

Arch: improvements to survey tool

Browse Source
This commit is contained in:
Yorik van Havre 2014-02-12 09:39:07 -02:00
parent 02566f721b
commit 57d45928e4
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Arch/ArchCommands.py
View File

@ -726,9 +726,15 @@ def survey(callback=False):
FreeCAD.ActiveDocument.removeObject(label) FreeCAD.ActiveDocument.removeObject(label)
FreeCADGui.Selection.removeObserver(FreeCAD.SurveyObserver) FreeCADGui.Selection.removeObserver(FreeCAD.SurveyObserver)
del FreeCAD.SurveyObserver del FreeCAD.SurveyObserver
if FreeCAD.GuiUp:
if hasattr(FreeCADGui,"draftToolBar"):
FreeCADGui.draftToolBar.offUi()
else: else:
FreeCAD.SurveyObserver = SurveyObserver(callback=survey) FreeCAD.SurveyObserver = SurveyObserver(callback=survey)
FreeCADGui.Selection.addObserver(FreeCAD.SurveyObserver) FreeCADGui.Selection.addObserver(FreeCAD.SurveyObserver)
if FreeCAD.GuiUp:
if hasattr(FreeCADGui,"draftToolBar"):
FreeCADGui.draftToolBar.selectUi(callback=survey)
else: else:
sel = FreeCADGui.Selection.getSelectionEx() sel = FreeCADGui.Selection.getSelectionEx()
if not sel: if not sel:
@ -737,6 +743,9 @@ def survey(callback=False):
FreeCAD.ActiveDocument.removeObject(label) FreeCAD.ActiveDocument.removeObject(label)
FreeCADGui.Selection.removeObserver(FreeCAD.SurveyObserver) FreeCADGui.Selection.removeObserver(FreeCAD.SurveyObserver)
del FreeCAD.SurveyObserver del FreeCAD.SurveyObserver
if FreeCAD.GuiUp:
if hasattr(FreeCADGui,"draftToolBar"):
FreeCADGui.draftToolBar.offUi()
else: else:
if hasattr(FreeCAD,"SurveyObserver"): if hasattr(FreeCAD,"SurveyObserver"):
basesel = FreeCAD.SurveyObserver.selection basesel = FreeCAD.SurveyObserver.selection
@ -780,6 +789,9 @@ def survey(callback=False):
for el in o.SubElementNames: for el in o.SubElementNames:
e = getattr(o.Object.Shape,el) e = getattr(o.Object.Shape,el)
anno = FreeCAD.ActiveDocument.addObject("App::AnnotationLabel","surveyLabel") anno = FreeCAD.ActiveDocument.addObject("App::AnnotationLabel","surveyLabel")
if "Vertex" in el:
anno.BasePosition = e.Point
else:
anno.BasePosition = e.CenterOfMass anno.BasePosition = e.CenterOfMass
FreeCAD.SurveyObserver.labels.append(anno.Name) FreeCAD.SurveyObserver.labels.append(anno.Name)
t = "" t = ""
@ -791,6 +803,10 @@ def survey(callback=False):
t = str(round(e.Length,pr)) t = str(round(e.Length,pr))
anno.LabelText = "l " + t anno.LabelText = "l " + t
FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Length: " + t + "\n") FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Length: " + t + "\n")
elif "Vertex" in el:
t = str(round(e.Z,pr))
anno.LabelText = "z " + t
FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Zcoord: " + t + "\n")
if FreeCAD.GuiUp and t: if FreeCAD.GuiUp and t:
QtGui.qApp.clipboard().setText(t) QtGui.qApp.clipboard().setText(t)

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

@ -786,11 +786,11 @@ class DraftToolBar:
else: else:
self.cmdlabel.setText(title) self.cmdlabel.setText(title)
def selectUi(self,extra=None): def selectUi(self,extra=None,callback=None):
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(extra) self.makeDumbTask(extra,callback)
def editUi(self): def editUi(self):
self.taskUi(translate("draft", "Edit")) self.taskUi(translate("draft", "Edit"))
@ -862,15 +862,19 @@ class DraftToolBar:
else: else:
self.layout.setDirection(QtGui.QBoxLayout.LeftToRight) self.layout.setDirection(QtGui.QBoxLayout.LeftToRight)
def makeDumbTask(self,extra=None): def makeDumbTask(self,extra=None,callback=None):
"create a dumb taskdialog to prevent deleting the temp object" "create a dumb taskdialog to prevent deleting the temp object"
class TaskPanel: class TaskPanel:
def __init__(self,extra=None): def __init__(self,extra=None,callback=None):
if extra: if extra:
self.form = [extra] self.form = [extra]
def getStandardButtons(self): def getStandardButtons(self):
return int(QtGui.QDialogButtonBox.Cancel) return int(QtGui.QDialogButtonBox.Cancel)
panel = TaskPanel(extra) def reject(self):
if callback:
callback()
return True
panel = TaskPanel(extra,callback)
FreeCADGui.Control.showDialog(panel) FreeCADGui.Control.showDialog(panel)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------