Merge branch 'wip-gary'

- Adds time_per_maj option to visualizer

Conflicts:
	unit-trace

1 files changed, 4 insertions, 6 deletions

diff --git a/unit_trace/viz/visualizer.py b/unit_trace/viz/visualizer.py
index c0186f7..e80b764 100755
--- a/unit_trace/viz/visualizer.py
+++ b/unit_trace/viz/visualizer.py
@@ -8,16 +8,14 @@ import format
 import pygtk
 import gtk
 
-TIME_PER_MAJ = 10000000
-
-def visualizer(stream):
+def visualizer(stream, time_per_maj):
     sched = convert.convert_trace_to_schedule(stream)
-    sched.scan(TIME_PER_MAJ)
+    sched.scan(time_per_maj)
 
     task_renderer = renderer.Renderer(sched)
-    task_renderer.prepare_task_graph(attrs=format.GraphFormat(time_per_maj=TIME_PER_MAJ))
+    task_renderer.prepare_task_graph(attrs=format.GraphFormat(time_per_maj=time_per_maj))
     cpu_renderer = renderer.Renderer(sched)
-    cpu_renderer.prepare_cpu_graph(attrs=format.GraphFormat(time_per_maj=TIME_PER_MAJ))
+    cpu_renderer.prepare_cpu_graph(attrs=format.GraphFormat(time_per_maj=time_per_maj))
 
     window = viewer.MainWindow()
     window.set_renderers({'Tasks' : task_renderer, 'CPUs' : cpu_renderer})