From b2fa046e7653240caa7c8d7a461de50afe90eccf Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sat, 1 Jul 2017 19:14:58 +0200 Subject: [PATCH] FEM: mesh objects, use same name sheme as for all other FEM objects --- src/Mod/Fem/ObjectsFem.py | 2 +- src/Mod/Fem/PyGui/_CommandFemMeshGmshFromShape.py | 3 ++- src/Mod/Fem/PyGui/_CommandFemMeshNetgenFromShape.py | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py index 219485609a..6b33ee4ce8 100644 --- a/src/Mod/Fem/ObjectsFem.py +++ b/src/Mod/Fem/ObjectsFem.py @@ -247,7 +247,7 @@ def makeMeshGroup(base_mesh, use_label=False, name="FEMMeshGroup"): return obj -def makeMeshShapeNetgenObject(name="MeshShapeNetgenObject"): +def makeMeshShapeNetgenObject(name="FEMMeshNetgen"): '''makeMeshShapeNetgenObject(name): makes a Fem MeshShapeNetgenObject object''' obj = FreeCAD.ActiveDocument.addObject("Fem::FemMeshShapeNetgenObject", name) return obj diff --git a/src/Mod/Fem/PyGui/_CommandFemMeshGmshFromShape.py b/src/Mod/Fem/PyGui/_CommandFemMeshGmshFromShape.py index bebf9cd8af..6472ff263c 100644 --- a/src/Mod/Fem/PyGui/_CommandFemMeshGmshFromShape.py +++ b/src/Mod/Fem/PyGui/_CommandFemMeshGmshFromShape.py @@ -49,7 +49,8 @@ class _CommandFemMeshGmshFromShape(FemCommands): sel = FreeCADGui.Selection.getSelection() if (len(sel) == 1): if(sel[0].isDerivedFrom("Part::Feature")): - mesh_obj_name = sel[0].Name + "_Mesh" + mesh_obj_name = 'FEMMeshGMSH' + # mesh_obj_name = sel[0].Name + "_Mesh" # if requested by some people add Preference for this FreeCADGui.addModule("ObjectsFem") FreeCADGui.doCommand("ObjectsFem.makeMeshGmsh('" + mesh_obj_name + "')") FreeCADGui.doCommand("App.ActiveDocument.ActiveObject.Part = App.ActiveDocument." + sel[0].Name) diff --git a/src/Mod/Fem/PyGui/_CommandFemMeshNetgenFromShape.py b/src/Mod/Fem/PyGui/_CommandFemMeshNetgenFromShape.py index 674493fa1f..80ba04ea93 100644 --- a/src/Mod/Fem/PyGui/_CommandFemMeshNetgenFromShape.py +++ b/src/Mod/Fem/PyGui/_CommandFemMeshNetgenFromShape.py @@ -49,12 +49,14 @@ class _CommandFemMeshNetgenFromShape(FemCommands): sel = FreeCADGui.Selection.getSelection() if (len(sel) == 1): if(sel[0].isDerivedFrom("Part::Feature")): - FreeCADGui.doCommand("App.activeDocument().addObject('Fem::FemMeshShapeNetgenObject', '" + sel[0].Name + "_Mesh')") - FreeCADGui.doCommand("App.activeDocument().ActiveObject.Shape = App.activeDocument()." + sel[0].Name) + mesh_obj_name = 'FEMMeshNetgen' + # mesh_obj_name = sel[0].Name + "_Mesh" # if requested by some people add Preference for this + FreeCADGui.doCommand("App.ActiveDocument.addObject('Fem::FemMeshShapeNetgenObject', '" + mesh_obj_name + "')") + FreeCADGui.doCommand("App.ActiveDocument.ActiveObject.Shape = App.activeDocument()." + sel[0].Name) if FemGui.getActiveAnalysis(): FreeCADGui.addModule("FemGui") FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [App.ActiveDocument.ActiveObject]") - FreeCADGui.doCommand("Gui.activeDocument().setEdit(App.ActiveDocument.ActiveObject.Name)") + FreeCADGui.doCommand("Gui.ActiveDocument.setEdit(App.ActiveDocument.ActiveObject.Name)") FreeCADGui.Selection.clearSelection()