diff --git a/src/Mod/Fem/FemAnalysis.py b/src/Mod/Fem/FemAnalysis.py index be5d599bc..3e0897ebb 100644 --- a/src/Mod/Fem/FemAnalysis.py +++ b/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) diff --git a/src/Mod/Fem/FemBeamSection.py b/src/Mod/Fem/FemBeamSection.py index cc41584e7..934168cb5 100644 --- a/src/Mod/Fem/FemBeamSection.py +++ b/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''' diff --git a/src/Mod/Fem/FemCommands.py b/src/Mod/Fem/FemCommands.py index 356fa275c..76e310a0c 100644 --- a/src/Mod/Fem/FemCommands.py +++ b/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): diff --git a/src/Mod/Fem/FemConstraintSelfWeight.py b/src/Mod/Fem/FemConstraintSelfWeight.py index 2544d4a3a..3f919ffa6 100644 --- a/src/Mod/Fem/FemConstraintSelfWeight.py +++ b/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''' diff --git a/src/Mod/Fem/FemInputWriter.py b/src/Mod/Fem/FemInputWriter.py index f69d48b5c..f9d2e439e 100644 --- a/src/Mod/Fem/FemInputWriter.py +++ b/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, diff --git a/src/Mod/Fem/FemInputWriterCcx.py b/src/Mod/Fem/FemInputWriterCcx.py index c046a0c12..283da75e6 100644 --- a/src/Mod/Fem/FemInputWriterCcx.py +++ b/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, diff --git a/src/Mod/Fem/FemInputWriterZ88.py b/src/Mod/Fem/FemInputWriterZ88.py index 081ab13ee..9090496b6 100644 --- a/src/Mod/Fem/FemInputWriterZ88.py +++ b/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, diff --git a/src/Mod/Fem/FemMaterialMechanicalNonlinear.py b/src/Mod/Fem/FemMaterialMechanicalNonlinear.py index 65209e65e..55dbf2ba9 100644 --- a/src/Mod/Fem/FemMaterialMechanicalNonlinear.py +++ b/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''' diff --git a/src/Mod/Fem/FemMeshTools.py b/src/Mod/Fem/FemMeshTools.py index 6c92e9f2a..5b6044a44 100644 --- a/src/Mod/Fem/FemMeshTools.py +++ b/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 = [] diff --git a/src/Mod/Fem/FemSelectionObserver.py b/src/Mod/Fem/FemSelectionObserver.py index 05385bf64..7e9dc9c5c 100644 --- a/src/Mod/Fem/FemSelectionObserver.py +++ b/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''' diff --git a/src/Mod/Fem/FemShellThickness.py b/src/Mod/Fem/FemShellThickness.py index 617b15712..89c95c962 100644 --- a/src/Mod/Fem/FemShellThickness.py +++ b/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''' diff --git a/src/Mod/Fem/FemSolverCalculix.py b/src/Mod/Fem/FemSolverCalculix.py index fcc0e87d7..c4c70f013 100644 --- a/src/Mod/Fem/FemSolverCalculix.py +++ b/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''' diff --git a/src/Mod/Fem/FemSolverZ88.py b/src/Mod/Fem/FemSolverZ88.py index ce1ed5a10..70c483b49 100644 --- a/src/Mod/Fem/FemSolverZ88.py +++ b/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''' diff --git a/src/Mod/Fem/FemTools.py b/src/Mod/Fem/FemTools.py index 70bbd4f0f..3d11fb989 100644 --- a/src/Mod/Fem/FemTools.py +++ b/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 diff --git a/src/Mod/Fem/FemToolsCcx.py b/src/Mod/Fem/FemToolsCcx.py index 4c079750a..58540573a 100644 --- a/src/Mod/Fem/FemToolsCcx.py +++ b/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): diff --git a/src/Mod/Fem/FemToolsZ88.py b/src/Mod/Fem/FemToolsZ88.py index dc00472ce..6f6822032 100644 --- a/src/Mod/Fem/FemToolsZ88.py +++ b/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): diff --git a/src/Mod/Fem/Init.py b/src/Mod/Fem/Init.py index 0dcfbc573..865ebb09c 100644 --- a/src/Mod/Fem/Init.py +++ b/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__): diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py index 1eaf7a7e9..577f2e65b 100644 --- a/src/Mod/Fem/InitGui.py +++ b/src/Mod/Fem/InitGui.py @@ -29,7 +29,6 @@ #* Juergen Riegel 2002 * #***************************************************************************/ - import FreeCAD import FreeCADGui diff --git a/src/Mod/Fem/MechanicalMaterial.py b/src/Mod/Fem/MechanicalMaterial.py index cf4355bf7..a54ab9ef2 100644 --- a/src/Mod/Fem/MechanicalMaterial.py +++ b/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 diff --git a/src/Mod/Fem/_CommandAnalysis.py b/src/Mod/Fem/_CommandAnalysis.py index d1241d307..11803349a 100644 --- a/src/Mod/Fem/_CommandAnalysis.py +++ b/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): diff --git a/src/Mod/Fem/_CommandBeamSection.py b/src/Mod/Fem/_CommandBeamSection.py index 299b1e4bb..8f411756f 100644 --- a/src/Mod/Fem/_CommandBeamSection.py +++ b/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): diff --git a/src/Mod/Fem/_CommandConstraintSelfWeight.py b/src/Mod/Fem/_CommandConstraintSelfWeight.py index b41ea042a..604c653d0 100644 --- a/src/Mod/Fem/_CommandConstraintSelfWeight.py +++ b/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): diff --git a/src/Mod/Fem/_CommandControlSolver.py b/src/Mod/Fem/_CommandControlSolver.py index e2ddca16a..b5029bb13 100644 --- a/src/Mod/Fem/_CommandControlSolver.py +++ b/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): diff --git a/src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py b/src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py index b27f7f98a..2e78978fa 100644 --- a/src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py +++ b/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): diff --git a/src/Mod/Fem/_CommandMechanicalMaterial.py b/src/Mod/Fem/_CommandMechanicalMaterial.py index df00f90bc..97e312318 100644 --- a/src/Mod/Fem/_CommandMechanicalMaterial.py +++ b/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): diff --git a/src/Mod/Fem/_CommandMeshFromShape.py b/src/Mod/Fem/_CommandMeshFromShape.py index 11578a7ca..3f74e49f4 100644 --- a/src/Mod/Fem/_CommandMeshFromShape.py +++ b/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): diff --git a/src/Mod/Fem/_CommandPurgeResults.py b/src/Mod/Fem/_CommandPurgeResults.py index f6137a283..edd60fcdd 100644 --- a/src/Mod/Fem/_CommandPurgeResults.py +++ b/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): diff --git a/src/Mod/Fem/_CommandRunSolver.py b/src/Mod/Fem/_CommandRunSolver.py index b705108bf..1476c46bd 100644 --- a/src/Mod/Fem/_CommandRunSolver.py +++ b/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): diff --git a/src/Mod/Fem/_CommandShellThickness.py b/src/Mod/Fem/_CommandShellThickness.py index ffd5fb216..1b77f7642 100644 --- a/src/Mod/Fem/_CommandShellThickness.py +++ b/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): diff --git a/src/Mod/Fem/_CommandShowResult.py b/src/Mod/Fem/_CommandShowResult.py index 793e3ef70..017e38d4c 100644 --- a/src/Mod/Fem/_CommandShowResult.py +++ b/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): diff --git a/src/Mod/Fem/_CommandSolverCalculix.py b/src/Mod/Fem/_CommandSolverCalculix.py index c075f7ad5..768e10b8f 100644 --- a/src/Mod/Fem/_CommandSolverCalculix.py +++ b/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): diff --git a/src/Mod/Fem/_CommandSolverZ88.py b/src/Mod/Fem/_CommandSolverZ88.py index e3bd8738b..1a1c5db34 100644 --- a/src/Mod/Fem/_CommandSolverZ88.py +++ b/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): diff --git a/src/Mod/Fem/_FemBeamSection.py b/src/Mod/Fem/_FemBeamSection.py index 5a0df22f7..032c815a4 100644 --- a/src/Mod/Fem/_FemBeamSection.py +++ b/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): diff --git a/src/Mod/Fem/_FemConstraintSelfWeight.py b/src/Mod/Fem/_FemConstraintSelfWeight.py index 57045fcd9..28a5e2b64 100644 --- a/src/Mod/Fem/_FemConstraintSelfWeight.py +++ b/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): diff --git a/src/Mod/Fem/_FemMaterialMechanicalNonlinear.py b/src/Mod/Fem/_FemMaterialMechanicalNonlinear.py index 769ad280e..9d7386521 100644 --- a/src/Mod/Fem/_FemMaterialMechanicalNonlinear.py +++ b/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): diff --git a/src/Mod/Fem/_FemShellThickness.py b/src/Mod/Fem/_FemShellThickness.py index 1a042fb7e..7d9d94e3d 100644 --- a/src/Mod/Fem/_FemShellThickness.py +++ b/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): diff --git a/src/Mod/Fem/_MechanicalMaterial.py b/src/Mod/Fem/_MechanicalMaterial.py index 14fb9fa75..48f72dd11 100644 --- a/src/Mod/Fem/_MechanicalMaterial.py +++ b/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): diff --git a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py index 5a574e989..92b60aea6 100644 --- a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py +++ b/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 diff --git a/src/Mod/Fem/ccxDatReader.py b/src/Mod/Fem/ccxDatReader.py index bd5932849..ebda82e4b 100644 --- a/src/Mod/Fem/ccxDatReader.py +++ b/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 diff --git a/src/Mod/Fem/ccxFrdReader.py b/src/Mod/Fem/ccxFrdReader.py index 20bf5b80a..d312ebc81 100644 --- a/src/Mod/Fem/ccxFrdReader.py +++ b/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 diff --git a/src/Mod/Fem/importInpMesh.py b/src/Mod/Fem/importInpMesh.py index 1a736ab43..aae2740f1 100644 --- a/src/Mod/Fem/importInpMesh.py +++ b/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 diff --git a/src/Mod/Fem/importZ88Mesh.py b/src/Mod/Fem/importZ88Mesh.py index 5ba0da995..e21b296fd 100644 --- a/src/Mod/Fem/importZ88Mesh.py +++ b/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__': diff --git a/src/Mod/Fem/z88DispReader.py b/src/Mod/Fem/z88DispReader.py index d930e9d74..35e24a202 100644 --- a/src/Mod/Fem/z88DispReader.py +++ b/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__':