kindred/create
1
1
Fork 0
Code Issues 36 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: command modules, get rid of duplicate selection code

Browse Source
This commit is contained in:
Bernd Hahnebach
2017-10-05 05:59:10 +01:00
committed by wmayer
parent e3348e7eee
commit 43a9e96192
4 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Fem/PyGui/_CommandFemMeshBoundaryLayer.py
View File

@@ -46,11 +46,8 @@ class _CommandFemMeshBoundaryLayer(FemCommands):
def Activated(self):
FreeCAD.ActiveDocument.openTransaction("Create FemMeshBoundaryLayer")
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("ObjectsFem.makeMeshBoundaryLayer(FreeCAD.ActiveDocument, FreeCAD.ActiveDocument." + sobj.Name + ")")
self.mesh = FreeCADGui.Selection.getSelection()[0] # see 'with_gmsh_femmesh' in FemCommands for selection check
FreeCADGui.doCommand("ObjectsFem.makeMeshBoundaryLayer(FreeCAD.ActiveDocument, FreeCAD.ActiveDocument." + self.mesh.Name + ")")
FreeCADGui.Selection.clearSelection()

7
src/Mod/Fem/PyGui/_CommandFemMeshGroup.py
View File

@@ -46,11 +46,8 @@ class _CommandFemMeshGroup(FemCommands):
def Activated(self):
FreeCAD.ActiveDocument.openTransaction("Create FemMeshGroup")
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("ObjectsFem.makeMeshGroup(FreeCAD.ActiveDocument, FreeCAD.ActiveDocument." + sobj.Name + ")")
self.mesh = FreeCADGui.Selection.getSelection()[0] # see 'with_gmsh_femmesh' in FemCommands for selection check
FreeCADGui.doCommand("ObjectsFem.makeMeshGroup(FreeCAD.ActiveDocument, FreeCAD.ActiveDocument." + self.mesh.Name + ")")
FreeCADGui.Selection.clearSelection()

7
src/Mod/Fem/PyGui/_CommandFemMeshRegion.py
View File

@@ -46,11 +46,8 @@ class _CommandFemMeshRegion(FemCommands):
def Activated(self):
FreeCAD.ActiveDocument.openTransaction("Create 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("ObjectsFem.makeMeshRegion(FreeCAD.ActiveDocument, FreeCAD.ActiveDocument." + sobj.Name + ")")
self.mesh = FreeCADGui.Selection.getSelection()[0] # see 'with_gmsh_femmesh' in FemCommands for selection check
FreeCADGui.doCommand("ObjectsFem.makeMeshRegion(FreeCAD.ActiveDocument, FreeCAD.ActiveDocument." + self.mesh.Name + ")")
FreeCADGui.Selection.clearSelection()

4
src/Mod/Fem/PyGui/_CommandFemSolverRun.py
View File

@@ -49,9 +49,7 @@ class _CommandFemSolverRun(FemCommands):
else:
print ("CalculiX failed ccx finished with error {}".format(ret_code))
sel = FreeCADGui.Selection.getSelection()
if len(sel) == 1 and sel[0].isDerivedFrom("Fem::FemSolverObjectPython"):
self.solver = sel[0]
self.solver = FreeCADGui.Selection.getSelection()[0] # see 'with_solver' in FemCommands for selection check
if self.solver.SolverType == "FemSolverCalculix":
import FemToolsCcx
self.fea = FemToolsCcx.FemToolsCcx(None, self.solver)