Changeset a9ed7d7

Timestamp:

Jun 18, 2009 11:15:54 AM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

8bbc504

Parents:

c7910ac

Message:

--labels and --no_labels

File:

• fedd/fedd_client.py (modified) (7 diffs)

fedd/fedd_client.py

@@ -164 +164 @@
                 help="Program compatible with dot (from graphviz) used to " + \
                         "render image")
+        self.add_option('-L', "--labels", dest='labels', action='store_true',
+                default=True, help='Label nodes and edges')
+        self.add_option('-A', "--no_labels", dest='labels',
+                default=True, action='store_false',
+                help='Label nodes and edges')
 
 class fedd_ns_image_opts(fedd_split_opts):
@@ -179 +184 @@
                 help="Program compatible with dot (from graphviz) used to " + \
                         "render image")
+        self.add_option('-L', "--labels", dest='labels', action='store_true',
+                default=True, help='Label nodes and edges')
+        self.add_option('-A', "--no_labels", dest='labels',
+                default=True, action='store_false',
+                help='Label nodes and edges')
 
 def exit_with_fault(dict, out=sys.stderr):
@@ -423 +433 @@
         fedd_rpc.__init__(self, op)
 
-    def gen_image(self, d, file, fmt, neato):
+    def gen_image(self, d, file, fmt, neato, labels):
 
         # Open up a temporary file for dot to turn into a visualization
@@ -457 +467 @@
         print >>dotfile, "graph G {"
         print >>dotfile, '\tgraph [size="%i,%i", ratio=fill];' % (size, size)
-        print >>dotfile, '\tnode [fontname=arial,fontsize=9,label="\N"];'
-        print >>dotfile, '\tedge [fontname=arial,fontsize=9];\n'
+        if labels:
+            print >>dotfile, '\tnode [fontname=arial,fontsize=9,label="\N"];'
+            print >>dotfile, '\tedge [fontname=arial,fontsize=9];\n'
+        else:
+            print >>dotfile, '\tnode [label=""];'
 
         for n in d.get('node', []):
@@ -490 +503 @@
             print >>dotfile,'\t\tcolor=black,fillcolor="#80c0f8",regular=1]'
             for n in lans[l]:
-                print >>dotfile, '\t%s -- %s [headlabel="%s"]' % (l, n[0], n[1])
+                if labels:
+                    print >>dotfile, '\t%s -- %s [headlabel="%s"]' % \
+                            (l, n[0], n[1])
+                else:
+                    print >>dotfile, '\t%s -- %s' % (l, n[0])
 
         for k, l in links.items():
             if len(l) == 2:
-                print >>dotfile, \
-                        ('\t%s -- %s [label="%s",taillabel="%s",' + \
-                        'headlabel="%s"]') % \
-                        (l[0][0], l[1][0], k, l[0][1], l[1][1])
+                if labels:
+                    print >>dotfile, \
+                            ('\t%s -- %s [label="%s",taillabel="%s",' + \
+                            'headlabel="%s"]') % \
+                            (l[0][0], l[1][0], k, l[0][1], l[1][1])
+                else:
+                    print >>dotfile, '\t%s -- %s ' % (l[0][0], l[1][0])
 
         print >>dotfile, "}"
@@ -581 +601 @@
 
         if resp_dict.has_key('vtopo'):
-            self.gen_image(resp_dict['vtopo'], file, fmt, opts.neato)
+            self.gen_image(resp_dict['vtopo'], file, fmt, opts.neato,
+                    opts.labels)
         else:
             sys.exit("Bad response. %s" % e.message)
@@ -739 +760 @@
                 sys.exit("Bad response: could not split")
             topo = self.generate_topo_dict(resp_dict['output'])
-            self.gen_image(topo, file, fmt, opts.neato)
+            self.gen_image(topo, file, fmt, opts.neato, opts.labels)
         else:
             sys.exit("Bad response. %s" % e.message)