From 1c0920d624f9957ec4e4094a1f01d83cd5e48f8c Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 22 Nov 2016 19:47:46 +0100 Subject: [PATCH] FEM: rename CommandMeshFromShape into _CommandMeshNetgenFromShape --- 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 +- ...Shape.py => _CommandMeshNetgenFromShape.py} | 18 +++++++++--------- 5 files changed, 14 insertions(+), 14 deletions(-) rename src/Mod/Fem/{_CommandMeshFromShape.py => _CommandMeshNetgenFromShape.py} (82%) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index edf1e423a..448b304ce 100755 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -70,7 +70,7 @@ SET(FemScripts_SRCS _CommandConstraintSelfWeight.py _CommandMaterialMechanicalNonlinear.py _CommandMechanicalMaterial.py - _CommandMeshFromShape.py + _CommandMeshNetgenFromShape.py _CommandPurgeResults.py _CommandRunSolver.py _CommandShellThickness.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 0d3638f9c..213166b67 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -24,7 +24,7 @@ INSTALL( TestFem.py FemCommands.py - _CommandMeshFromShape.py + _CommandMeshNetgenFromShape.py _CommandPurgeResults.py _CommandRunSolver.py _CommandControlSolver.py diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp index ebc18caf0..86a3985ec 100755 --- a/src/Mod/Fem/Gui/Workbench.cpp +++ b/src/Mod/Fem/Gui/Workbench.cpp @@ -58,7 +58,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const *fem << "Fem_Analysis" << "Fem_SolverCalculix" // << "Fem_SolverZ88" - << "Fem_MeshFromShape" + << "Fem_MeshNetgenFromShape" << "Fem_MechanicalMaterial" << "Fem_MaterialMechanicalNonlinear" << "Fem_BeamSection" @@ -118,7 +118,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const *fem << "Fem_Analysis" << "Fem_SolverCalculix" << "Fem_SolverZ88" - << "Fem_MeshFromShape" + << "Fem_MeshNetgenFromShape" << "Fem_MechanicalMaterial" << "Fem_MaterialMechanicalNonlinear" << "Fem_BeamSection" diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py index 577f2e65b..369e21f59 100644 --- a/src/Mod/Fem/InitGui.py +++ b/src/Mod/Fem/InitGui.py @@ -49,7 +49,7 @@ class FemWorkbench (Workbench): import _CommandRunSolver import _CommandPurgeResults import _CommandControlSolver - import _CommandMeshFromShape + import _CommandMeshNetgenFromShape import _CommandAnalysis import _CommandShellThickness import _CommandBeamSection diff --git a/src/Mod/Fem/_CommandMeshFromShape.py b/src/Mod/Fem/_CommandMeshNetgenFromShape.py similarity index 82% rename from src/Mod/Fem/_CommandMeshFromShape.py rename to src/Mod/Fem/_CommandMeshNetgenFromShape.py index 3f74e49f4..27e1f1127 100644 --- a/src/Mod/Fem/_CommandMeshFromShape.py +++ b/src/Mod/Fem/_CommandMeshNetgenFromShape.py @@ -20,11 +20,11 @@ # * * # *************************************************************************** -__title__ = "Command Mesh From Shape" +__title__ = "Command Mesh Netgen From Shape" __author__ = "Juergen Riegel" __url__ = "http://www.freecadweb.org" -## @package CommandMeshFromShape +## @package CommandMeshNetgenFromShape # \ingroup FEM import FreeCAD @@ -33,17 +33,17 @@ import FreeCADGui from PySide import QtCore -class _CommandMeshFromShape(FemCommands): - # the Fem_MeshFromShape command definition +class _CommandMeshNetgenFromShape(FemCommands): + # the Fem_MeshNetgenFromShape command definition def __init__(self): - super(_CommandMeshFromShape, self).__init__() + super(_CommandMeshNetgenFromShape, self).__init__() self.resources = {'Pixmap': 'fem-fem-mesh-from-shape', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_MeshFromShape", "FEM mesh from shape"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_MeshFromShape", "Create a FEM volume mesh from a solid shape")} + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_MeshFromShape", "FEM mesh from shape by Netgen"), + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_MeshFromShape", "Create a FEM volume mesh from a solid or face shape by Netgen internal mesher")} self.is_active = 'with_part_feature' def Activated(self): - FreeCAD.ActiveDocument.openTransaction("Create FEM mesh") + FreeCAD.ActiveDocument.openTransaction("Create FEM mesh Netgen") FreeCADGui.addModule("FemGui") sel = FreeCADGui.Selection.getSelection() if (len(sel) == 1): @@ -56,4 +56,4 @@ class _CommandMeshFromShape(FemCommands): if FreeCAD.GuiUp: - FreeCADGui.addCommand('Fem_MeshFromShape', _CommandMeshFromShape()) + FreeCADGui.addCommand('Fem_MeshNetgenFromShape', _CommandMeshNetgenFromShape())