From dfb2335421e115d3d92fb4ff38308e25dcac23c5 Mon Sep 17 00:00:00 2001
From: Przemo Firszt <przemo@firszt.eu>
Date: Fri, 9 Oct 2015 20:05:56 +0100
Subject: [PATCH] FEM: Move _CommandMechanicalJobControl class to separate file

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
---
 src/Mod/Fem/App/CMakeLists.txt              |  1 +
 src/Mod/Fem/CMakeLists.txt                  |  1 +
 src/Mod/Fem/Gui/AppFemGui.cpp               |  1 +
 src/Mod/Fem/MechanicalAnalysis.py           | 20 --------------
 src/Mod/Fem/_CommandMechanicalJobControl.py | 29 +++++++++++++++++++++
 5 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 src/Mod/Fem/_CommandMechanicalJobControl.py

diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index 257283fe5..7935fba74 100755
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -90,6 +90,7 @@ SET(FemScripts_SRCS
     _CommandFrequencyAnalysis.py
     _CommandQuickAnalysis.py
     _CommandPurgeFemResults.py
+    _CommandMechanicalJobControl.py
 )
 #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS})
 
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 800f8cd95..83d770c70 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -32,6 +32,7 @@ INSTALL(
         _CommandFrequencyAnalysis.py
         _CommandQuickAnalysis.py
         _CommandPurgeFemResults.py
+        _CommandMechanicalJobControl.py
     DESTINATION
         Mod/Fem
 )
diff --git a/src/Mod/Fem/Gui/AppFemGui.cpp b/src/Mod/Fem/Gui/AppFemGui.cpp
index 35d5a3300..75d079737 100644
--- a/src/Mod/Fem/Gui/AppFemGui.cpp
+++ b/src/Mod/Fem/Gui/AppFemGui.cpp
@@ -106,6 +106,7 @@ void FemGuiExport initFemGui()
     Base::Interpreter().loadModule("_CommandFrequencyAnalysis");
     Base::Interpreter().loadModule("_CommandQuickAnalysis");
     Base::Interpreter().loadModule("_CommandPurgeFemResults");
+    Base::Interpreter().loadModule("_CommandMechanicalJobControl");
     Base::Interpreter().loadModule("MechanicalAnalysis");
     Base::Interpreter().loadModule("MechanicalMaterial");
     Base::Interpreter().loadModule("FemBeamSection");
diff --git a/src/Mod/Fem/MechanicalAnalysis.py b/src/Mod/Fem/MechanicalAnalysis.py
index 3c843b381..d7b8d980a 100644
--- a/src/Mod/Fem/MechanicalAnalysis.py
+++ b/src/Mod/Fem/MechanicalAnalysis.py
@@ -104,26 +104,6 @@ class _CommandFemFromShape:
         return False
 
 
-class _CommandMechanicalJobControl:
-    "the Fem JobControl command definition"
-    def GetResources(self):
-        return {'Pixmap': 'fem-new-analysis',
-                'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_JobControl", "Start calculation"),
-                'Accel': "S, C",
-                'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_JobControl", "Dialog to start the calculation of the mechanical anlysis")}
-
-    def Activated(self):
-        import _JobControlTaskPanel
-        taskd = _JobControlTaskPanel._JobControlTaskPanel(FemGui.getActiveAnalysis())
-        #taskd.obj = vobj.Object
-        taskd.update()
-        FreeCADGui.Control.showDialog(taskd)
-
-    def IsActive(self):
-        return FreeCADGui.ActiveDocument is not None and FemGui.getActiveAnalysis() is not None
-
-
 if FreeCAD.GuiUp:
     FreeCADGui.addCommand('Fem_NewMechanicalAnalysis', _CommandNewMechanicalAnalysis())
     FreeCADGui.addCommand('Fem_CreateFromShape', _CommandFemFromShape())
-    FreeCADGui.addCommand('Fem_MechanicalJobControl', _CommandMechanicalJobControl())
diff --git a/src/Mod/Fem/_CommandMechanicalJobControl.py b/src/Mod/Fem/_CommandMechanicalJobControl.py
new file mode 100644
index 000000000..5a23bf0b8
--- /dev/null
+++ b/src/Mod/Fem/_CommandMechanicalJobControl.py
@@ -0,0 +1,29 @@
+import FreeCAD
+
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    import FemGui
+    from PySide import QtCore
+
+
+class _CommandMechanicalJobControl:
+    "the Fem JobControl command definition"
+    def GetResources(self):
+        return {'Pixmap': 'fem-new-analysis',
+                'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_JobControl", "Start calculation"),
+                'Accel': "S, C",
+                'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_JobControl", "Dialog to start the calculation of the mechanical anlysis")}
+
+    def Activated(self):
+        import _JobControlTaskPanel
+        taskd = _JobControlTaskPanel._JobControlTaskPanel(FemGui.getActiveAnalysis())
+        #taskd.obj = vobj.Object
+        taskd.update()
+        FreeCADGui.Control.showDialog(taskd)
+
+    def IsActive(self):
+        return FreeCADGui.ActiveDocument is not None and FemGui.getActiveAnalysis() is not None
+
+
+if FreeCAD.GuiUp:
+    FreeCADGui.addCommand('Fem_MechanicalJobControl', _CommandMechanicalJobControl())