From b122cb5866d609d1e55a5210c2b055a068f62c79 Mon Sep 17 00:00:00 2001
From: Przemo Firszt <przemo@firszt.eu>
Date: Tue, 13 Oct 2015 15:26:20 +0100
Subject: [PATCH] FEM: Migrate _CommandMechanicalShowResult to FemCommands

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
---
 src/Mod/Fem/_CommandMechanicalShowResult.py | 29 +++++++--------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/Mod/Fem/_CommandMechanicalShowResult.py b/src/Mod/Fem/_CommandMechanicalShowResult.py
index 039576523..9796da791 100644
--- a/src/Mod/Fem/_CommandMechanicalShowResult.py
+++ b/src/Mod/Fem/_CommandMechanicalShowResult.py
@@ -25,19 +25,22 @@ __author__ = "Juergen Riegel"
 __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
+from FemCommands import FemCommands
 
 if FreeCAD.GuiUp:
     import FreeCADGui
     from PySide import QtCore, QtGui
 
 
-class _CommandMechanicalShowResult:
+class _CommandMechanicalShowResult(FemCommands):
     "the Fem JobControl command definition"
-    def GetResources(self):
-        return {'Pixmap': 'fem-result',
-                'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_Result", "Show result"),
-                'Accel': "S, R",
-                'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_Result", "Show result information of an analysis")}
+    def __init__(self):
+        super(_CommandMechanicalShowResult, self).__init__()
+        self.resources = {'Pixmap': 'fem-result',
+                          'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_Result", "Show result"),
+                          'Accel': "S, R",
+                          'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_Result", "Show result information of an analysis")}
+        self.is_active = 'with_results'
 
     def Activated(self):
         self.result_object = get_results_object(FreeCADGui.Selection.getSelection())
@@ -50,20 +53,6 @@ class _CommandMechanicalShowResult:
         taskd = _ResultControlTaskPanel._ResultControlTaskPanel()
         FreeCADGui.Control.showDialog(taskd)
 
-    def IsActive(self):
-        return FreeCADGui.ActiveDocument is not None and results_present()
-
-
-#Code duplidation - to be removed after migration to FemTools
-def results_present():
-    import FemGui
-    results = False
-    analysis_members = FemGui.getActiveAnalysis().Member
-    for o in analysis_members:
-        if o.isDerivedFrom('Fem::FemResultObject'):
-            results = True
-    return results
-
 
 #Code duplidation - to be removed after migration to FemTools
 def get_results_object(sel):