From 9004e1fc5ab355f22eff98232e1ec4a90b1a623f Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Mon, 16 Mar 2020 09:08:18 +0100 Subject: [PATCH] FEM: improve imports --- src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py | 4 +++- src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py | 6 +++--- src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py | 6 +++--- .../Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py | 4 ++-- .../Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py | 4 ++-- .../Fem/femguiobjects/_ViewProviderFemElementRotation1D.py | 4 ++-- src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py | 1 - .../Fem/femguiobjects/_ViewProviderFemMaterialReinforced.py | 5 ++--- src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py | 1 - 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py b/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py index 175bdad649..0f33c685df 100644 --- a/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py +++ b/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py @@ -30,11 +30,13 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD _Base ViewProvider for FEM workbench +from pivy import coin + import FreeCAD import FreeCADGui + import FemGui # needed to display the icons in TreeView -from pivy import coin False if FemGui.__name__ else True # flake8, dummy FemGui usage diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py index 38999d9bc5..fda10c1c79 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py @@ -29,12 +29,12 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD FEM _ViewProviderFemConstraintTie -import FreeCAD -import FreeCADGui - from PySide import QtCore from PySide import QtGui +import FreeCAD +import FreeCADGui + from . import FemSelectionWidgets from . import ViewProviderFemConstraint diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py index 1e95f9347c..3e5438c7d0 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py @@ -31,12 +31,12 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD ViewProviderFemElementFluid1D -import FreeCAD -import FreeCADGui - from PySide import QtCore from PySide import QtGui +import FreeCAD +import FreeCADGui + from . import FemSelectionWidgets from . import ViewProviderFemConstraint from femobjects import _FemElementFluid1D diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py index bdc0240f47..b47cb19563 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py @@ -29,11 +29,11 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD FEM _ViewProviderFemElementGeometry1D +from PySide import QtCore + import FreeCAD import FreeCADGui -from PySide import QtCore - from . import FemSelectionWidgets from . import ViewProviderFemConstraint from femobjects import _FemElementGeometry1D diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py index d83582f56d..2ba71b54cd 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py @@ -29,11 +29,11 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD FEM _ViewProviderFemElementGeometry2D +from PySide import QtCore + import FreeCAD import FreeCADGui -from PySide import QtCore - from . import FemSelectionWidgets from . import ViewProviderFemConstraint diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py index 427df3d9f3..a708c99e71 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py @@ -29,11 +29,11 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD FEM _ViewProviderFemElementRotation1D +from PySide import QtCore + import FreeCAD import FreeCADGui -from PySide import QtCore - from . import FemSelectionWidgets from . import ViewProviderFemConstraint diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py index 6d62ec2d40..a117fa697c 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py @@ -31,7 +31,6 @@ __url__ = "http://www.freecadweb.org" # \brief FreeCAD FEM _ViewProviderFemMaterial import sys - from PySide import QtCore from PySide import QtGui diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialReinforced.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialReinforced.py index b56bd3ad38..73e7a04f18 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialReinforced.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialReinforced.py @@ -30,13 +30,12 @@ __url__ = "http://www.freecadweb.org" # \brief FreeCAD FEM _ViewProviderFemMaterialReinforced import sys +from PySide import QtCore +from PySide import QtGui import FreeCAD import FreeCADGui -from PySide import QtCore -from PySide import QtGui - from . import ViewProviderFemConstraint diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py index 8d5ea1cad5..65560f1356 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py @@ -32,7 +32,6 @@ __url__ = "http://www.freecadweb.org" import os import sys import time - from PySide import QtCore from PySide import QtGui from PySide.QtCore import Qt