Merge lp:~boegholm/pyuppaal/nicelayout into lp:pyuppaal

[Thomas Bøgholm]

added arguments and modified Template/Transition functions

=== modified file 'bin/layout_uppaal'
--- bin/layout_uppaal	2011-05-10 11:53:58 +0000
+++ bin/layout_uppaal	2011-05-13 11:02:27 +0000
@@ -5,6 +5,8 @@
 parser = argparse.ArgumentParser(description='layout_uppaal')
 parser.add_argument('--templates', '-T', action='store', type=lambda x: x.split(','), dest='templates', help='Set template list: template_1,...,template_n', default=[])
 parser.add_argument('--template',  '-t', action='append', default=[], dest='templates', help='Append to template list')
+parser.add_argument('--nail-angle', '-a', action='store', type=float, help='Transition-sharpening parameter: angle threshold. Default: 110.0', default=110.0, dest='nailangle')
+parser.add_argument('--nail-inter-distance', '-d', action='store', help='Transition-sharpening parameter: inter-nail-distance threshold. Default: 1.0', default=1.0, dest='nailinterdistance', type=float)
 parser.add_argument('infile', type=argparse.FileType('r'), help='input file or \'-\' for stdin')
 parser.add_argument('outfile', type=argparse.FileType('w'), help='output file or \'-\' for stdout')
 parser.add_argument('--version', action='version', version='%(prog)s 1.1')
@@ -16,7 +18,7 @@
 for template in nta.templates:
     if template.name in result.templates or not result.templates:
         print >> sys.stderr,'updating template: ', template.name
-        template.layout(auto_nails=True)
+        template.layout(auto_nails=True, nailAngleThreshold=result.nailangle, nailInterDistanceThreshold=result.nailinterdistance)
 
 result.outfile.write(nta.to_xml())
 

=== modified file 'pyuppaal/pyuppaal.py'
--- pyuppaal/pyuppaal.py	2011-05-13 08:36:05 +0000
+++ pyuppaal/pyuppaal.py	2011-05-13 11:02:27 +0000
@@ -79,8 +79,12 @@
 
     def dot2uppaalcoord(self, coord):
         return int(-float(coord)*1.5)
+    
+    def sharpenTransitions(self, nailAngleThreshold, nailInterDistanceThreshold):
+        for transition in self.transitions:
+            transition.sharpen(nailAngleThreshold, nailInterDistanceThreshold)
 
-    def layout(self, auto_nails=False):
+    def layout(self, auto_nails=False, nailAngleThreshold=110.0, nailInterDistanceThreshold=1.0):
         self.assign_ids()
 
         G = pygraphviz.AGraph(strict=False)
@@ -125,7 +129,6 @@
                 for nailpos in edge.attr['pos'].split(" "):
                     xpos, ypos = map(self.dot2uppaalcoord, nailpos.split(","))
                     t.nails += [Nail(xpos, ypos)]
-            t.sharpen()
             ydelta = 0
             for a in ['select', 'guard', 'synchronisation', 'assignment']:
                 label = getattr(t, a)
@@ -134,7 +137,8 @@
                     label.xpos = x
                     label.ypos = y+ydelta
                     ydelta += UPPAAL_LINEHEIGHT
-
+        self.sharpenTransitions(nailAngleThreshold, nailInterDistanceThreshold)
+ 
 
     def _parameter_to_xml(self):
         if self.parameter:
@@ -275,7 +279,7 @@
             assignment=self.assignment.value)
         return newone
 
-    def sharpen(self, angleThreshold=110.0, lengthThreshold=1.0):
+    def sharpen(self, angleThreshold, lengthThreshold):
         count = 0
         while True: # do while? 
             removed = False