Changeset 67c0e15 for fedd

Timestamp:

Jul 14, 2009 6:49:41 PM (15 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:

8780cbec

Parents:

7a1918e

Message:

Add --pixels to specify the image size in pixels (they're square)

File:

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

fedd/fedd_client.py

@@ -169 +169 @@
                 default=True, action='store_false',
                 help='Label nodes and edges')
+        self.add_option('-j','--pixels', dest="pixels", default=None,
+                type="int",
+                help="Size of output in pixels (diagrams are square")
 
 class fedd_ns_image_opts(fedd_split_opts):
@@ -189 +192 @@
                 default=True, action='store_false',
                 help='Label nodes and edges')
+        self.add_option('-j','--pixels', dest="pixels", default=None,
+                type="int",
+                help="Size of output in pixels (diagrams are square")
 
 def exit_with_fault(dict, out=sys.stderr):
@@ -517 +523 @@
         fedd_rpc.__init__(self, op)
 
-    def gen_image(self, d, file, fmt, neato, labels):
+    def gen_image(self, d, file, fmt, neato, labels, pix=None):
 
         # Open up a temporary file for dot to turn into a visualization
@@ -549 +555 @@
         else: size = 18
 
+        if pix:
+            dpi = pix / size
+        else:
+            dpi = None
+
+
         print >>dotfile, "graph G {"
-        print >>dotfile, '\tgraph [size="%i,%i", ratio=fill];' % (size, size)
+        if dpi:
+            print >>dotfile, '\tgraph [size="%i,%i", dpi="%i", ratio=fill];' \
+                    % (size, size, dpi)
+        else:
+            print >>dotfile, '\tgraph [size="%i,%i", ratio=fill];' \
+                    % (size, size)
+
         if labels:
             print >>dotfile, '\tnode [fontname=arial,fontsize=9,label="\N"];'
@@ -686 +704 @@
         if resp_dict.has_key('vtopo'):
             self.gen_image(resp_dict['vtopo'], file, fmt, opts.neato,
-                    opts.labels)
+                    opts.labels, opts.pixels)
         else:
             sys.exit("Bad response. %s" % e.message)
@@ -844 +862 @@
                 sys.exit("Bad response: could not split")
             topo = self.generate_topo_dict(resp_dict['output'])
-            self.gen_image(topo, file, fmt, opts.neato, opts.labels)
+            self.gen_image(topo, file, fmt, opts.neato, opts.labels,
+                    opts.pixels)
         else:
             sys.exit("Bad response. %s" % e.message)