Skip to content

Commit

Permalink
FEM: remove the not needed GuiUp check on GUI files
Browse files Browse the repository at this point in the history
  • Loading branch information
berndhahnebach committed Nov 25, 2016
1 parent c817c33 commit 1043133
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 33 deletions.
3 changes: 1 addition & 2 deletions src/Mod/Fem/_CommandAnalysis.py
Expand Up @@ -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())
3 changes: 1 addition & 2 deletions src/Mod/Fem/_CommandBeamSection.py
Expand Up @@ -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())
3 changes: 1 addition & 2 deletions src/Mod/Fem/_CommandConstraintSelfWeight.py
Expand Up @@ -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())
4 changes: 1 addition & 3 deletions src/Mod/Fem/_CommandControlSolver.py
Expand Up @@ -27,7 +27,6 @@
## @package CommandControlSolver
# \ingroup FEM

import FreeCAD
from FemCommands import FemCommands
import FreeCADGui
from PySide import QtCore
Expand All @@ -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())
3 changes: 1 addition & 2 deletions src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py
Expand Up @@ -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())
3 changes: 1 addition & 2 deletions src/Mod/Fem/_CommandMechanicalMaterial.py
Expand Up @@ -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())
3 changes: 1 addition & 2 deletions src/Mod/Fem/_CommandMeshGmshFromShape.py
Expand Up @@ -61,5 +61,4 @@ def Activated(self):
FreeCADGui.Selection.clearSelection()


if FreeCAD.GuiUp:
FreeCADGui.addCommand('Fem_MeshGmshFromShape', _CommandMeshGmshFromShape())
FreeCADGui.addCommand('Fem_MeshGmshFromShape', _CommandMeshGmshFromShape())
3 changes: 1 addition & 2 deletions src/Mod/Fem/_CommandMeshNetgenFromShape.py
Expand Up @@ -55,5 +55,4 @@ def Activated(self):
FreeCADGui.Selection.clearSelection()


if FreeCAD.GuiUp:
FreeCADGui.addCommand('Fem_MeshNetgenFromShape', _CommandMeshNetgenFromShape())
FreeCADGui.addCommand('Fem_MeshNetgenFromShape', _CommandMeshNetgenFromShape())
6 changes: 2 additions & 4 deletions src/Mod/Fem/_CommandPurgeResults.py
Expand Up @@ -27,7 +27,6 @@
## @package CommandPurgeResults
# \ingroup FEM

import FreeCAD
from FemCommands import FemCommands
import FemTools
import FreeCADGui
Expand All @@ -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())
4 changes: 1 addition & 3 deletions src/Mod/Fem/_CommandRunSolver.py
Expand Up @@ -27,7 +27,6 @@
## @package CommandRunSolver
# \ingroup FEM

import FreeCAD
from FemCommands import FemCommands
import FreeCADGui
from PySide import QtCore, QtGui
Expand Down Expand Up @@ -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())
3 changes: 1 addition & 2 deletions src/Mod/Fem/_CommandShellThickness.py
Expand Up @@ -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())
5 changes: 2 additions & 3 deletions src/Mod/Fem/_CommandShowResult.py
Expand Up @@ -27,7 +27,6 @@
## @package CommandShowResult
# \ingroup FEM

import FreeCAD
from FemCommands import FemCommands
import FreeCADGui
from PySide import QtCore, QtGui
Expand Down Expand Up @@ -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())
4 changes: 2 additions & 2 deletions src/Mod/Fem/_CommandSolverCalculix.py
Expand Up @@ -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())
3 changes: 1 addition & 2 deletions src/Mod/Fem/_CommandSolverZ88.py
Expand Up @@ -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())

0 comments on commit 1043133

Please sign in to comment.