FEM: mesh tools, better type checking

FreeCAD · Mar 2, 2020 · d52cde9 · d52cde9
1 parent b73cc1a
commit d52cde9
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/Mod/Fem/femmesh/meshtools.py b/src/Mod/Fem/femmesh/meshtools.py
@@ -732,15 +732,16 @@ def get_elset_short_name(
     obj,
     i
 ):
-    if hasattr(obj, "Proxy") and obj.Proxy.Type == "Fem::Material":
+    from femtools.femutils import is_of_type
+    if is_of_type(obj, "Fem::Material"):
         return "M" + str(i)
-    elif hasattr(obj, "Proxy") and obj.Proxy.Type == "Fem::FemElementGeometry1D":
+    elif is_of_type(obj, "Fem::FemElementGeometry1D"):
         return "B" + str(i)
-    elif hasattr(obj, "Proxy") and obj.Proxy.Type == "Fem::FemElementRotation1D":
+    elif is_of_type(obj, "Fem::FemElementRotation1D"):
         return "R" + str(i)
-    elif hasattr(obj, "Proxy") and obj.Proxy.Type == "Fem::FemElementFluid1D":
+    elif is_of_type(obj, "Fem::FemElementFluid1D"):
         return "F" + str(i)
-    elif hasattr(obj, "Proxy") and obj.Proxy.Type == "Fem::FemElementGeometry2D":
+    elif is_of_type(obj, "Fem::FemElementGeometry2D"):
         return "S" + str(i)
     else:
         FreeCAD.Console.PrintError(