suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEM: Don't import FemGui when it's not required

Browse Source 
This is part of preparation to create automated FEM wb tests

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt 2015-07-24 11:13:43 +01:00
parent ddac5eed60
commit f5ad8ca415
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Fem/FemTools.py
View File

@ -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()

16
src/Mod/Fem/MechanicalAnalysis.py
View File

@ -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())