From c9bca5bd155bbf0dafbe3c859cc4bea3557fd345 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 22 Mar 2020 08:32:40 +0100 Subject: [PATCH] FEM: examples, better choose active document for fit view --- src/Mod/Fem/femexamples/boxanalysis.py | 3 +-- src/Mod/Fem/femexamples/ccx_cantilever_std.py | 3 +-- src/Mod/Fem/femexamples/constraint_contact_shell_shell.py | 3 +-- src/Mod/Fem/femexamples/constraint_contact_solid_solid.py | 3 +-- src/Mod/Fem/femexamples/constraint_tie.py | 3 +-- src/Mod/Fem/femexamples/material_multiple_twoboxes.py | 3 +-- src/Mod/Fem/femexamples/material_nl_platewithhole.py | 3 +-- src/Mod/Fem/femexamples/rc_wall_2d.py | 3 +-- src/Mod/Fem/femexamples/thermomech_bimetall.py | 3 +-- src/Mod/Fem/femexamples/thermomech_flow1d.py | 3 +-- src/Mod/Fem/femexamples/thermomech_spine.py | 3 +-- 11 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/Mod/Fem/femexamples/boxanalysis.py b/src/Mod/Fem/femexamples/boxanalysis.py index 4d6944b847..4124ba9e1a 100644 --- a/src/Mod/Fem/femexamples/boxanalysis.py +++ b/src/Mod/Fem/femexamples/boxanalysis.py @@ -58,9 +58,8 @@ def setup_base(doc=None, solvertype="ccxtools"): doc.recompute() if FreeCAD.GuiUp: - import FreeCADGui geom_obj.ViewObject.Document.activeView().viewAxonometric() - FreeCADGui.SendMsgToActiveView("ViewFit") + geom_obj.ViewObject.Document.activeView().fitAll() # analysis analysis = ObjectsFem.makeAnalysis(doc, "Analysis") diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_std.py b/src/Mod/Fem/femexamples/ccx_cantilever_std.py index 015ec92775..a6d4439589 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_std.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_std.py @@ -62,9 +62,8 @@ def setup_cantileverbase(doc=None, solvertype="ccxtools"): doc.recompute() if FreeCAD.GuiUp: - import FreeCADGui geom_obj.ViewObject.Document.activeView().viewAxonometric() - FreeCADGui.SendMsgToActiveView("ViewFit") + geom_obj.ViewObject.Document.activeView().fitAll() # analysis analysis = ObjectsFem.makeAnalysis(doc, "Analysis") diff --git a/src/Mod/Fem/femexamples/constraint_contact_shell_shell.py b/src/Mod/Fem/femexamples/constraint_contact_shell_shell.py index af43dbf361..b7398871f6 100644 --- a/src/Mod/Fem/femexamples/constraint_contact_shell_shell.py +++ b/src/Mod/Fem/femexamples/constraint_contact_shell_shell.py @@ -109,9 +109,8 @@ def setup(doc=None, solvertype="ccxtools"): doc.recompute() if FreeCAD.GuiUp: - import FreeCADGui goem_obj.ViewObject.Document.activeView().viewAxonometric() - FreeCADGui.SendMsgToActiveView("ViewFit") + geom_obj.ViewObject.Document.activeView().fitAll() # analysis analysis = ObjectsFem.makeAnalysis(doc, "Analysis") diff --git a/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py b/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py index 4f82de354b..5cbd468f4e 100644 --- a/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py +++ b/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py @@ -90,9 +90,8 @@ def setup(doc=None, solvertype="ccxtools"): doc.recompute() if FreeCAD.GuiUp: - import FreeCADGui geom_obj.ViewObject.Document.activeView().viewAxonometric() - FreeCADGui.SendMsgToActiveView("ViewFit") + geom_obj.ViewObject.Document.activeView().fitAll() # analysis analysis = ObjectsFem.makeAnalysis(doc, "Analysis") diff --git a/src/Mod/Fem/femexamples/constraint_tie.py b/src/Mod/Fem/femexamples/constraint_tie.py index d8d35f0a35..b93b0dfa4c 100644 --- a/src/Mod/Fem/femexamples/constraint_tie.py +++ b/src/Mod/Fem/femexamples/constraint_tie.py @@ -80,9 +80,8 @@ def setup(doc=None, solvertype="ccxtools"): doc.recompute() if FreeCAD.GuiUp: - import FreeCADGui geom_obj.ViewObject.Document.activeView().viewAxonometric() - FreeCADGui.SendMsgToActiveView("ViewFit") + geom_obj.ViewObject.Document.activeView().fitAll() # analysis analysis = ObjectsFem.makeAnalysis(doc, "Analysis") diff --git a/src/Mod/Fem/femexamples/material_multiple_twoboxes.py b/src/Mod/Fem/femexamples/material_multiple_twoboxes.py index 4dbe461c95..151a3e868d 100644 --- a/src/Mod/Fem/femexamples/material_multiple_twoboxes.py +++ b/src/Mod/Fem/femexamples/material_multiple_twoboxes.py @@ -79,9 +79,8 @@ def setup(doc=None, solvertype="ccxtools"): doc.recompute() if FreeCAD.GuiUp: - import FreeCADGui geom_obj.ViewObject.Document.activeView().viewAxonometric() - FreeCADGui.SendMsgToActiveView("ViewFit") + geom_obj.ViewObject.Document.activeView().fitAll() # analysis analysis = ObjectsFem.makeAnalysis(doc, "Analysis") diff --git a/src/Mod/Fem/femexamples/material_nl_platewithhole.py b/src/Mod/Fem/femexamples/material_nl_platewithhole.py index 5d71020074..a9258e842b 100644 --- a/src/Mod/Fem/femexamples/material_nl_platewithhole.py +++ b/src/Mod/Fem/femexamples/material_nl_platewithhole.py @@ -85,9 +85,8 @@ def setup(doc=None, solvertype="ccxtools"): doc.recompute() if FreeCAD.GuiUp: - import FreeCADGui geom_obj.ViewObject.Document.activeView().viewAxonometric() - FreeCADGui.SendMsgToActiveView("ViewFit") + geom_obj.ViewObject.Document.activeView().fitAll() # analysis analysis = ObjectsFem.makeAnalysis(doc, "Analysis") diff --git a/src/Mod/Fem/femexamples/rc_wall_2d.py b/src/Mod/Fem/femexamples/rc_wall_2d.py index 1a6b0c3c43..b24040c3fa 100644 --- a/src/Mod/Fem/femexamples/rc_wall_2d.py +++ b/src/Mod/Fem/femexamples/rc_wall_2d.py @@ -75,9 +75,8 @@ def setup(doc=None, solvertype="ccxtools"): doc.recompute() if FreeCAD.GuiUp: - import FreeCADGui geom_obj.ViewObject.Document.activeView().viewAxonometric() - FreeCADGui.SendMsgToActiveView("ViewFit") + geom_obj.ViewObject.Document.activeView().fitAll() # analysis analysis = ObjectsFem.makeAnalysis(doc, "Analysis") diff --git a/src/Mod/Fem/femexamples/thermomech_bimetall.py b/src/Mod/Fem/femexamples/thermomech_bimetall.py index ecff457bcc..fa68f90cbe 100644 --- a/src/Mod/Fem/femexamples/thermomech_bimetall.py +++ b/src/Mod/Fem/femexamples/thermomech_bimetall.py @@ -84,9 +84,8 @@ def setup(doc=None, solvertype="ccxtools"): doc.recompute() if FreeCAD.GuiUp: - import FreeCADGui geom_obj.ViewObject.Document.activeView().viewAxonometric() - FreeCADGui.SendMsgToActiveView("ViewFit") + geom_obj.ViewObject.Document.activeView().fitAll() # analysis analysis = ObjectsFem.makeAnalysis(doc, "Analysis") diff --git a/src/Mod/Fem/femexamples/thermomech_flow1d.py b/src/Mod/Fem/femexamples/thermomech_flow1d.py index f2f46e17c3..9af1b871ec 100644 --- a/src/Mod/Fem/femexamples/thermomech_flow1d.py +++ b/src/Mod/Fem/femexamples/thermomech_flow1d.py @@ -93,9 +93,8 @@ def setup(doc=None, solvertype="ccxtools"): doc.recompute() if FreeCAD.GuiUp: - import FreeCADGui geom_obj.ViewObject.Document.activeView().viewAxonometric() - FreeCADGui.SendMsgToActiveView("ViewFit") + geom_obj.ViewObject.Document.activeView().fitAll() # analysis analysis = ObjectsFem.makeAnalysis(doc, "Analysis") diff --git a/src/Mod/Fem/femexamples/thermomech_spine.py b/src/Mod/Fem/femexamples/thermomech_spine.py index 5bbd05b9e9..b18e4e2a1e 100644 --- a/src/Mod/Fem/femexamples/thermomech_spine.py +++ b/src/Mod/Fem/femexamples/thermomech_spine.py @@ -56,9 +56,8 @@ def setup(doc=None, solvertype="ccxtools"): doc.recompute() if FreeCAD.GuiUp: - import FreeCADGui geom_obj.ViewObject.Document.activeView().viewAxonometric() - FreeCADGui.SendMsgToActiveView("ViewFit") + geom_obj.ViewObject.Document.activeView().fitAll() # analysis analysis = ObjectsFem.makeAnalysis(doc, "Analysis")