FEM: code formating, make all python module start the same way

- module info
- doxygen documentation
- imports
- code

src/Mod/Fem/FemAnalysis.py

@@ -20,8 +20,6 @@
 # *                                                                         *
 # ***************************************************************************
 
-import FreeCAD
-
 __title__ = "FEM Analysis managment"
 __author__ = "Juergen Riegel"
 __url__ = "http://www.freecadweb.org"
@@ -29,6 +27,9 @@ __url__ = "http://www.freecadweb.org"
 ## \addtogroup FEM
 #  @{
 
+import FreeCAD
+
+
 def makeFemAnalysis(name):
     '''makeFemAnalysis(name): makes a Fem Analysis object'''
     obj = FreeCAD.ActiveDocument.addObject("Fem::FemAnalysisPython", name)

src/Mod/Fem/FemBeamSection.py

@@ -24,12 +24,12 @@ __title__ = "FemBeamSection"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import _FemBeamSection
 
-## \addtogroup FEM
-#  @{
 
 def makeFemBeamSection(width=20.0, height=20.0, name="BeamSection"):
     '''makeFemBeamSection([width], [height], [name]): creates an beamsection object to define a cross section'''

src/Mod/Fem/FemCommands.py

@@ -25,15 +25,15 @@ __title__ = "Fem Commands"
 __author__ = "Przemo Firszt"
 __url__ = "http://www.freecadweb.org"
 
-import FreeCAD
+## \addtogroup FEM
+#  @{
 
+import FreeCAD
 if FreeCAD.GuiUp:
     import FreeCADGui
     import FemGui
     from PySide import QtCore
 
-## \addtogroup FEM
-#  @{
 
 class FemCommands(object):
         def __init__(self):

src/Mod/Fem/FemConstraintSelfWeight.py

@@ -24,12 +24,12 @@ __title__ = "FemConstraintSelfWeight"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import _FemConstraintSelfWeight
 
-## \addtogroup FEM
-#  @{
 
 def makeFemConstraintSelfWeight(name="FemConstraintSelfWeight"):
     '''makeFemFemConstraintSelfWeight([name]): creates an self weight object to define a gravity load'''

src/Mod/Fem/FemInputWriter.py

@@ -20,27 +20,17 @@
 # *                                                                         *
 # ***************************************************************************
 
-
-'''
-- next step would be save the constraints node and element data in the in the FreeCAD FEM Mesh Object
-  and link them to the appropriate constraint object
-- if the informations are used by the FEM Mesh file exporter FreeCAD would support writing FEM Mesh Groups
-- which is a most needed feature of FEM module
-- smesh supports mesh groups, how about pythonbinding in FreeCAD. Is there somethin implemented allready?
-'''
-
-
 __title__ = "FemInputWriter"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import FemMeshTools
 import os
 
-## \addtogroup FEM
-#  @{
 
 class FemInputWriter():
     def __init__(self,

src/Mod/Fem/FemInputWriterCcx.py

@@ -21,11 +21,12 @@
 # *                                                                         *
 # ***************************************************************************
 
-
 __title__ = "FemInputWriterCcx"
 __author__ = "Przemo Firszt, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import os
@@ -34,8 +35,6 @@ import time
 import FemMeshTools
 import FemInputWriter
 
-## \addtogroup FEM
-#  @{
 
 class FemInputWriterCcx(FemInputWriter.FemInputWriter):
     def __init__(self,

src/Mod/Fem/FemInputWriterZ88.py

@@ -20,19 +20,18 @@
 # *                                                                         *
 # ***************************************************************************
 
-
 __title__ = "FemInputWriterZ88"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import FemMeshTools
 import importZ88Mesh
 import FemInputWriter
 
-## \addtogroup FEM
-#  @{
 
 class FemInputWriterZ88(FemInputWriter.FemInputWriter):
     def __init__(self,

src/Mod/Fem/FemMaterialMechanicalNonlinear.py

@@ -24,13 +24,13 @@ __title__ = "FemMaterialMechanicalNonlinear"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import FemGui
 import _FemMaterialMechanicalNonlinear
 
-## \addtogroup FEM
-#  @{
 
 def makeFemMaterialMechanicalNonlinear(base_material, name="MechanicalMaterialNonlinear"):
     '''makeFemMaterialMechanicalNonlinear(base_material, [name]): creates an nonlinear material object'''

src/Mod/Fem/FemMeshTools.py

@@ -20,16 +20,15 @@
 # *                                                                         *
 # ***************************************************************************
 
-
 __title__ = "Tools for the work with FEM meshes"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 
-## \addtogroup FEM
-#  @{
 
 def get_femnodes_by_femobj_with_references(femmesh, femobj):
     node_set = []

src/Mod/Fem/FemSelectionObserver.py

@@ -24,12 +24,12 @@ __title__ = "Selection Observer"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import FreeCADGui
 
-## \addtogroup FEM
-#  @{
 
 class FemSelectionObserver:
     '''FemSelectionObserver'''

src/Mod/Fem/FemShellThickness.py

@@ -24,12 +24,12 @@ __title__ = "FemShellThickness"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import _FemShellThickness
 
-## \addtogroup FEM
-#  @{
 
 def makeFemShellThickness(thickness=20.0, name="ShellThickness"):
     '''makeFemShellThickness([thickness], [name]): creates an shellthickness object to define a plate thickness'''

src/Mod/Fem/FemSolverCalculix.py

@@ -24,12 +24,12 @@ __title__ = "FemSolverCalculix"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import _FemSolverCalculix
 
-## \addtogroup FEM
-#  @{
 
 def makeFemSolverCalculix(name="CalculiX"):
     '''makeSolverCalculix(name): makes a Calculix solver object'''

src/Mod/Fem/FemSolverZ88.py

@@ -24,12 +24,12 @@ __title__ = "FemSolverZ88"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import _FemSolverZ88
 
-## \addtogroup FEM
-#  @{
 
 def makeFemSolverZ88(name="Z88"):
     '''makeSolverZ88(name): makes a Z88 solver object'''

src/Mod/Fem/FemTools.py

@@ -21,17 +21,16 @@
 # *                                                                         *
 # ***************************************************************************
 
-
 __title__ = "Fem Tools super class"
 __author__ = "Przemo Firszt, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 from PySide import QtCore
 
-## \addtogroup FEM
-#  @{
 
 class FemTools(QtCore.QRunnable, QtCore.QObject):
     ## The constructor

src/Mod/Fem/FemToolsCcx.py

@@ -21,11 +21,12 @@
 # *                                                                         *
 # ***************************************************************************
 
-
 __title__ = "FemToolsCcx"
 __author__ = "Przemo Firszt, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import FemTools
@@ -33,8 +34,6 @@ from PySide import QtCore
 if FreeCAD.GuiUp:
     from PySide import QtGui
 
-## \addtogroup FEM
-#  @{
 
 class FemToolsCcx(FemTools.FemTools):
 

src/Mod/Fem/FemToolsZ88.py

@@ -20,19 +20,18 @@
 # *                                                                         *
 # ***************************************************************************
 
-
 __title__ = "FemToolsZ88"
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import FemTools
 from PySide import QtCore
 from PySide.QtGui import QApplication
 
-## \addtogroup FEM
-#  @{
 
 class FemToolsZ88(FemTools.FemTools):
 

src/Mod/Fem/Init.py

@@ -25,10 +25,8 @@
 # *   Juergen Riegel 2002                                                   *
 # ***************************************************************************/
 
-
 import FreeCAD
 
-
 FreeCAD.addExportType("TetGen file (*.poly)", "convert2TetGen")
 FreeCAD.addImportType("FEM formats (*.unv *.med *.dat *.bdf)", "Fem")
 if("BUILD_FEM_VTK" in FreeCAD.__cmake__):

src/Mod/Fem/InitGui.py

@@ -29,7 +29,6 @@
 #*   Juergen Riegel 2002                                                   *
 #***************************************************************************/
 
-
 import FreeCAD
 import FreeCADGui
 

src/Mod/Fem/MechanicalMaterial.py

@@ -24,12 +24,12 @@ __title__ = "MechanicalMaterial"
 __author__ = "Juergen Riegel, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+## \addtogroup FEM
+#  @{
 
 import FreeCAD
 import _MechanicalMaterial
 
-## \addtogroup FEM
-#  @{
 
 def makeMechanicalMaterial(name):
     '''makeMaterial(name): makes an Material

src/Mod/Fem/_CommandAnalysis.py

@@ -29,10 +29,8 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore
+import FreeCADGui
+from PySide import QtCore
 
 
 class _CommandAnalysis(FemCommands):

src/Mod/Fem/_CommandBeamSection.py

@@ -29,10 +29,8 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore
+import FreeCADGui
+from PySide import QtCore
 
 
 class _CommandBeamSection(FemCommands):

src/Mod/Fem/_CommandConstraintSelfWeight.py

@@ -29,10 +29,8 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore
+import FreeCADGui
+from PySide import QtCore
 
 
 class _CommandConstraintSelfWeight(FemCommands):

src/Mod/Fem/_CommandControlSolver.py

@@ -29,10 +29,8 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore
+import FreeCADGui
+from PySide import QtCore
 
 
 class _CommandControlSolver(FemCommands):

src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py

@@ -29,11 +29,9 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
-    from PySide import QtCore
+import FreeCADGui
+import FemGui
+from PySide import QtCore
 
 
 class _CommandMaterialMechanicalNonlinear(FemCommands):

src/Mod/Fem/_CommandMechanicalMaterial.py

@@ -29,11 +29,9 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
-    from PySide import QtCore
+import FreeCADGui
+import FemGui
+from PySide import QtCore
 
 
 class _CommandMechanicalMaterial(FemCommands):

src/Mod/Fem/_CommandMeshFromShape.py

@@ -29,10 +29,8 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore
+import FreeCADGui
+from PySide import QtCore
 
 
 class _CommandMeshFromShape(FemCommands):

src/Mod/Fem/_CommandPurgeResults.py

@@ -30,10 +30,8 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 from FemCommands import FemCommands
 import FemTools
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore
+import FreeCADGui
+from PySide import QtCore
 
 
 class _CommandPurgeResults(FemCommands):

src/Mod/Fem/_CommandRunSolver.py

@@ -29,10 +29,8 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore, QtGui
+import FreeCADGui
+from PySide import QtCore, QtGui
 
 
 class _CommandRunSolver(FemCommands):

src/Mod/Fem/_CommandShellThickness.py

@@ -29,10 +29,8 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore
+import FreeCADGui
+from PySide import QtCore
 
 
 class _CommandShellThickness(FemCommands):

src/Mod/Fem/_CommandShowResult.py

@@ -29,10 +29,8 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore, QtGui
+import FreeCADGui
+from PySide import QtCore, QtGui
 
 
 class _CommandShowResult(FemCommands):

src/Mod/Fem/_CommandSolverCalculix.py

@@ -29,11 +29,9 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
-    from PySide import QtCore
+import FreeCADGui
+import FemGui
+from PySide import QtCore
 
 
 class _CommandSolverCalculix(FemCommands):

src/Mod/Fem/_CommandSolverZ88.py

@@ -29,10 +29,8 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore
+import FreeCADGui
+from PySide import QtCore
 
 
 class _CommandSolverZ88(FemCommands):

src/Mod/Fem/_FemBeamSection.py

@@ -27,6 +27,7 @@ __url__ = "http://www.freecadweb.org"
 ## @package FemBeamSection
 #  \ingroup FEM
 
+
 class _FemBeamSection:
     "The FemBeamSection object"
     def __init__(self, obj):

src/Mod/Fem/_FemConstraintSelfWeight.py

@@ -27,6 +27,7 @@ __url__ = "http://www.freecadweb.org"
 ## @package FemConstraintSelfWeight
 #  \ingroup FEM
 
+
 class _FemConstraintSelfWeight:
     "The FemConstraintSelfWeight object"
     def __init__(self, obj):

src/Mod/Fem/_FemMaterialMechanicalNonlinear.py

@@ -27,6 +27,7 @@ __url__ = "http://www.freecadweb.org"
 ## @package FemMaterialMechanicalNonLinear
 #  \ingroup FEM
 
+
 class _FemMaterialMechanicalNonlinear:
     "The FemMaterialMechanicalNonlinear object"
     def __init__(self, obj):

src/Mod/Fem/_FemShellThickness.py

@@ -27,6 +27,7 @@ __url__ = "http://www.freecadweb.org"
 ## @package FemShellThickness
 #  \ingroup FEM
 
+
 class _FemShellThickness:
     "The FemShellThickness object"
     def __init__(self, obj):

src/Mod/Fem/_MechanicalMaterial.py

@@ -27,6 +27,7 @@ __url__ = "http://www.freecadweb.org"
 ## @package MechanicalMaterial
 #  \ingroup FEM
 
+
 class _MechanicalMaterial:
     "The Material object"
     def __init__(self, obj):

src/Mod/Fem/_TaskPanelFemSolverCalculix.py

@@ -31,7 +31,6 @@ import FemToolsCcx
 import FreeCAD
 import os
 import time
-
 import FreeCADGui
 import FemGui
 from PySide import QtCore, QtGui

src/Mod/Fem/ccxDatReader.py

@@ -20,10 +20,6 @@
 # *                                                                         *
 # ***************************************************************************
 
-
-import FreeCAD
-import os
-
 __title__ = "ccxDatReader"
 __author__ = "Przemo Firszt"
 __url__ = "http://www.freecadweb.org"
@@ -31,6 +27,10 @@ __url__ = "http://www.freecadweb.org"
 ## @package ccxDatReader
 #  \ingroup FEM
 
+import FreeCAD
+import os
+
+
 if open.__module__ == '__builtin__':
     # because we'll redefine open below
     pyopen = open

src/Mod/Fem/ccxFrdReader.py

@@ -22,12 +22,6 @@
 # *                                                                         *
 # ***************************************************************************
 
-
-import FreeCAD
-import os
-from math import pow, sqrt
-import numpy as np
-
 __title__ = "FreeCAD Calculix library"
 __author__ = "Juergen Riegel , Michael Hindley, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
@@ -35,6 +29,12 @@ __url__ = "http://www.freecadweb.org"
 ## @package ccxFrdReader
 #  \ingroup FEM
 
+import FreeCAD
+import os
+from math import pow, sqrt
+import numpy as np
+
+
 if open.__module__ == '__builtin__':
     pyopen = open  # because we'll redefine open below
 

src/Mod/Fem/importInpMesh.py

@@ -20,11 +20,6 @@
 # *                                                                         *
 # ***************************************************************************
 
-import FemMeshTools
-import FreeCAD
-import os
-import string
-
 __title__ = "FreeCAD .inp file reader"
 __author__ = "Frantisek Loeffelmann "
 __url__ = "http://www.freecadweb.org"
@@ -33,6 +28,12 @@ __date__ = "04/08/2016"
 ## @package importInpMesh
 #  \ingroup FEM
 
+import FemMeshTools
+import FreeCAD
+import os
+import string
+
+
 if open.__module__ == '__builtin__':
     pyopen = open  # because we'll redefine open below
 

src/Mod/Fem/importZ88Mesh.py

@@ -20,12 +20,6 @@
 # *                                                                         *
 # ***************************************************************************
 
-
-import FreeCAD
-import os
-import FemMeshTools
-
-
 __title__ = "FreeCAD Z88 Mesh reader and writer"
 __author__ = "Bernd Hahnebach "
 __url__ = "http://www.freecadweb.org"
@@ -33,6 +27,11 @@ __url__ = "http://www.freecadweb.org"
 ## @package importZ88Mesh
 #  \ingroup FEM
 
+import FreeCAD
+import os
+import FemMeshTools
+
+
 Debug = False
 
 if open.__module__ == '__builtin__':

src/Mod/Fem/z88DispReader.py

@@ -20,12 +20,6 @@
 # *                                                                         *
 # ***************************************************************************
 
-
-import FreeCAD
-import os
-from math import pow, sqrt
-
-
 __title__ = "FreeCAD Z88 Disp Reader"
 __author__ = "Bernd Hahnebach "
 __url__ = "http://www.freecadweb.org"
@@ -33,6 +27,11 @@ __url__ = "http://www.freecadweb.org"
 ## @package z88DispReader
 #  \ingroup FEM
 
+import FreeCAD
+import os
+from math import pow, sqrt
+
+
 Debug = False
 
 if open.__module__ == '__builtin__':