diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 374cc2a99..9dcaa6412 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -120,7 +120,7 @@ SET(FemGuiScripts_SRCS PyGui/_CommandMeshGroup.py PyGui/_CommandMeshRegion.py PyGui/_CommandPrintMeshInfo.py - PyGui/_CommandPurgeResults.py + PyGui/_CommandResultsPurge.py PyGui/_CommandShellThickness.py PyGui/_CommandShowResult.py PyGui/_CommandSolverCalculix.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index eeebdb4ed..15da3107d 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -81,7 +81,7 @@ INSTALL( PyGui/_CommandMeshGroup.py PyGui/_CommandMeshRegion.py PyGui/_CommandPrintMeshInfo.py - PyGui/_CommandPurgeResults.py + PyGui/_CommandResultsPurge.py PyGui/_CommandShellThickness.py PyGui/_CommandShowResult.py PyGui/_CommandSolverCalculix.py diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp index 25b769692..902275e48 100755 --- a/src/Mod/Fem/Gui/Workbench.cpp +++ b/src/Mod/Fem/Gui/Workbench.cpp @@ -103,7 +103,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const << "FEM_SolverControl" << "FEM_SolverRun" << "Separator" - << "FEM_PurgeResults" + << "FEM_ResultsPurge" << "FEM_ShowResult"; #ifdef FC_USE_VTK @@ -179,7 +179,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "FEM_SolverControl" << "FEM_SolverRun" << "Separator" - << "FEM_PurgeResults" + << "FEM_ResultsPurge" << "FEM_ShowResult"; return root; diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py index bf5f4e158..fe6726951 100644 --- a/src/Mod/Fem/InitGui.py +++ b/src/Mod/Fem/InitGui.py @@ -46,7 +46,6 @@ class FemWorkbench (Workbench): import FemGui import PyGui._CommandShowResult - import PyGui._CommandPurgeResults import PyGui._CommandClearMesh import PyGui._CommandPrintMeshInfo import PyGui._CommandFEMMesh2Mesh @@ -61,6 +60,7 @@ class FemWorkbench (Workbench): import PyGui._CommandMaterialSolid import PyGui._CommandMaterialFluid import PyGui._CommandMaterialMechanicalNonlinear + import PyGui._CommandResultsPurge import PyGui._CommandSolverCalculix import PyGui._CommandSolverControl import PyGui._CommandSolverRun diff --git a/src/Mod/Fem/PyGui/_CommandPurgeResults.py b/src/Mod/Fem/PyGui/_CommandResultsPurge.py similarity index 87% rename from src/Mod/Fem/PyGui/_CommandPurgeResults.py rename to src/Mod/Fem/PyGui/_CommandResultsPurge.py index e94657dbb..c1889509d 100644 --- a/src/Mod/Fem/PyGui/_CommandPurgeResults.py +++ b/src/Mod/Fem/PyGui/_CommandResultsPurge.py @@ -24,7 +24,7 @@ __title__ = "Command Purge Fem Results" __author__ = "Juergen Riegel" __url__ = "http://www.freecadweb.org" -## @package CommandPurgeResults +## @package CommandResultsPurge # \ingroup FEM from FemCommands import FemCommands @@ -33,14 +33,14 @@ import FreeCADGui from PySide import QtCore -class _CommandPurgeResults(FemCommands): - # the FEM_PurgeResults command definition +class _CommandResultsPurge(FemCommands): + # the FEM_ResultsPurge command definition def __init__(self): - super(_CommandPurgeResults, self).__init__() + super(_CommandResultsPurge, self).__init__() self.resources = {'Pixmap': 'fem-purge-results', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_PurgeResults", "Purge results"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_ResultsPurge", "Purge results"), 'Accel': "S, S", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_PurgeResults", "Purges all results from active analysis")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_ResultsPurge", "Purges all results from active analysis")} self.is_active = 'with_results' def Activated(self): @@ -49,4 +49,4 @@ class _CommandPurgeResults(FemCommands): self.hide_meshes_show_parts_constraints() -FreeCADGui.addCommand('FEM_PurgeResults', _CommandPurgeResults()) +FreeCADGui.addCommand('FEM_ResultsPurge', _CommandResultsPurge())