From 03d1d32e38e604324bf6e4f9fa6168efe759f45b Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 25 Nov 2015 06:48:00 +0100 Subject: [PATCH] FEM: rename command MechanicalJobControl to SolverJobControl --- src/Mod/Fem/App/CMakeLists.txt | 2 +- src/Mod/Fem/CMakeLists.txt | 2 +- src/Mod/Fem/Gui/Workbench.cpp | 4 ++-- src/Mod/Fem/InitGui.py | 2 +- ...anicalJobControl.py => _CommandSolverJobControl.py} | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) rename src/Mod/Fem/{_CommandMechanicalJobControl.py => _CommandSolverJobControl.py} (88%) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index e849dd8d8..02d1e037a 100755 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -74,12 +74,12 @@ SET(FemScripts_SRCS _CommandFemFromShape.py _CommandFemShellThickness.py _CommandFemSolverCalculix.py - _CommandMechanicalJobControl.py _CommandMechanicalMaterial.py _CommandMechanicalShowResult.py _CommandNewMechanicalAnalysis.py _CommandPurgeFemResults.py _CommandQuickAnalysis.py + _CommandSolverJobControl.py _FemAnalysis.py _FemBeamSection.py _FemShellThickness.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index c602ed81d..809c35fbe 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -37,7 +37,7 @@ INSTALL( MechanicalAnalysis.py _CommandNewMechanicalAnalysis.py - _CommandMechanicalJobControl.py + _CommandSolverJobControl.py _TaskPanelFemSolverCalculix.py TaskPanelFemSolverCalculix.ui diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp index d3811c4fc..2c093ee3c 100755 --- a/src/Mod/Fem/Gui/Workbench.cpp +++ b/src/Mod/Fem/Gui/Workbench.cpp @@ -71,7 +71,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const << "Fem_ConstraintGear" << "Fem_ConstraintPulley" << "Separator" - << "Fem_MechanicalJobControl" + << "Fem_SolverJobControl" << "Fem_Quick_Analysis" << "Fem_PurgeResults" << "Fem_ShowResult"; @@ -101,7 +101,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Fem_ConstraintGear" << "Fem_ConstraintPulley" << "Separator" - << "Fem_MechanicalJobControl" + << "Fem_SolverJobControl" << "Fem_Quick_Analysis" << "Fem_PurgeResults" << "Fem_ShowResult"; diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py index e7af375bc..e2799b6da 100644 --- a/src/Mod/Fem/InitGui.py +++ b/src/Mod/Fem/InitGui.py @@ -45,7 +45,7 @@ class FemWorkbench (Workbench): import _CommandMechanicalShowResult import _CommandQuickAnalysis import _CommandPurgeFemResults - import _CommandMechanicalJobControl + import _CommandSolverJobControl import _CommandFemFromShape import _CommandNewMechanicalAnalysis import _CommandFemShellThickness diff --git a/src/Mod/Fem/_CommandMechanicalJobControl.py b/src/Mod/Fem/_CommandSolverJobControl.py similarity index 88% rename from src/Mod/Fem/_CommandMechanicalJobControl.py rename to src/Mod/Fem/_CommandSolverJobControl.py index 7bbdd8efb..1f53ca5ff 100644 --- a/src/Mod/Fem/_CommandMechanicalJobControl.py +++ b/src/Mod/Fem/_CommandSolverJobControl.py @@ -33,14 +33,14 @@ if FreeCAD.GuiUp: from PySide import QtCore -class _CommandMechanicalJobControl(FemCommands): +class _CommandSolverJobControl(FemCommands): "the Fem JobControl command definition" def __init__(self): - super(_CommandMechanicalJobControl, self).__init__() + super(_CommandSolverJobControl, self).__init__() self.resources = {'Pixmap': 'fem-new-analysis', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_JobControl", "Start calculation"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_JobControl", "Start solver job control"), 'Accel': "S, C", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_JobControl", "Dialog to start the calculation of the mechanical anlysis")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_JobControl", "Dialog to start the calculation of the selected solver")} self.is_active = 'with_solver' def Activated(self): @@ -52,4 +52,4 @@ class _CommandMechanicalJobControl(FemCommands): if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_MechanicalJobControl', _CommandMechanicalJobControl()) + FreeCADGui.addCommand('Fem_SolverJobControl', _CommandSolverJobControl())