FEM: mesh region object, move make def into make objects FEM module

FreeCAD · Feb 21, 2017 · fe1a733 · fe1a733
1 parent b7d69d9
commit fe1a733
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 53 deletions.
diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
@@ -126,7 +126,6 @@ SET(FemScripts_SRCS
     FemInputWriterCcx.py
     FemInputWriterZ88.py
     FemMesh2Mesh.py
-    FemMeshRegion.py
     FemMeshTools.py
     FemTools.py
     FemToolsCcx.py

diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
@@ -62,7 +62,6 @@ INSTALL(
         _TaskPanelFemMeshGroup.py
         TaskPanelFemMeshGroup.ui
 
-        FemMeshRegion.py
         _FemMeshRegion.py
         _ViewProviderFemMeshRegion.py
         _CommandMeshRegion.py

diff --git a/src/Mod/Fem/FemMeshRegion.py b/src/Mod/Fem/FemMeshRegion.py
diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py
@@ -277,6 +277,23 @@ def makeMeshGroup(base_mesh, use_label=False, name="FEMMeshGroup"):
     return obj
 
 
+def makeMeshRegion(base_mesh, element_length=0.0, name="FEMMeshRegion"):
+    '''makeMeshRegion([length], [name]): creates a  FEM mesh region object to define properties for a regon of a FEM mesh'''
+    obj = FreeCAD.ActiveDocument.addObject("Fem::FeaturePython", name)
+    import _FemMeshRegion
+    _FemMeshRegion._FemMeshRegion(obj)
+    obj.CharacteristicLength = element_length
+    # obj.BaseMesh = base_mesh
+    # App::PropertyLinkList does not support append, we will use a temporary list to append the mesh region obj. to the list
+    tmplist = base_mesh.MeshRegionList
+    tmplist.append(obj)
+    base_mesh.MeshRegionList = tmplist
+    if FreeCAD.GuiUp:
+        import _ViewProviderFemMeshRegion
+        _ViewProviderFemMeshRegion._ViewProviderFemMeshRegion(obj.ViewObject)
+    return obj
+
+
 '''
 # print supportedTypes
 App.newDocument()

diff --git a/src/Mod/Fem/_CommandMeshRegion.py b/src/Mod/Fem/_CommandMeshRegion.py
@@ -45,12 +45,12 @@ def __init__(self):
 
     def Activated(self):
         FreeCAD.ActiveDocument.openTransaction("Create FemMeshRegion")
-        FreeCADGui.addModule("FemMeshRegion")
+        FreeCADGui.addModule("ObjectsFem")
         sel = FreeCADGui.Selection.getSelection()
         if (len(sel) == 1):
             sobj = sel[0]
             if len(sel) == 1 and hasattr(sobj, "Proxy") and sobj.Proxy.Type == "FemMeshGmsh":
-                FreeCADGui.doCommand("FemMeshRegion.makeFemMeshRegion(App.ActiveDocument." + sobj.Name + ")")
+                FreeCADGui.doCommand("ObjectsFem.makeMeshRegion(App.ActiveDocument." + sobj.Name + ")")
 
         FreeCADGui.Selection.clearSelection()