From 4bbd896d4ba7b88c443c2956b79c5d2f2ba25b8e Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 22 Nov 2016 19:48:46 +0100 Subject: [PATCH] FEM: GMSH mesh tool, change icons for netgen and gmsh mesh to distingish them in toolbar --- src/Mod/Fem/Gui/Resources/Fem.qrc | 2 + .../icons/fem-fem-mesh-gmsh-from-shape.svg | 246 ++++++++++++++++++ .../icons/fem-fem-mesh-netgen-from-shape.svg | 246 ++++++++++++++++++ src/Mod/Fem/_CommandMeshGmshFromShape.py | 2 +- src/Mod/Fem/_CommandMeshNetgenFromShape.py | 2 +- 5 files changed, 496 insertions(+), 2 deletions(-) create mode 100644 src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-gmsh-from-shape.svg create mode 100644 src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-netgen-from-shape.svg diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc index cffc4a2a73..7eb3d8a58d 100755 --- a/src/Mod/Fem/Gui/Resources/Fem.qrc +++ b/src/Mod/Fem/Gui/Resources/Fem.qrc @@ -1,6 +1,8 @@ icons/fem-fem-mesh-from-shape.svg + icons/fem-fem-mesh-gmsh-from-shape.svg + icons/fem-fem-mesh-netgen-from-shape.svg icons/fem-fem-mesh-create-node-by-poly.svg icons/fem-analysis.svg icons/fem-cfd-analysis.svg diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-gmsh-from-shape.svg b/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-gmsh-from-shape.svg new file mode 100644 index 0000000000..d9fd5d8cf4 --- /dev/null +++ b/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-gmsh-from-shape.svg @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + G + G + + diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-netgen-from-shape.svg b/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-netgen-from-shape.svg new file mode 100644 index 0000000000..34c5bb60ef --- /dev/null +++ b/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-netgen-from-shape.svg @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + N + N + + diff --git a/src/Mod/Fem/_CommandMeshGmshFromShape.py b/src/Mod/Fem/_CommandMeshGmshFromShape.py index c7f628d2f6..c279232880 100644 --- a/src/Mod/Fem/_CommandMeshGmshFromShape.py +++ b/src/Mod/Fem/_CommandMeshGmshFromShape.py @@ -38,7 +38,7 @@ class _CommandMeshGmshFromShape(FemCommands): # the Fem_MeshGmshFromShape command definition def __init__(self): super(_CommandMeshGmshFromShape, self).__init__() - self.resources = {'Pixmap': 'fem-fem-mesh-from-shape', + self.resources = {'Pixmap': 'fem-fem-mesh-gmsh-from-shape', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_MeshGmshFromShape", "FEM mesh from shape by GMSH"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_MeshGmshFromShape", "Create a FEM mesh from a shape by GMSH mesher")} self.is_active = 'with_part_feature' diff --git a/src/Mod/Fem/_CommandMeshNetgenFromShape.py b/src/Mod/Fem/_CommandMeshNetgenFromShape.py index 27e1f11274..b44a161db5 100644 --- a/src/Mod/Fem/_CommandMeshNetgenFromShape.py +++ b/src/Mod/Fem/_CommandMeshNetgenFromShape.py @@ -37,7 +37,7 @@ class _CommandMeshNetgenFromShape(FemCommands): # the Fem_MeshNetgenFromShape command definition def __init__(self): super(_CommandMeshNetgenFromShape, self).__init__() - self.resources = {'Pixmap': 'fem-fem-mesh-from-shape', + self.resources = {'Pixmap': 'fem-fem-mesh-netgen-from-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'