2 files changed, 34 insertions, 45 deletions

diff --git a/unit_trace/visualizer.py b/unit_trace/visualizer.py
index c15bf51..6e14b18 100644..100755
--- a/unit_trace/visualizer.py
+++ b/unit_trace/visualizer.py
@@ -1,11 +1,38 @@
 #!/usr/bin/python
-import gtk
+
+"""Runs the visualizer."""
+
+import convert
+import reader
 import viz
 
-def visualizer(stream):
-    sched = viz.convert.convert_trace_to_schedule(stream)
-    sched.scan(10000000)
-    renderer = viz.renderer.Renderer(sched)
-    renderer.prepare_task_graph(attrs=viz.format.GraphFormat(time_per_maj=10000000))
-    viz.viewer.MainWindow(renderer)
+import gtk
+
+TIME_PER_MAJ = 10000000
+MAX_NUM_SLOTS = 10000
+
+def request_renderer_change(widget, file_list, params):
+    try:      
+        stream = reader.trace_reader.trace_reader(file_list)
+        #stream = reader.sanitizer.sanitizer(stream)
+        #stream = reader.gedf_test.gedf_test(stream)
+        sched = viz.convert.convert_trace_to_schedule(stream)
+    except reader.trace_reader.InvalidRecordError, e:
+        dialog = gtk.MessageDialog(widget, gtk.DIALOG_DESTROY_WITH_PARENT,
+                 gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, str(e))
+        dialog.run()
+        dialog.destroy()
+        return
+        
+    sched.scan(TIME_PER_MAJ, MAX_NUM_SLOTS)
+    
+    task_renderer = viz.renderer.Renderer(sched)
+    task_renderer.prepare_task_graph(attrs=viz.format.GraphFormat(time_per_maj=TIME_PER_MAJ))
+    cpu_renderer = viz.renderer.Renderer(sched)
+    cpu_renderer.prepare_cpu_graph(attrs=viz.format.GraphFormat(time_per_maj=TIME_PER_MAJ))
+    widget.set_renderers({'Tasks' : task_renderer, 'CPUs' : cpu_renderer})
+    
+if __name__ == '__main__':   
+    window = viz.viewer.MainWindow(request_renderer_change)
     gtk.main()
+    
diff --git a/visualizer.py b/visualizer.py
deleted file mode 100755
index 43d74a8..0000000
--- a/visualizer.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/python
-
-"""Runs the visualizer."""
-
-import convert
-import reader
-import viz
-
-import gtk
-
-TIME_PER_MAJ = 10000000
-MAX_NUM_SLOTS = 10000
-
-def request_renderer_change(widget, file_list, params):
-    try:      
-        stream = reader.trace_reader.trace_reader(file_list)
-        #stream = reader.sanitizer.sanitizer(stream)
-        #stream = reader.gedf_test.gedf_test(stream)
-        sched = convert.convert_trace_to_schedule(stream)
-    except reader.trace_reader.InvalidRecordError, e:
-        dialog = gtk.MessageDialog(widget, gtk.DIALOG_DESTROY_WITH_PARENT,
-                 gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, str(e))
-        dialog.run()
-        dialog.destroy()
-        return
-        
-    sched.scan(TIME_PER_MAJ, MAX_NUM_SLOTS)
-    
-    task_renderer = viz.renderer.Renderer(sched)
-    task_renderer.prepare_task_graph(attrs=viz.format.GraphFormat(time_per_maj=TIME_PER_MAJ))
-    cpu_renderer = viz.renderer.Renderer(sched)
-    cpu_renderer.prepare_cpu_graph(attrs=viz.format.GraphFormat(time_per_maj=TIME_PER_MAJ))
-    widget.set_renderers({'Tasks' : task_renderer, 'CPUs' : cpu_renderer})
-    
-if __name__ == '__main__':   
-    window = viz.viewer.MainWindow(request_renderer_change)
-    gtk.main()
-