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

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

Browse Source
This commit is contained in:
Bernd Hahnebach 2017-03-02 20:40:45 +01:00 committed by Yorik van Havre
parent fb833d4a8a
commit 8cf0001e97
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

@ -122,10 +122,10 @@ SET(FemGuiScripts_SRCS
PyGui/_CommandMeshRegion.py
PyGui/_CommandPrintMeshInfo.py
PyGui/_CommandPurgeResults.py
PyGui/_CommandRunSolver.py
PyGui/_CommandShellThickness.py
PyGui/_CommandShowResult.py
PyGui/_CommandSolverCalculix.py
PyGui/_CommandSolverRun.py
PyGui/_CommandSolverZ88.py
PyGui/_TaskPanelFemBeamSection.py
PyGui/_TaskPanelFemFluidSection.py

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

@ -83,10 +83,10 @@ INSTALL(
PyGui/_CommandMeshRegion.py
PyGui/_CommandPrintMeshInfo.py
PyGui/_CommandPurgeResults.py
PyGui/_CommandRunSolver.py
PyGui/_CommandShellThickness.py
PyGui/_CommandShowResult.py
PyGui/_CommandSolverCalculix.py
PyGui/_CommandSolverRun.py
PyGui/_CommandSolverZ88.py
PyGui/_TaskPanelFemBeamSection.py
PyGui/_TaskPanelFemFluidSection.py

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

@ -101,7 +101,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
<< "FEM_ConstraintInitialTemperature"
<< "Separator"
<< "FEM_ControlSolver"
<< "FEM_RunSolver"
<< "FEM_SolverRun"
<< "Separator"
<< "FEM_PurgeResults"
<< "FEM_ShowResult";
@ -177,7 +177,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "FEM_ConstraintInitialTemperature"
<< "Separator"
<< "FEM_ControlSolver"
<< "FEM_RunSolver"
<< "FEM_SolverRun"
<< "Separator"
<< "FEM_PurgeResults"
<< "FEM_ShowResult";

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

@ -46,7 +46,6 @@ class FemWorkbench (Workbench):
import FemGui
import PyGui._CommandShowResult
import PyGui._CommandRunSolver
import PyGui._CommandPurgeResults
import PyGui._CommandClearMesh
import PyGui._CommandPrintMeshInfo
@ -64,6 +63,7 @@ class FemWorkbench (Workbench):
import PyGui._CommandMaterialFluid
import PyGui._CommandMaterialMechanicalNonlinear
import PyGui._CommandSolverCalculix
import PyGui._CommandSolverRun
import PyGui._CommandSolverZ88
import PyGui._CommandConstraintSelfWeight

14
src/Mod/Fem/PyGui/_CommandRunSolver.py → src/Mod/Fem/PyGui/_CommandSolverRun.py
View File

@ -24,7 +24,7 @@ __title__ = "Command Run Solver"
__author__ = "Juergen Riegel"
__url__ = "http://www.freecadweb.org"
## @package CommandRunSolver
## @package CommandSolverRun
# \ingroup FEM
from FemCommands import FemCommands
@ -32,14 +32,14 @@ import FreeCADGui
from PySide import QtCore, QtGui
class _CommandRunSolver(FemCommands):
# the FEM_RunSolver command definition
class _CommandSolverRun(FemCommands):
# the FEM_SolverRun command definition
def __init__(self):
super(_CommandRunSolver, self).__init__()
super(_CommandSolverRun, self).__init__()
self.resources = {'Pixmap': 'fem-run-solver',
'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_RunAnalysis", "Run solver calculations"),
'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_SolverRun", "Run solver calculations"),
'Accel': "R, C",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_RunAnalysis", "Runs the calculations for the selected solver")}
'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_SolverRun", "Runs the calculations for the selected solver")}
self.is_active = 'with_solver'
def Activated(self):
@ -77,4 +77,4 @@ class _CommandRunSolver(FemCommands):
QtGui.QMessageBox.critical(None, "Not known solver type", message)
FreeCADGui.addCommand('FEM_RunSolver', _CommandRunSolver())
FreeCADGui.addCommand('FEM_SolverRun', _CommandSolverRun))