From 227a25a686eea87471dff7f416f6ff0511c57dee Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 30 Jan 2018 21:04:31 +0100 Subject: [PATCH] FEM: code formating, flake8 --- src/Mod/Fem/femcommands/commands.py | 2 +- src/Mod/Fem/feminout/importFenicsMesh.py | 4 ++-- src/Mod/Fem/feminout/importToolsFem.py | 2 +- src/Mod/Fem/femsolver/calculix/writer.py | 2 +- src/Mod/Fem/femsolver/elmer/equations/equation.py | 1 - src/Mod/Fem/femtest/testfemcommon.py | 8 ++++---- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/Mod/Fem/femcommands/commands.py b/src/Mod/Fem/femcommands/commands.py index 43f718ad5b..a3f89eac42 100644 --- a/src/Mod/Fem/femcommands/commands.py +++ b/src/Mod/Fem/femcommands/commands.py @@ -474,7 +474,7 @@ class _CommandFemMeshNetgenFromShape(CommandManager): self.is_active = 'with_part_feature' def Activated(self): - # a mesh could be made with and without an analysis, + # a mesh could be made with and without an analysis, # we're going to check not for an analysis in command manager module FreeCAD.ActiveDocument.openTransaction("Create FEM mesh Netgen") mesh_obj_name = 'FEMMeshNetgen' diff --git a/src/Mod/Fem/feminout/importFenicsMesh.py b/src/Mod/Fem/feminout/importFenicsMesh.py index 5ee6859b11..41a6e78697 100644 --- a/src/Mod/Fem/feminout/importFenicsMesh.py +++ b/src/Mod/Fem/feminout/importFenicsMesh.py @@ -87,7 +87,7 @@ class WriteXDMFTaskPanel: self.form.tableGroups.setItem(ind, 3, QtGui.QTableWidgetItem(str(0))) # default value for marked elements self.form.tableGroups.setItem(ind, 4, QtGui.QTableWidgetItem(str(1))) - + header = self.form.tableGroups.horizontalHeader() header.setResizeMode(0, QtGui.QHeaderView.ResizeToContents) header.setResizeMode(1, QtGui.QHeaderView.ResizeToContents) @@ -100,7 +100,7 @@ class WriteXDMFTaskPanel: num_rows = self.form.tableGroups.rowCount() for r in range(num_rows): - g = int(self.form.tableGroups.item(r, 0).text()) # read-only no prob + g = int(self.form.tableGroups.item(r, 0).text()) # read-only no prob default_value = 0 marked_value = 1 try: diff --git a/src/Mod/Fem/feminout/importToolsFem.py b/src/Mod/Fem/feminout/importToolsFem.py index 7c14a58da7..c0b5aca3cf 100644 --- a/src/Mod/Fem/feminout/importToolsFem.py +++ b/src/Mod/Fem/feminout/importToolsFem.py @@ -100,7 +100,7 @@ def get_FemMeshObjectElementTypes(fem_mesh_obj, remove_zero_element_entries=True "Node": 0, "Edge": 1, "Hexa": 3, "Polygon": 2, "Polyhedron": 3, "Prism": 3, "Pyramid": 3, "Quadrangle": 2, "Tetra": 3, "Triangle": 2} - eval_dict = locals() # to access local variables from eval + eval_dict = locals() # to access local variables from eval elements_list_with_zero = [(eval("fem_mesh_obj.FemMesh." + s + "Count", eval_dict), s, d) for (s, d) in FreeCAD_element_names_dims.items()] # ugly but necessary if remove_zero_element_entries: diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py index 798ae24491..2bf40996d2 100644 --- a/src/Mod/Fem/femsolver/calculix/writer.py +++ b/src/Mod/Fem/femsolver/calculix/writer.py @@ -396,7 +396,7 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter): elif len(self.fluidsection_objects) > 1: self.get_ccx_elsets_multiple_mat_multiple_fluid() - # TODO: some elemetIDs are collected for 1D-Flow calculation, + # TODO: some elemetIDs are collected for 1D-Flow calculation, # this should be a def somewhere else, preferable inside the get_ccx_elsets_... methods for ccx_elset in self.ccx_elsets: if ccx_elset['ccx_elset'] and not isinstance(ccx_elset['ccx_elset'], six.string_types): # use six to be sure to be Python 2.7 and 3.x compatible diff --git a/src/Mod/Fem/femsolver/elmer/equations/equation.py b/src/Mod/Fem/femsolver/elmer/equations/equation.py index 2f8b12b724..12c89faca6 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/equation.py +++ b/src/Mod/Fem/femsolver/elmer/equations/equation.py @@ -35,7 +35,6 @@ if App.GuiUp: from femguiobjects import FemSelectionWidgets - class Proxy(equationbase.BaseProxy): def __init__(self, obj): diff --git a/src/Mod/Fem/femtest/testfemcommon.py b/src/Mod/Fem/femtest/testfemcommon.py index f17f563ec8..dbafa91173 100644 --- a/src/Mod/Fem/femtest/testfemcommon.py +++ b/src/Mod/Fem/femtest/testfemcommon.py @@ -609,14 +609,14 @@ class FemTest(unittest.TestCase): def test_adding_refshaps(self): doc = self.active_doc - slab = doc.addObject("Part::Plane","Face") - slab.Length=500.00 - slab.Width=500.00 + slab = doc.addObject("Part::Plane", "Face") + slab.Length = 500.00 + slab.Width = 500.00 cf = ObjectsFem.makeConstraintFixed(doc) ref_eles = [] # FreeCAD list property seam not to support append, thus we need some workaround, which is on many elements even much faster for i, face in enumerate(slab.Shape.Edges): - ref_eles.append("Edge%d" % (i+1)) + ref_eles.append("Edge%d" % (i + 1)) cf.References = [(slab, ref_eles)] doc.recompute() expected_reflist = [(slab, ('Edge1', 'Edge2', 'Edge3', 'Edge4'))]