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

FEM: solver control command, make name fit in FEM name system

Browse Source
This commit is contained in:
Bernd Hahnebach 2017-03-02 20:46:40 +01:00 committed by Yorik van Havre
parent 8cf0001e97
commit ef0a253f4e
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Fem/App/CMakeLists.txt
View File

@ -109,7 +109,6 @@ SET(FemGuiScripts_SRCS
PyGui/_CommandAnalysis.py
PyGui/_CommandBeamSection.py
PyGui/_CommandClearMesh.py
PyGui/_CommandControlSolver.py
PyGui/_CommandConstraintSelfWeight.py
PyGui/_CommandFEMMesh2Mesh.py
PyGui/_CommandFluidSection.py
@ -125,6 +124,7 @@ SET(FemGuiScripts_SRCS
PyGui/_CommandShellThickness.py
PyGui/_CommandShowResult.py
PyGui/_CommandSolverCalculix.py
PyGui/_CommandSolverControl.py
PyGui/_CommandSolverRun.py
PyGui/_CommandSolverZ88.py
PyGui/_TaskPanelFemBeamSection.py

2
src/Mod/Fem/CMakeLists.txt
View File

@ -70,7 +70,6 @@ INSTALL(
PyGui/_CommandAnalysis.py
PyGui/_CommandBeamSection.py
PyGui/_CommandClearMesh.py
PyGui/_CommandControlSolver.py
PyGui/_CommandConstraintSelfWeight.py
PyGui/_CommandFEMMesh2Mesh.py
PyGui/_CommandFluidSection.py
@ -86,6 +85,7 @@ INSTALL(
PyGui/_CommandShellThickness.py
PyGui/_CommandShowResult.py
PyGui/_CommandSolverCalculix.py
PyGui/_CommandSolverControl.py
PyGui/_CommandSolverRun.py
PyGui/_CommandSolverZ88.py
PyGui/_TaskPanelFemBeamSection.py

4
src/Mod/Fem/Gui/Workbench.cpp
View File

@ -100,7 +100,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
<< "FEM_ConstraintHeatflux"
<< "FEM_ConstraintInitialTemperature"
<< "Separator"
<< "FEM_ControlSolver"
<< "FEM_SolverControl"
<< "FEM_SolverRun"
<< "Separator"
<< "FEM_PurgeResults"
@ -176,7 +176,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "FEM_ConstraintHeatflux"
<< "FEM_ConstraintInitialTemperature"
<< "Separator"
<< "FEM_ControlSolver"
<< "FEM_SolverControl"
<< "FEM_SolverRun"
<< "Separator"
<< "FEM_PurgeResults"

2
src/Mod/Fem/InitGui.py
View File

@ -49,7 +49,6 @@ class FemWorkbench (Workbench):
import PyGui._CommandPurgeResults
import PyGui._CommandClearMesh
import PyGui._CommandPrintMeshInfo
import PyGui._CommandControlSolver
import PyGui._CommandFEMMesh2Mesh
import PyGui._CommandMeshGmshFromShape
import PyGui._CommandMeshNetgenFromShape
@ -63,6 +62,7 @@ class FemWorkbench (Workbench):
import PyGui._CommandMaterialFluid
import PyGui._CommandMaterialMechanicalNonlinear
import PyGui._CommandSolverCalculix
import PyGui._CommandSolverControl
import PyGui._CommandSolverRun
import PyGui._CommandSolverZ88
import PyGui._CommandConstraintSelfWeight

14
src/Mod/Fem/PyGui/_CommandControlSolver.py → src/Mod/Fem/PyGui/_CommandSolverControl.py
View File

@ -24,7 +24,7 @@ __title__ = "Command Control Solver"
__author__ = "Juergen Riegel"
__url__ = "http://www.freecadweb.org"
## @package CommandControlSolver
## @package CommandSolverControl
# \ingroup FEM
from FemCommands import FemCommands
@ -32,14 +32,14 @@ import FreeCADGui
from PySide import QtCore
class _CommandControlSolver(FemCommands):
"the FEM_ControlSolver command definition"
class _CommandSolverControl(FemCommands):
"the FEM_SolverControl command definition"
def __init__(self):
super(_CommandControlSolver, self).__init__()
super(_CommandSolverControl, self).__init__()
self.resources = {'Pixmap': 'fem-control-solver',
'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_ControlSolver", "Solver job control"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_SolverControl", "Solver job control"),
'Accel': "S, C",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_ControlSolver", "Changes solver attributes and runs the calculations for the selected solver")}
'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_SolverControl", "Changes solver attributes and runs the calculations for the selected solver")}
self.is_active = 'with_solver'
def Activated(self):
@ -47,4 +47,4 @@ class _CommandControlSolver(FemCommands):
FreeCADGui.ActiveDocument.setEdit(solver_obj, 0)
FreeCADGui.addCommand('FEM_ControlSolver', _CommandControlSolver())
FreeCADGui.addCommand('FEM_SolverControl', _CommandSolverControl())