From 10431331f608e41a7a7c403f25c6d353e358fd48 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 25 Nov 2016 22:59:03 +0100 Subject: [PATCH] FEM: remove the not needed GuiUp check on GUI files --- src/Mod/Fem/_CommandAnalysis.py | 3 +-- src/Mod/Fem/_CommandBeamSection.py | 3 +-- src/Mod/Fem/_CommandConstraintSelfWeight.py | 3 +-- src/Mod/Fem/_CommandControlSolver.py | 4 +--- src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py | 3 +-- src/Mod/Fem/_CommandMechanicalMaterial.py | 3 +-- src/Mod/Fem/_CommandMeshGmshFromShape.py | 3 +-- src/Mod/Fem/_CommandMeshNetgenFromShape.py | 3 +-- src/Mod/Fem/_CommandPurgeResults.py | 6 ++---- src/Mod/Fem/_CommandRunSolver.py | 4 +--- src/Mod/Fem/_CommandShellThickness.py | 3 +-- src/Mod/Fem/_CommandShowResult.py | 5 ++--- src/Mod/Fem/_CommandSolverCalculix.py | 4 ++-- src/Mod/Fem/_CommandSolverZ88.py | 3 +-- 14 files changed, 17 insertions(+), 33 deletions(-) diff --git a/src/Mod/Fem/_CommandAnalysis.py b/src/Mod/Fem/_CommandAnalysis.py index 11803349ae2f..9891faad0e00 100644 --- a/src/Mod/Fem/_CommandAnalysis.py +++ b/src/Mod/Fem/_CommandAnalysis.py @@ -58,5 +58,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [App.activeDocument()." + sel[0].Name + "]") FreeCADGui.Selection.clearSelection() -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_Analysis', _CommandAnalysis()) +FreeCADGui.addCommand('Fem_Analysis', _CommandAnalysis()) diff --git a/src/Mod/Fem/_CommandBeamSection.py b/src/Mod/Fem/_CommandBeamSection.py index 8f411756fb31..7fb480c4fd11 100644 --- a/src/Mod/Fem/_CommandBeamSection.py +++ b/src/Mod/Fem/_CommandBeamSection.py @@ -49,5 +49,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [FemBeamSection.makeFemBeamSection()]") -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_BeamSection', _CommandBeamSection()) +FreeCADGui.addCommand('Fem_BeamSection', _CommandBeamSection()) diff --git a/src/Mod/Fem/_CommandConstraintSelfWeight.py b/src/Mod/Fem/_CommandConstraintSelfWeight.py index 604c653d05e0..0a2a7048911e 100644 --- a/src/Mod/Fem/_CommandConstraintSelfWeight.py +++ b/src/Mod/Fem/_CommandConstraintSelfWeight.py @@ -49,5 +49,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [FemConstraintSelfWeight.makeFemConstraintSelfWeight()]") -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_ConstraintSelfWeight', _CommandConstraintSelfWeight()) +FreeCADGui.addCommand('Fem_ConstraintSelfWeight', _CommandConstraintSelfWeight()) diff --git a/src/Mod/Fem/_CommandControlSolver.py b/src/Mod/Fem/_CommandControlSolver.py index b5029bb13822..9184c966a27a 100644 --- a/src/Mod/Fem/_CommandControlSolver.py +++ b/src/Mod/Fem/_CommandControlSolver.py @@ -27,7 +27,6 @@ ## @package CommandControlSolver # \ingroup FEM -import FreeCAD from FemCommands import FemCommands import FreeCADGui from PySide import QtCore @@ -51,5 +50,4 @@ def Activated(self): FreeCADGui.ActiveDocument.setEdit(solver_obj, 0) -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_ControlSolver', _CommandControlSolver()) +FreeCADGui.addCommand('Fem_ControlSolver', _CommandControlSolver()) diff --git a/src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py b/src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py index 2e78978fa6e2..556425961221 100644 --- a/src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py +++ b/src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py @@ -74,5 +74,4 @@ def Activated(self): if solver_object and solver_object.SolverType == 'FemSolverCalculix': solver_object.MaterialNonlinearity = "nonlinear" -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_MaterialMechanicalNonlinear', _CommandMaterialMechanicalNonlinear()) +FreeCADGui.addCommand('Fem_MaterialMechanicalNonlinear', _CommandMaterialMechanicalNonlinear()) diff --git a/src/Mod/Fem/_CommandMechanicalMaterial.py b/src/Mod/Fem/_CommandMechanicalMaterial.py index 97e312318b2c..8976d6069440 100644 --- a/src/Mod/Fem/_CommandMechanicalMaterial.py +++ b/src/Mod/Fem/_CommandMechanicalMaterial.py @@ -55,5 +55,4 @@ def Activated(self): FreeCADGui.doCommand("Gui.activeDocument().setEdit(App.ActiveDocument.ActiveObject.Name)") -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_MechanicalMaterial', _CommandMechanicalMaterial()) +FreeCADGui.addCommand('Fem_MechanicalMaterial', _CommandMechanicalMaterial()) diff --git a/src/Mod/Fem/_CommandMeshGmshFromShape.py b/src/Mod/Fem/_CommandMeshGmshFromShape.py index c2792328805a..5044fff6f512 100644 --- a/src/Mod/Fem/_CommandMeshGmshFromShape.py +++ b/src/Mod/Fem/_CommandMeshGmshFromShape.py @@ -61,5 +61,4 @@ def Activated(self): FreeCADGui.Selection.clearSelection() -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_MeshGmshFromShape', _CommandMeshGmshFromShape()) +FreeCADGui.addCommand('Fem_MeshGmshFromShape', _CommandMeshGmshFromShape()) diff --git a/src/Mod/Fem/_CommandMeshNetgenFromShape.py b/src/Mod/Fem/_CommandMeshNetgenFromShape.py index b44a161db539..877687a5bb9f 100644 --- a/src/Mod/Fem/_CommandMeshNetgenFromShape.py +++ b/src/Mod/Fem/_CommandMeshNetgenFromShape.py @@ -55,5 +55,4 @@ def Activated(self): FreeCADGui.Selection.clearSelection() -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_MeshNetgenFromShape', _CommandMeshNetgenFromShape()) +FreeCADGui.addCommand('Fem_MeshNetgenFromShape', _CommandMeshNetgenFromShape()) diff --git a/src/Mod/Fem/_CommandPurgeResults.py b/src/Mod/Fem/_CommandPurgeResults.py index edd60fcdda86..11f43e14a280 100644 --- a/src/Mod/Fem/_CommandPurgeResults.py +++ b/src/Mod/Fem/_CommandPurgeResults.py @@ -27,7 +27,6 @@ ## @package CommandPurgeResults # \ingroup FEM -import FreeCAD from FemCommands import FemCommands import FemTools import FreeCADGui @@ -47,8 +46,7 @@ def __init__(self): def Activated(self): fea = FemTools.FemTools() fea.reset_all() - self.hide_meshes_show_parts_constraints() -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_PurgeResults', _CommandPurgeResults()) + +FreeCADGui.addCommand('Fem_PurgeResults', _CommandPurgeResults()) diff --git a/src/Mod/Fem/_CommandRunSolver.py b/src/Mod/Fem/_CommandRunSolver.py index 1476c46bdbdb..2c3764534506 100644 --- a/src/Mod/Fem/_CommandRunSolver.py +++ b/src/Mod/Fem/_CommandRunSolver.py @@ -27,7 +27,6 @@ ## @package CommandRunSolver # \ingroup FEM -import FreeCAD from FemCommands import FemCommands import FreeCADGui from PySide import QtCore, QtGui @@ -88,5 +87,4 @@ def show_results_on_mesh(self): tp.restore_result_dialog() -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_RunSolver', _CommandRunSolver()) +FreeCADGui.addCommand('Fem_RunSolver', _CommandRunSolver()) diff --git a/src/Mod/Fem/_CommandShellThickness.py b/src/Mod/Fem/_CommandShellThickness.py index 1b77f7642c52..9e757921ba27 100644 --- a/src/Mod/Fem/_CommandShellThickness.py +++ b/src/Mod/Fem/_CommandShellThickness.py @@ -49,5 +49,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [FemShellThickness.makeFemShellThickness()]") -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_ShellThickness', _CommandShellThickness()) +FreeCADGui.addCommand('Fem_ShellThickness', _CommandShellThickness()) diff --git a/src/Mod/Fem/_CommandShowResult.py b/src/Mod/Fem/_CommandShowResult.py index 017e38d4cfac..caa2c1b5e1b5 100644 --- a/src/Mod/Fem/_CommandShowResult.py +++ b/src/Mod/Fem/_CommandShowResult.py @@ -27,7 +27,6 @@ ## @package CommandShowResult # \ingroup FEM -import FreeCAD from FemCommands import FemCommands import FreeCADGui from PySide import QtCore, QtGui @@ -69,5 +68,5 @@ def get_results_object(sel): return i return None -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_ShowResult', _CommandShowResult()) + +FreeCADGui.addCommand('Fem_ShowResult', _CommandShowResult()) diff --git a/src/Mod/Fem/_CommandSolverCalculix.py b/src/Mod/Fem/_CommandSolverCalculix.py index 768e10b8feba..1a4a0ac9d32d 100644 --- a/src/Mod/Fem/_CommandSolverCalculix.py +++ b/src/Mod/Fem/_CommandSolverCalculix.py @@ -58,5 +58,5 @@ def Activated(self): else: FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [FemSolverCalculix.makeFemSolverCalculix()]") -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_SolverCalculix', _CommandSolverCalculix()) + +FreeCADGui.addCommand('Fem_SolverCalculix', _CommandSolverCalculix()) diff --git a/src/Mod/Fem/_CommandSolverZ88.py b/src/Mod/Fem/_CommandSolverZ88.py index 1a1c5db34e79..11cd10e9485c 100644 --- a/src/Mod/Fem/_CommandSolverZ88.py +++ b/src/Mod/Fem/_CommandSolverZ88.py @@ -49,5 +49,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [FemSolverZ88.makeFemSolverZ88()]") -if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_SolverZ88', _CommandSolverZ88()) +FreeCADGui.addCommand('Fem_SolverZ88', _CommandSolverZ88())