diff --git a/src/Mod/Fem/femguiobjects/FemSelectionWidgets.py b/src/Mod/Fem/femguiobjects/FemSelectionWidgets.py index b483283894..8b808cf902 100644 --- a/src/Mod/Fem/femguiobjects/FemSelectionWidgets.py +++ b/src/Mod/Fem/femguiobjects/FemSelectionWidgets.py @@ -32,15 +32,15 @@ __url__ = "http://www.freecadweb.org" import sys -import FreeCAD -import FreeCADGui -import femmesh.meshtools as FemMeshTools - from PySide import QtGui from PySide import QtCore +import FreeCAD +import FreeCADGui import FreeCADGui as Gui +from femmesh import meshtools + class _Selector(QtGui.QWidget): @@ -375,7 +375,7 @@ class GeometryElementsSelection(QtGui.QWidget): # since only Subelements can be selected # we're going to select all Faces of said Solids # the method getElement(element)doesn't return Solid elements - solid = FemMeshTools.get_element(ref[0], ref[1]) + solid = meshtools.get_element(ref[0], ref[1]) if not solid: return faces = [] @@ -548,7 +548,7 @@ class GeometryElementsSelection(QtGui.QWidget): def has_equal_references_shape_types(self, ref_shty=""): for ref in self.references: # the method getElement(element) does not return Solid elements - r = FemMeshTools.get_element(ref[0], ref[1]) + r = meshtools.get_element(ref[0], ref[1]) if not r: FreeCAD.Console.PrintError( "Problem in retrieving element: {} \n".format(ref[1]) diff --git a/src/Mod/Fem/femguiobjects/_TaskPanelFemSolverControl.py b/src/Mod/Fem/femguiobjects/_TaskPanelFemSolverControl.py index 2c0d689d92..70f9b999e9 100644 --- a/src/Mod/Fem/femguiobjects/_TaskPanelFemSolverControl.py +++ b/src/Mod/Fem/femguiobjects/_TaskPanelFemSolverControl.py @@ -32,8 +32,9 @@ from PySide import QtCore from PySide import QtGui import FreeCADGui as Gui -import femsolver.run + import femsolver.report +import femsolver.run _UPDATE_INTERVAL = 50 diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py index 695ac9d757..f3cbd338bd 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py @@ -31,13 +31,12 @@ __url__ = "http://www.freecadweb.org" import FreeCAD import FreeCADGui -from . import ViewProviderFemConstraint +from FreeCAD import Units -# for the panel +from . import FemSelectionWidgets +from . import ViewProviderFemConstraint from femtools import femutils from femtools import membertools -from FreeCAD import Units -from . import FemSelectionWidgets class ViewProxy(ViewProviderFemConstraint.ViewProxy): diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py index 4711cff78a..070a5572a1 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py @@ -31,13 +31,12 @@ __url__ = "http://www.freecadweb.org" import FreeCAD import FreeCADGui -from . import ViewProviderFemConstraint +from FreeCAD import Units -# for the panel +from . import FemSelectionWidgets +from . import ViewProviderFemConstraint from femtools import femutils from femtools import membertools -from FreeCAD import Units -from . import FemSelectionWidgets class ViewProxy(ViewProviderFemConstraint.ViewProxy): diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py index 196210b860..f6f9ddf83c 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py @@ -31,12 +31,11 @@ __url__ = "http://www.freecadweb.org" import FreeCAD import FreeCADGui -from . import ViewProviderFemConstraint +from FreeCAD import Units -# for the panel +from . import ViewProviderFemConstraint from femtools import femutils from femtools import membertools -from FreeCAD import Units class ViewProxy(ViewProviderFemConstraint.ViewProxy):