diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc index a100469aef37..41b7f96984f0 100755 --- a/src/Mod/Fem/Gui/Resources/Fem.qrc +++ b/src/Mod/Fem/Gui/Resources/Fem.qrc @@ -25,10 +25,12 @@ icons/fem-control-solver.svg icons/fem-cylinder.svg icons/fem-data.png + icons/fem-femmesh-clear-mesh.svg icons/fem-femmesh-create-node-by-poly.svg icons/fem-femmesh-from-shape.svg icons/fem-femmesh-gmsh-from-shape.svg icons/fem-femmesh-netgen-from-shape.svg + icons/fem-femmesh-print-info.svg icons/fem-femmesh-region.svg icons/fem-femmesh-to-mesh.svg icons/fem-frequency-analysis.svg diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-clear-mesh.svg b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-clear-mesh.svg new file mode 100644 index 000000000000..00cc0d7a5eb1 --- /dev/null +++ b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-clear-mesh.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-print-info.svg b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-print-info.svg new file mode 100644 index 000000000000..012bf6ba0ebc --- /dev/null +++ b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-print-info.svg @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/Mod/Fem/_CommandClearMesh.py b/src/Mod/Fem/_CommandClearMesh.py index bb9c02343d5d..d4364bd59dbd 100644 --- a/src/Mod/Fem/_CommandClearMesh.py +++ b/src/Mod/Fem/_CommandClearMesh.py @@ -37,7 +37,7 @@ class _CommandClearMesh(FemCommands): "clear the FEM mesh" def __init__(self): super(_CommandClearMesh, self).__init__() - self.resources = {'Pixmap': 'fem-femmesh-from-shape', + self.resources = {'Pixmap': 'fem-femmesh-clear-mesh', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_ClearMesh", "Clear FEM mesh"), # 'Accel': "Z, Z", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_ClearMesh", "Clear the Mesh of a FEM mesh object")} diff --git a/src/Mod/Fem/_CommandPrintMeshInfo.py b/src/Mod/Fem/_CommandPrintMeshInfo.py index b46fa68a4df8..e1a2c12c59a2 100644 --- a/src/Mod/Fem/_CommandPrintMeshInfo.py +++ b/src/Mod/Fem/_CommandPrintMeshInfo.py @@ -31,13 +31,14 @@ from FemCommands import FemCommands import FreeCADGui from PySide import QtCore +from PySide import QtGui class _CommandPrintMeshInfo(FemCommands): "Print FEM mesh info" def __init__(self): super(_CommandPrintMeshInfo, self).__init__() - self.resources = {'Pixmap': 'fem-femmesh-from-shape', + self.resources = {'Pixmap': 'fem-femmesh-print-info', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_PrintMeshInfo", "Print FEM mesh info"), # 'Accel': "Z, Z", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_PrintMeshInfo", "Print FEM mesh info")} @@ -49,6 +50,10 @@ def Activated(self): FreeCAD.ActiveDocument.openTransaction("Print FEM mesh info") FreeCADGui.doCommand("print(App.ActiveDocument." + sel[0].Name + ".FemMesh)") + FreeCADGui.addModule("PySide") + FreeCADGui.doCommand("mesh_info = str(App.ActiveDocument." + sel[0].Name + ".FemMesh)") + FreeCADGui.doCommand("PySide.QtGui.QMessageBox.information(None, 'FEM Mesh Info', mesh_info)") + FreeCADGui.Selection.clearSelection() FreeCADGui.addCommand('Fem_PrintMeshInfo',_CommandPrintMeshInfo())