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

FreeCAD · Mar 3, 2017 · 8cf0001 · 8cf0001
1 parent fb833d4
commit 8cf0001
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
@@ -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

diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
@@ -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

diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp
@@ -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";

diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py
@@ -46,7 +46,6 @@ def Initialize(self):
         import FemGui
 
         import PyGui._CommandShowResult
-        import PyGui._CommandRunSolver
         import PyGui._CommandPurgeResults
         import PyGui._CommandClearMesh
         import PyGui._CommandPrintMeshInfo
@@ -64,6 +63,7 @@ def Initialize(self):
         import PyGui._CommandMaterialFluid
         import PyGui._CommandMaterialMechanicalNonlinear
         import PyGui._CommandSolverCalculix
+        import PyGui._CommandSolverRun
         import PyGui._CommandSolverZ88
         import PyGui._CommandConstraintSelfWeight
 

diff --git a/src/Mod/Fem/PyGui/_CommandRunSolver.py → src/Mod/Fem/PyGui/_CommandSolverRun.py b/src/Mod/Fem/PyGui/_CommandRunSolver.py → src/Mod/Fem/PyGui/_CommandSolverRun.py
@@ -24,22 +24,22 @@
 __author__ = "Juergen Riegel"
 __url__ = "http://www.freecadweb.org"
 
-## @package CommandRunSolver
+## @package CommandSolverRun
 #  \ingroup FEM
 
 from FemCommands import FemCommands
 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 @@ def load_results(ret_code):
             QtGui.QMessageBox.critical(None, "Not known solver type", message)
 
 
-FreeCADGui.addCommand('FEM_RunSolver', _CommandRunSolver())
+FreeCADGui.addCommand('FEM_SolverRun', _CommandSolverRun))