[gevice] show/hide more data in diagram

[Alejandro Valdes Jimenez <avaldes src gnome org>]

commit f9342e0335f98e6f21b1c8a969dd224e35b6ea2b
Author: Alejandro Valdes jimenez <avaldes amvj in utalca cl>
Date:   Tue Jul 28 16:19:52 2009 -0400

    show/hide more data in diagram

 src/gevicediagram.py |   52 +++++++++++++++++++++++++++++--------------------
 1 files changed, 31 insertions(+), 21 deletions(-)
---
diff --git a/src/gevicediagram.py b/src/gevicediagram.py
index 0a9c816..80ff595 100644
--- a/src/gevicediagram.py
+++ b/src/gevicediagram.py
@@ -24,6 +24,13 @@ class GeviceDiagram:
         
         self.form = None
         self.prog = None
+        
+        self.name = None
+        self.ip = None
+        self.model = None
+        self.type_link = None
+        self.pix_link = None
+        self.name_link = None
 
     def load_interface (self,gevice):
         glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_diagram",None)
@@ -65,48 +72,44 @@ class GeviceDiagram:
         self.prog = self.combobox_program.get_active_text()
 
         i = gevice.gmodel.get_iter_selected(gevice.gmodel.treeview)
-        ###name = gevice.gmodel.treestore.get(i["iter"],config.COLUMN_NAME_DEV)
-        name = self.join_name(i["iter"],gevice)
-        
+       
         self.iterfirst = i["iter"]
-        ###self.print_child (gevice,i["iter"],name[0])
-        self.print_child (gevice,i["iter"],name)
+        self.print_child (gevice,i["iter"],None)
 
-        ###file = config.DEFAULT_TMP + name[0] + "." + self.form
-        file = config.DEFAULT_TMP + name + "." + self.form
+        file = config.DEFAULT_TMP + "tmp_gevice_diagram" + "." + self.form
         self.A.draw(file,format=self.form,prog=self.prog) 
 
         # show diagram with eog (FIXME: call to default viewer)
         id = os.spawnlp(os.P_NOWAIT,'eog','eog',file)
 
-    def join_name (self,iter,gevice):
-        name,ip,model,type_link = gevice.gmodel.treestore.get(iter,
+    def get_data_of_device (self,iter,gevice):
+        self.name,self.ip,self.model,self.type_link = gevice.gmodel.treestore.get(iter,
             config.COLUMN_NAME_DEV,
             config.COLUMN_IP_DEV,
             config.COLUMN_NAME_MODEL_DEV,
             config.COLUMN_ID_TYPE_LINK_DEV)
 
-        pix_link,name_link = gevice.gmodel.get_data_of_link_from_key (type_link,gevice)
+        self.pix_link,self.name_link = gevice.gmodel.get_data_of_link_from_key (self.type_link,gevice)
 
         if (gevice.gpref.diagip):
-            name = name + '(' + ip + ')'
+            self.name = self.name + '\\n(' + self.ip + ')'
 
         if (gevice.gpref.diagmodel):
-            name = name + '(' + model + ')'
+            self.name = self.name + '\\n(' + self.model + ')'
 
-        if (gevice.gpref.diaglink):
-            name = name + '(' + name_link + ')'
+        #if (gevice.gpref.diaglink):
+        #    self.name = self.name + '\\n(' + self.name_link + ')'
 
-        return name
 
     def print_child(self,gevice,parent_iter,parent_name):
         while (parent_iter):
-            name = self.join_name (parent_iter,gevice)
-            self.join_nodes (parent_name,name)
+            #name = self.join_name (parent_iter,gevice)
+            self.get_data_of_device (parent_iter,gevice)
+            self.join_nodes (parent_name,self.name,gevice)
 
             if gevice.gmodel.treestore.iter_has_child(parent_iter):
                 child = gevice.gmodel.treestore.iter_children(parent_iter)
-                self.print_child (gevice,child,name)
+                self.print_child (gevice,child,self.name)
             
             if (not self.iterfirst == parent_iter):
                 next_iter = gevice.gmodel.treestore.iter_next(parent_iter)
@@ -114,6 +117,13 @@ class GeviceDiagram:
             else:
                 return
 
-    def join_nodes (self,parent,child):
-        self.A.edge_attr['color'] = 'black'
-        self.A.add_edge(parent,child)
+    def join_nodes (self,parent,child,gevice):
+        self.A.add_node (child,color='red')
+        
+        if parent:
+            #self.A.add_edge(parent,child)
+            ###self.A.add_edge(parent,child,headlabel='one-two',labeldistance='2.2',label='lala')
+            if (gevice.gpref.diaglink):
+                self.A.add_edge(parent,child,label=self.name_link)
+            else:
+                self.A.add_edge(parent,child)