From f5ad8ca4154f0ec23c8b6936ff3da3e3d22a9e3c Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Fri, 24 Jul 2015 11:13:43 +0100 Subject: [PATCH] FEM: Don't import FemGui when it's not required This is part of preparation to create automated FEM wb tests Signed-off-by: Przemo Firszt --- src/Mod/Fem/FemTools.py | 2 +- src/Mod/Fem/MechanicalAnalysis.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Mod/Fem/FemTools.py b/src/Mod/Fem/FemTools.py index 58459ebb7..97783806d 100644 --- a/src/Mod/Fem/FemTools.py +++ b/src/Mod/Fem/FemTools.py @@ -22,7 +22,6 @@ import FreeCAD -import FemGui from PySide import QtCore @@ -37,6 +36,7 @@ class FemTools(QtCore.QRunnable, QtCore.QObject): if analysis: self.analysis = analysis else: + import FemGui self.analysis = FemGui.getActiveAnalysis() if self.analysis: self.update_objects() diff --git a/src/Mod/Fem/MechanicalAnalysis.py b/src/Mod/Fem/MechanicalAnalysis.py index a48b96d31..ba5338a24 100644 --- a/src/Mod/Fem/MechanicalAnalysis.py +++ b/src/Mod/Fem/MechanicalAnalysis.py @@ -23,12 +23,12 @@ import ccxFrdReader import FreeCAD from FemTools import FemTools -import FemGui import os import time if FreeCAD.GuiUp: import FreeCADGui + import FemGui from PySide import QtCore, QtGui from PySide.QtCore import Qt from PySide.QtGui import QApplication @@ -79,7 +79,6 @@ class _CommandNewMechanicalAnalysis: FreeCADGui.Selection.clearSelection() def IsActive(self): - import FemGui return FreeCADGui.ActiveDocument is not None and FemGui.getActiveAnalysis() is None @@ -649,9 +648,10 @@ def results_present(): return results -FreeCADGui.addCommand('Fem_NewMechanicalAnalysis', _CommandNewMechanicalAnalysis()) -FreeCADGui.addCommand('Fem_CreateFromShape', _CommandFemFromShape()) -FreeCADGui.addCommand('Fem_MechanicalJobControl', _CommandMechanicalJobControl()) -FreeCADGui.addCommand('Fem_Quick_Analysis', _CommandQuickAnalysis()) -FreeCADGui.addCommand('Fem_PurgeResults', _CommandPurgeFemResults()) -FreeCADGui.addCommand('Fem_ShowResult', _CommandMechanicalShowResult()) +if FreeCAD.GuiUp: + FreeCADGui.addCommand('Fem_NewMechanicalAnalysis', _CommandNewMechanicalAnalysis()) + FreeCADGui.addCommand('Fem_CreateFromShape', _CommandFemFromShape()) + FreeCADGui.addCommand('Fem_MechanicalJobControl', _CommandMechanicalJobControl()) + FreeCADGui.addCommand('Fem_Quick_Analysis', _CommandQuickAnalysis()) + FreeCADGui.addCommand('Fem_PurgeResults', _CommandPurgeFemResults()) + FreeCADGui.addCommand('Fem_ShowResult', _CommandMechanicalShowResult())