Added support for visualizing arbitrary actions.

(By Jonathan, cherry-picked by Mac)

Conflicts:

	unit_trace/trace_reader.py
	unit_trace/viz/canvas.py
	unit_trace/viz/graph.py
	unit_trace/viz/schedule.py

1 files changed, 73 insertions, 7 deletions

diff --git a/unit_trace/viz/canvas.py b/unit_trace/viz/canvas.py
index ea73d98..c39c613 100644
--- a/unit_trace/viz/canvas.py
+++ b/unit_trace/viz/canvas.py
@@ -443,14 +443,44 @@ class Canvas(object):
         self.add_sel_region(SelectableRegion(x - big_arrowhead_height / Canvas.SQRT3,
             y, 2.0 * big_arrowhead_height / Canvas.SQRT3, height, event))
 
+    def draw_action_symbol(self, item, action, x, y, height, selected):
+        """Draws a release arrow: x, y should give the top (northernmost
+        point) of the arrow. The height includes the arrowhead."""
+
+        color = {False : GraphFormat.BORDER_COLOR,
+                 True : GraphFormat.HIGHLIGHT_COLOR}[selected]
+
+        colors = [self.get_bar_pattern(item).get_color_list()[0], color]
+        draw_funcs = [self.__class__.fill_polyline, self.__class__.draw_polyline]
+
+        for i in range(0, 2):
+            color = colors[i]
+            draw_func = draw_funcs[i]
+
+            draw_func(self, [(x, y), (x - height / Canvas.SQRT3, \
+                        y - height), \
+                        (x + height / Canvas.SQRT3, \
+                        y - height), \
+                        (x, y)], color, GraphFormat.BORDER_THICKNESS)
+
+        self.draw_label(str(action), x, y - height / 2 - .1 * height,
+                        GraphFormat.DEF_FOPTS_LABEL,
+                        AlignMode.CENTER, AlignMode.CENTER, True)
+
+    def add_sel_action_symbol(self, x, y, height, event):
+        self.add_sel_region(SelectableRegion(x - height / Canvas.SQRT3,
+            y - height, 2.0 * height / Canvas.SQRT3, height, event))
+
     def draw_release_arrow_small(self, x, y, height, selected):
         """Draws a small release arrow (most likely coming off the x-axis, although
         this method doesn't enforce this): x, y should give the top of the arrow"""
         small_arrowhead_height = GraphFormat.SMALL_ARROWHEAD_FACTOR * height
 
-        color = {False : GraphFormat.BORDER_COLOR, True : GraphFormat.HIGHLIGHT_COLOR}[selected]
+        color = {False : GraphFormat.BORDER_COLOR, 
+                 True : GraphFormat.HIGHLIGHT_COLOR}[selected]
 
-        self.draw_line((x, y), (x - small_arrowhead_height, y + small_arrowhead_height), \
+        self.draw_line((x, y),
+                       (x - small_arrowhead_height, y + small_arrowhead_height),
                        color, GraphFormat.BORDER_THICKNESS)
         self.draw_line((x, y), (x + small_arrowhead_height, y + small_arrowhead_height), \
                        color, GraphFormat.BORDER_THICKNESS)
@@ -684,14 +714,35 @@ class CairoCanvas(Canvas):
         self.surface.ctx.set_line_width(thickness * self.scale)
         self.surface.ctx.stroke()
 
+    def draw_circle(self, x, y, radius, fill_color, border_color,
+                     thickness, do_snap=True):
+        p = self.surface.get_real_coor(x, y)
+        if do_snap:
+            p = (snap(p[0]), snap(p[1]))
+
+        self.surface.ctx.save()
+        self.surface.ctx.arc(p[0], p[1], radius, 0.0, 2 * math.pi)
+        self.surface.ctx.set_source_rgb(border_color[0],
+                                        border_color[1],
+                                        border_color[2])
+        self.surface.ctx.set_line_width(thickness * self.scale)
+        self.surface.ctx.stroke()
+        self.surface.ctx.arc(p[0], p[1], radius, 0.0, 2 * math.pi)
+        self.surface.ctx.set_source_rgb(fill_color[0],
+                                        fill_color[1],
+                                        fill_color[2])
+        self.surface.ctx.fill()
+        self.surface.ctx.restore()
+
     def _polyline_common(self, coor_list, color, thickness, do_snap=True):
-        scaled_coor_list = [self.scaled(coor[0], coor[1]) for coor in coor_list]
-        real_coor_list = [self.surface.get_real_coor(coor[0], coor[1]) for coor in scaled_coor_list]
+        real_coor_list = [self.surface.get_real_coor(coor[0], coor[1]) \
+                          for coor in coor_list]
 
         self.surface.ctx.move_to(real_coor_list[0][0], real_coor_list[0][1])
         if do_snap:
             for i in range(0, len(real_coor_list)):
-                real_coor_list[i] = (snap(real_coor_list[i][0]), snap(real_coor_list[i][1]))
+                real_coor_list[i] = (snap(real_coor_list[i][0]),
+                                     snap(real_coor_list[i][1]))
 
         for coor in real_coor_list[1:]:
             self.surface.ctx.line_to(coor[0], coor[1])
@@ -753,8 +804,23 @@ class CairoCanvas(Canvas):
             raise ValueError('Invalid alignment value')
         f_descent_factor, f_height_factor = valign_factors[valign]
 
-        self._draw_label_common(text, x, y, fopts, x_bearing_factor, \
-                f_descent_factor, width_factor, f_height_factor, do_snap)
+        return self._get_label_dim_common(text, x, y, fopts, x_bearing_factor,
+                                          f_descent_factor, width_factor, f_height_factor,
+                                          do_snap)
+
+    def draw_label(self, text, x, y, fopts=GraphFormat.DEF_FOPTS_LABEL,
+                   halign=AlignMode.LEFT, valign=AlignMode.BOTTOM, do_snap=True):
+        """Draws a label with the given parameters, with the given horizontal and vertical justification."""
+
+        actual_x, actual_y, width, height, f_height = self.get_label_dim(text, x, y, fopts, halign, valign, do_snap)
+        actual_x, actual_y = self.surface.get_real_coor(actual_x, actual_y)
+
+        self.surface.ctx.select_font_face(fopts.name, cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_BOLD)
+        self.surface.ctx.set_font_size(fopts.size * self.scale)
+        self.surface.ctx.set_source_rgb(fopts.color[0], fopts.color[1], fopts.color[2])
+        self.surface.ctx.move_to(actual_x, actual_y)
+
+        self.surface.ctx.show_text(text)
 
     def draw_label_with_sscripts(self, text, supscript, subscript, x, y, \
                                  textfopts=GraphFormat.DEF_FOPTS_LABEL, sscriptfopts=GraphFormat.DEF_FOPTS_LABEL_SSCRIPT, \