From a6f6b8de06f3c011b30bac02c588710202c3ca11 Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Tue, 22 Nov 2016 19:47:12 +0100
Subject: [PATCH] FEM: solver task panel, delete not used def

---
 src/Mod/Fem/_TaskPanelFemSolverCalculix.py | 50 +++++++++++-----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
index 3dfff975d..5a574e989 100644
--- a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
+++ b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
@@ -32,12 +32,11 @@ import FreeCAD
 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
+import FreeCADGui
+import FemGui
+from PySide import QtCore, QtGui
+from PySide.QtCore import Qt
+from PySide.QtGui import QApplication
 
 
 class _TaskPanelFemSolverCalculix:
@@ -83,6 +82,25 @@ class _TaskPanelFemSolverCalculix:
 
         self.update()
 
+    def getStandardButtons(self):
+        # only show a close button
+        # def accept() in no longer needed, since there is no OK button
+        return int(QtGui.QDialogButtonBox.Close)
+
+    def reject(self):
+        FreeCADGui.ActiveDocument.resetEdit()
+
+    def update(self):
+        'fills the widgets'
+        self.form.le_working_dir.setText(self.solver_object.WorkingDir)
+        if self.solver_object.AnalysisType == 'static':
+            self.form.rb_static_analysis.setChecked(True)
+        elif self.solver_object.AnalysisType == 'frequency':
+            self.form.rb_frequency_analysis.setChecked(True)
+        elif self.solver_object.AnalysisType == 'thermomech':
+            self.form.rb_thermomech_analysis.setChecked(True)
+        return
+
     def femConsoleMessage(self, message="", color="#000000"):
         self.fem_console_message = self.fem_console_message + '<font color="#0000FF">{0:4.1f}:</font> <font color="{1}">{2}</font><br>'.\
             format(time.time() - self.Start, color, message.encode('utf-8', 'replace'))
@@ -152,26 +170,6 @@ class _TaskPanelFemSolverCalculix:
         QApplication.restoreOverrideCursor()
         self.form.l_time.setText('Time: {0:4.1f}: '.format(time.time() - self.Start))
 
-    def getStandardButtons(self):
-        return int(QtGui.QDialogButtonBox.Close)
-
-    def update(self):
-        'fills the widgets'
-        self.form.le_working_dir.setText(self.solver_object.WorkingDir)
-        if self.solver_object.AnalysisType == 'static':
-            self.form.rb_static_analysis.setChecked(True)
-        elif self.solver_object.AnalysisType == 'frequency':
-            self.form.rb_frequency_analysis.setChecked(True)
-        elif self.solver_object.AnalysisType == 'thermomech':
-            self.form.rb_thermomech_analysis.setChecked(True)
-        return
-
-    def accept(self):
-        FreeCADGui.ActiveDocument.resetEdit()
-
-    def reject(self):
-        FreeCADGui.ActiveDocument.resetEdit()
-
     def choose_working_dir(self):
         current_wd = self.setup_working_dir()
         wd = QtGui.QFileDialog.getExistingDirectory(None, 'Choose CalculiX working directory',