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, 87 insertions, 7 deletions

diff --git a/unit_trace/viz/graph.py b/unit_trace/viz/graph.py
index a10d9bd..f2021ce 100644
--- a/unit_trace/viz/graph.py
+++ b/unit_trace/viz/graph.py
@@ -8,11 +8,12 @@ than the canvas classes (time and task/cpu number rather than plain coordinates)
 update themselves, unlike the Canvas which can only overwrite itself."""
 
 class Graph(object):
-    DEF_BAR_PLIST = [Pattern([(0.0, 0.9, 0.9)]), Pattern([(0.9, 0.3, 0.0)]), Pattern([(0.9, 0.7, 0.0)]),
-                     Pattern([(0.0, 0.0, 0.8)]), Pattern([(0.0, 0.2, 0.9)]), Pattern([(0.0, 0.6, 0.6)]),
+    DEF_BAR_PLIST = [Pattern([(0.0, 0.9, 0.9)]), Pattern([(0.9, 0.3, 0.0)]),
+                     Pattern([(0.9, 0.7, 0.0)]), Pattern([(0.0, 0.0, 0.8)]),
+                     Pattern([(0.0, 0.2, 0.9)]), Pattern([(0.0, 0.6, 0.6)]),
                      Pattern([(0.75, 0.75, 0.75)])]
-    DEF_ITEM_CLIST = [(0.3, 0.0, 0.0), (0.0, 0.3, 0.0), (0.0, 0.0, 0.3), (0.3, 0.3, 0.0), (0.0, 0.3, 0.3),
-                      (0.3, 0.0, 0.3)]
+    DEF_ITEM_CLIST = [(0.3, 0.0, 0.0), (0.0, 0.3, 0.0), (0.0, 0.0, 0.3),
+                      (0.3, 0.3, 0.0), (0.0, 0.3, 0.3), (0.3, 0.0, 0.3)]
 
     def __init__(self, CanvasType, surface, start_time, end_time, y_item_list, attrs=GraphFormat(),
                  item_clist=DEF_ITEM_CLIST, bar_plist=DEF_BAR_PLIST):
@@ -106,9 +107,12 @@ class Graph(object):
         """get x so that x is at instant ``time'' on the graph"""
         return self.origin[0] + GraphFormat.X_AXIS_MEASURE_OFS + 1.0 * (time - self.start_time) / self.attrs.time_per_maj * self.attrs.maj_sep
 
+    def get_item_yorigin(self, item_no):
+        return self.origin[1] - self._get_y_axis_height() + self.attrs.y_item_size * item_no;
+
     def get_item_ypos(self, item_no):
         """get y so that y is where the top of a bar would be in item #n's area"""
-        return self.origin[1] - self._get_y_axis_height() + self.attrs.y_item_size * (item_no + 0.5 - GraphFormat.BAR_SIZE_FACTOR / 2.0)
+        return self.get_item_yorigin(item_no) + self.attrs.y_item_size * (0.5 - GraphFormat.BAR_SIZE_FACTOR / 2.0)
 
     def _get_bar_width(self, start_time, end_time):
         return 1.0 * (end_time - start_time) / self.attrs.time_per_maj * self.attrs.maj_sep
@@ -167,7 +171,29 @@ class Graph(object):
         raise NotImplementedError
 
     def get_events_to_render(self, sched, regions, selectable=False):
-        raise NotImplementedError
+        slots = {}
+
+        self.min_time, self.max_time, self.min_item, self.max_item = None, None, None, None
+        for region in regions:
+            x, y, width, height = region
+            start_time, end_time, start_item, end_item = self.get_offset_params(x, y, width, height)
+            self._recomp_min_max(start_time, end_time, start_item, end_item)
+
+            sched.get_time_slot_array().get_slots(slots,
+                        start_time, end_time, start_item, end_item,
+                        self.list_type)
+
+        events_to_render = {}
+        for layer in Canvas.LAYERS:
+            events_to_render[layer] = {}
+
+        for event in sched.get_time_slot_array().get_events(slots,
+                self.list_type, schedule.EVENT_LIST):
+            events_to_render[event.get_layer()][event] = None
+        for event in sched.get_jobless():
+            events_to_render[event.get_layer()][event] = None
+
+        return events_to_render
 
     def render_surface(self, sched, regions, selectable=False):
         if not selectable:
@@ -269,6 +295,16 @@ class Graph(object):
         a certain time."""
         raise NotImplementedError
 
+    def draw_action_symbol_at_time(self, time, task_no, cpu_no, action,
+                                   job_no, selected=False):
+        """Draws an action symbol at a certain time for some task and job"""
+        raise NotImplementedError
+
+    def add_sel_action_symbol_at_time(self, time, task_no, cpu_no, event):
+        """Same as above, except instead of drawing adds a selectable region at
+        a certain time."""
+        raise NotImplementedError
+
     def draw_bar_at_time(self, start_time, end_time, task_no, cpu_no, job_no=None, clip_side=None):
         """Draws a bar over a certain time period for some task, optionally labelling it."""
         raise NotImplementedError
@@ -391,6 +427,33 @@ class TaskGraph(Graph):
 
         self.canvas.add_sel_deadline_arrow_big(x, y, height, event)
 
+    def draw_action_symbol_at_time(self, time, task_no, cpu_no, action,
+                                   job_no=None, selected=False):
+        x = self.get_time_xpos(time)
+        y = None
+
+        if task_no != -1:
+            y = self.get_item_ypos(task_no)
+        else:
+            y = self.origin[1]
+
+        height = 1.5 * (self.get_item_ypos(0) - self.get_item_yorigin(0))
+
+        self.canvas.draw_action_symbol(cpu_no, action, x, y, height, selected)
+
+    def add_sel_action_symbol_at_time(self, time, task_no, cpu_no, event):
+        x = self.get_time_xpos(time)
+        y = None
+
+        if task_no != -1:
+            y = self.get_item_ypos(task_no)
+        else:
+            y = self.origin[1]
+
+        height = 1.5 * (self.get_item_ypos(0) - self.get_item_yorigin(0))
+
+        self.canvas.add_sel_action_symbol(x, y, height, event)
+
     def draw_bar_at_time(self, start_time, end_time, task_no, cpu_no, job_no=None, clip_side=None, selected=False):
         if start_time > end_time:
             raise ValueError("Litmus is not a time machine")
@@ -599,10 +662,27 @@ class CpuGraph(Graph):
         height = self._get_bar_height() * GraphFormat.SMALL_ARROW_FACTOR
 
         x = self.get_time_xpos(time)
-        y = self.origin[1] - height
+        y = self.get_item_ypos(task_no)
 
         self.canvas.add_sel_deadline_arrow_small(x, y, height, event)
 
+    def draw_action_symbol_at_time(self, time, task_no, cpu_no, action,
+                                   job_no=None, selected=False):
+        x = self.get_time_xpos(time)
+        y = self.get_item_ypos(cpu_no)
+
+        height = 1.5 * (y - self.get_item_yorigin(cpu_no))
+
+        self.canvas.draw_action_symbol(task_no, action, x, y, height, selected)
+
+    def add_sel_action_symbol_at_time(self, time, task_no, cpu_no, event):
+        x = self.get_time_xpos(time)
+        y = self.get_item_ypos(cpu_no)
+
+        height = 1.5 * (y - self.get_item_yorigin(cpu_no))
+
+        self.canvas.add_sel_action_symbol(x, y, height, event)
+
     def draw_bar_at_time(self, start_time, end_time, task_no, cpu_no, job_no=None, clip_side=None, selected=False):
         if start_time > end_time:
             raise ValueError("Litmus is not a time machine")