diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 871965e48..42757e5ef 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -108,7 +108,6 @@ SET(FemGuiScripts_SRCS PyGui/__init__.py PyGui/_CommandAnalysis.py PyGui/_CommandBeamSection.py - PyGui/_CommandClearMesh.py PyGui/_CommandConstraintSelfWeight.py PyGui/_CommandFEMMesh2Mesh.py PyGui/_CommandFluidSection.py @@ -117,6 +116,7 @@ SET(FemGuiScripts_SRCS PyGui/_CommandMaterialFluid.py PyGui/_CommandMeshGmshFromShape.py PyGui/_CommandMeshNetgenFromShape.py + PyGui/_CommandMeshClear.py PyGui/_CommandMeshGroup.py PyGui/_CommandMeshPrintInfo.py PyGui/_CommandMeshRegion.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 081950305..dbf861951 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -69,16 +69,16 @@ INSTALL( PyGui/__init__.py PyGui/_CommandAnalysis.py PyGui/_CommandBeamSection.py - PyGui/_CommandClearMesh.py PyGui/_CommandConstraintSelfWeight.py PyGui/_CommandFEMMesh2Mesh.py PyGui/_CommandFluidSection.py PyGui/_CommandMaterialMechanicalNonlinear.py PyGui/_CommandMaterialSolid.py PyGui/_CommandMaterialFluid.py + PyGui/_CommandMeshClear.py PyGui/_CommandMeshGmshFromShape.py - PyGui/_CommandMeshNetgenFromShape.py PyGui/_CommandMeshGroup.py + PyGui/_CommandMeshNetgenFromShape.py PyGui/_CommandMeshPrintInfo.py PyGui/_CommandMeshRegion.py PyGui/_CommandResultShow.py diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp index efbaebf3d..ec3806190 100755 --- a/src/Mod/Fem/Gui/Workbench.cpp +++ b/src/Mod/Fem/Gui/Workbench.cpp @@ -54,7 +54,7 @@ void Workbench::setupContextMenu(const char* recipient, Gui::MenuItem* item) con { StdWorkbench::setupContextMenu( recipient, item ); *item << "Separator" - << "FEM_ClearMesh" + << "FEM_MeshClear" << "FEM_MeshPrintInfo"; } diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py index d1dca9726..88f8b5f62 100644 --- a/src/Mod/Fem/InitGui.py +++ b/src/Mod/Fem/InitGui.py @@ -45,7 +45,6 @@ class FemWorkbench (Workbench): import Fem import FemGui - import PyGui._CommandClearMesh import PyGui._CommandFEMMesh2Mesh import PyGui._CommandAnalysis import PyGui._CommandShellThickness @@ -54,6 +53,7 @@ class FemWorkbench (Workbench): import PyGui._CommandMaterialSolid import PyGui._CommandMaterialFluid import PyGui._CommandMaterialMechanicalNonlinear + import PyGui._CommandMeshClear import PyGui._CommandMeshGmshFromShape import PyGui._CommandMeshGroup import PyGui._CommandMeshNetgenFromShape diff --git a/src/Mod/Fem/PyGui/_CommandClearMesh.py b/src/Mod/Fem/PyGui/_CommandMeshClear.py similarity index 89% rename from src/Mod/Fem/PyGui/_CommandClearMesh.py rename to src/Mod/Fem/PyGui/_CommandMeshClear.py index 0a96d3a18..cbe5ebb2f 100644 --- a/src/Mod/Fem/PyGui/_CommandClearMesh.py +++ b/src/Mod/Fem/PyGui/_CommandMeshClear.py @@ -24,7 +24,7 @@ __title__ = "Clear the FemMesh of a FEM mesh object" __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandClearMesh +## @package CommandMeshClear # \ingroup FEM import FreeCAD @@ -33,14 +33,14 @@ import FreeCADGui from PySide import QtCore -class _CommandClearMesh(FemCommands): - "the FEM_ClearMesh command definition" +class _CommandMeshClear(FemCommands): + "the FEM_MeshClear command definition" def __init__(self): - super(_CommandClearMesh, self).__init__() + super(_CommandMeshClear, self).__init__() self.resources = {'Pixmap': 'fem-femmesh-clear-mesh', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_ClearMesh", "Clear FEM mesh"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_MeshClear", "Clear FEM mesh"), # 'Accel': "Z, Z", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_ClearMesh", "Clear the Mesh of a FEM mesh object")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_MeshClear", "Clear the Mesh of a FEM mesh object")} self.is_active = 'with_femmesh' def Activated(self): @@ -53,4 +53,4 @@ class _CommandClearMesh(FemCommands): FreeCADGui.Selection.clearSelection() -FreeCADGui.addCommand('FEM_ClearMesh', _CommandClearMesh()) +FreeCADGui.addCommand('FEM_MeshClear', _CommandMeshClear())