[tauruslib-devel] [PATCH 5/5] Added missing slots to allow interaction between TaurusDeviceTree and the SharedDataManager object.

[<sr...@ce...>]

From: Sergio Rubio Manrique <sr...@ce...>

---
 lib/taurus/qt/qtgui/tree/taurusdevicetree.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/taurus/qt/qtgui/tree/taurusdevicetree.py b/lib/taurus/qt/qtgui/tree/taurusdevicetree.py
index 7f18130..27b67b7 100644
--- a/lib/taurus/qt/qtgui/tree/taurusdevicetree.py
+++ b/lib/taurus/qt/qtgui/tree/taurusdevicetree.py
@@ -825,7 +825,7 @@ class TaurusDevTree(TaurusTreeNodeContainer,Qt.QTreeWidget, TaurusBaseWidget):
         
     @Qt.pyqtSignature("findInTree(const QString &)")
     def findInTree(self,regexp,collapseAll=None,exclude=None,select=True,queue=True):
-        self.trace( 'In TauTree.findInTree(%s)'%regexp)
+        self.trace( 'In TaurusDevTree.findInTree(%s)'%regexp)
         if collapseAll is None: collapseAll = self.collapsing_search
         regexp = str(regexp).lower().strip()
         exclude = (lambda x: x if hasattr(x,'__iter__') else [x])(exclude or self.excludeFromSearch or [])
@@ -1075,13 +1075,13 @@ class TaurusDevTree(TaurusTreeNodeContainer,Qt.QTreeWidget, TaurusBaseWidget):
                     
                     node.ContextMenu.append(("Open Panel", self.showPanel))
                     node.ContextMenu.append(("Show Attributes",self.addAttrToNode))
+                    node.ContextMenu.append(("Show Properties", self.showProperties))
                     if self.getNodeAdmin(node):
                         node.ContextMenu.append(("Go to %s"%self.getNodeAdmin(node),\
                             lambda p=self.getNodeAdmin(node): p and self.findInTree(p)
                             ))
                     if not hasattr(node,'ExpertMenu'): setattr(node,'ExpertMenu',self.ExpertMenu)#[])
-                    if not 'Show Properties' in [k for k,a in node.ExpertMenu]:
-                        node.ExpertMenu.append(("Show Properties", self.showProperties))
+                    if not 'Test Device' in [k for k,a in node.ExpertMenu]:
                         def test_device():
                             device = str(self.getNodeDeviceName())
                             if device:
@@ -1454,6 +1454,20 @@ class TaurusSearchTree(TaurusWidget):
         "expandAll",
         "loadTree",
         )        
+        
+    #THIS SLOTS ARE NEEDED BECAUSE METHODS REDIRECTED DYNAMICALLY ARE NOT VISIBLE TO THE SharedDataManager OBJECT
+    def setTangoHost(self,*a,**k): self.tree.setTangoHost(*a,**k)
+    def addModels(self,*a,**k):  self.tree.addModels(*a,**k)
+    def setModel(self,*a,**k):  self.tree.setModel(*a,**k)
+    def setModelCheck(self,*a,**k):  self.tree.setModelCheck(*a,**k)
+    def setTree(self,*a,**k):  self.tree.setTree(*a,**k)
+    def findInTree(self,*a,**k):  self.tree.findInTree(*a,**k)
+    def expandAll(self,*a,**k):  self.tree.expandAll(*a,**k)
+    def loadTree(self,*a,**k):  self.tree.loadTree(*a,**k)
+    @staticmethod
+    def setDefaultPanelClass(*a,**k):  self.tree.setDefaultPanelClass(*a,**k)
+    @staticmethod
+    def setDefaultAttrFilter(*a,**k):  self.tree.setDefaultAttrFilter(*a,**k)
     
     @staticmethod
     def method_forwarder(*args,**kwargs):
-- 
2.4.6