FEM: mesh objects, use same name sheme as for all other FEM objects

FreeCAD · Jul 3, 2017 · b2fa046 · b2fa046
1 parent ed95e92
commit b2fa046
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -49,7 +49,8 @@ def Activated(self):
         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
@@ -49,12 +49,14 @@ def Activated(self):
         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()