Merge branch 'wip-gary'

- Adds time_per_maj option to visualizer

Conflicts:
	unit-trace

4 files changed, 45 insertions, 32 deletions

diff --git a/unit-trace b/unit-trace
index f56344f..5362113 100755
--- a/unit-trace
+++ b/unit-trace
@@ -27,12 +27,14 @@ parser.add_option("-o", "--stdout", action="store_true", dest="stdout",
     default=False, help="Use stdout_printer")
 parser.add_option("-v", "--visual", action="store_true", dest="visualize",
     default=False, help="Use visualizer")
+parser.add_option("-t", "--time-per-maj", default=10000000.0, type=float,
+    dest="time_per_maj", help="Time interval between major ticks, in the visualizer")
 parser.add_option("-c", "--clean", action="store_true", dest="clean",
     default=False, help="Use sanitizer to clean garbage records")
 parser.add_option("-e", "--earliest", default=0, type=int, dest="earliest",
-    help="Earliest timestamp of interst")
+    help="Earliest timestamp of interest")
 parser.add_option("-l", "--latest", default=0, type=int, dest="latest",
-    help="Latest timestamp of interst")
+    help="Latest timestamp of interest")
 (options, traces) = parser.parse_args()
 traces = list(traces)
 if len(traces) < 1:
@@ -118,4 +120,4 @@ if options.num_inversions > -1:
 # Call visualizer
 if options.visualize is True:
     from unit_trace import viz
-    viz.visualizer.visualizer(stream3)
+    viz.visualizer.visualizer(stream3, options.time_per_maj)
diff --git a/unit_trace/viz/format.py b/unit_trace/viz/format.py
index c544e26..d3ed4fd 100644
--- a/unit_trace/viz/format.py
+++ b/unit_trace/viz/format.py
@@ -80,9 +80,9 @@ class GraphFormat(object):
     SMALL_ARROW_FACTOR = 0.6
     COMPLETION_MARKER_FACTOR = 1.6
 
-    def __init__(self, time_per_maj=DEF_TIME_PER_MAJ, maj_sep=DEF_MAJ_SEP, \
-    min_per_maj=DEF_MIN_PER_MAJ, y_item_size=DEF_Y_ITEM_SIZE, bar_fopts=DEF_FOPTS_BAR, \
-    item_fopts=DEF_FOPTS_ITEM, show_min=False, majfopts=DEF_FOPTS_MAJ, \
+    def __init__(self, time_per_maj=DEF_TIME_PER_MAJ, maj_sep=DEF_MAJ_SEP,
+    min_per_maj=DEF_MIN_PER_MAJ, y_item_size=DEF_Y_ITEM_SIZE, bar_fopts=DEF_FOPTS_BAR,
+    item_fopts=DEF_FOPTS_ITEM, show_min=False, majfopts=DEF_FOPTS_MAJ,
     minfopts=DEF_FOPTS_MIN):
         self.time_per_maj = time_per_maj
         self.maj_sep = maj_sep
diff --git a/unit_trace/viz/viewer.py b/unit_trace/viz/viewer.py
index 4d1fb7f..fb31e8a 100644
--- a/unit_trace/viz/viewer.py
+++ b/unit_trace/viz/viewer.py
@@ -122,12 +122,14 @@ class GraphArea(gtk.DrawingArea):
         if scale > GraphArea.MAX_ZOOM_IN:
             scale = GraphArea.MAX_ZOOM_IN
         self.set_scale(scale)
+        self.config_scrollbars(self.cur_x, self.cur_y, self.scale)
 
     def zoom_out(self):
         scale = self.scale - GraphArea.ZOOM_INCR
         if scale < GraphArea.MIN_ZOOM_OUT:
             scale = GraphArea.MIN_ZOOM_OUT
         self.set_scale(scale)
+        self.config_scrollbars(self.cur_x, self.cur_y, self.scale)
 
     def set_scale(self, scale):
         if scale == self.scale:
@@ -136,6 +138,22 @@ class GraphArea(gtk.DrawingArea):
         self.scale = scale
         self._dirty(0, 0, self.width, self.height)
 
+    def set_hvalue(self, value):
+        if self.horizontal is None:
+            return
+
+        value = max(value, self.horizontal.get_lower())
+        value = min(value, self.horizontal.get_upper() - self.horizontal.get_page_size())
+        self.horizontal.set_value(value)
+
+    def set_vvalue(self, value):
+        if self.vertical is None:
+            return
+
+        value = max(value, self.vertical.get_lower())
+        value = min(value, self.vertical.get_upper() - self.vertical.get_page_size())
+        self.vertical.set_value(value)
+
     def set_scroll_adjustments(self, widget, horizontal, vertical, data=None):
         graph = self.renderer.get_graph()
         width = graph.get_width()
@@ -143,7 +161,7 @@ class GraphArea(gtk.DrawingArea):
 
         self.horizontal = horizontal
         self.vertical = vertical
-        self.config_scrollbars(self.cur_x, self.cur_y)
+        self.config_scrollbars(self.cur_x, self.cur_y, self.scale)
 
         if self.horizontal is not None:
             self.horizontal.connect('value-changed', self.horizontal_value_changed)
@@ -167,21 +185,25 @@ class GraphArea(gtk.DrawingArea):
     def size_allocate(self, widget, allocation):
         self.width = allocation.width
         self.height = allocation.height
-        self.config_scrollbars(self.cur_x, self.cur_y)
+        self.config_scrollbars(self.cur_x, self.cur_y, self.scale)
 
-    def config_scrollbars(self, hvalue, vvalue):
+    def config_scrollbars(self, hvalue, vvalue, scale):
         graph = self.renderer.get_graph()
         width = graph.get_width()
         height = graph.get_height()
 
         if self.horizontal is not None:
-            self.horizontal.set_all(hvalue, 0.0, width + self.width,
-                                graph.get_attrs().maj_sep * GraphArea.HORIZ_STEP_SCROLL_FACTOR,
-                                graph.get_attrs().maj_sep * GraphArea.HORIZ_PAGE_SCROLL_FACTOR, self.width)
+            self.horizontal.set_all(0.0, 0.0, width,
+                                graph.get_attrs().maj_sep * GraphArea.HORIZ_STEP_SCROLL_FACTOR / scale,
+                                graph.get_attrs().maj_sep * GraphArea.HORIZ_PAGE_SCROLL_FACTOR / scale,
+                                self.width / scale)
+            self.set_hvalue(hvalue)
         if self.vertical is not None:
-            self.vertical.set_all(vvalue, 0.0, height + self.height,
-                                graph.get_attrs().y_item_size * GraphArea.VERT_STEP_SCROLL_FACTOR,
-                                graph.get_attrs().y_item_size * GraphArea.VERT_PAGE_SCROLL_FACTOR, self.height)
+            self.vertical.set_all(0.0, 0.0, height,
+                                graph.get_attrs().y_item_size * GraphArea.VERT_STEP_SCROLL_FACTOR / scale,
+                                graph.get_attrs().y_item_size * GraphArea.VERT_PAGE_SCROLL_FACTOR / scale,
+                                self.height / scale)
+            self.set_vvalue(vvalue)
 
     def refresh_events(self, sender, new, old, replace):
         """Even if the selected areas change on one graph, they change
@@ -485,16 +507,10 @@ class GraphWindow(gtk.ScrolledWindow):
         return True
 
     def set_hvalue(self, value):
-        if self.get_hadjustment() is None:
-            return
-
-        self.get_hadjustment().set_value(value)
+        self.get_graph_area().set_hvalue(value)
 
     def set_vvalue(self, value):
-        if self.get_vadjustment() is None:
-            return
-
-        self.get_vadjustment().set_value(value)
+        self.get_graph_area().set_vvalue(value)
 
     def _scroll_direction(self, keystr):
         hadj = self.get_hadjustment()
@@ -721,9 +737,6 @@ class MainWindow(gtk.Window):
                         garea = self.notebook.get_nth_page(i).get_graph_area()
                         # Center as much as possible
                         pos = garea.get_graph().get_time_xpos(time) - garea.get_width() / 2.0
-                        pos = max(0, pos)
-                        pos = min(garea.get_graph().get_width(), pos)
-
                         self.notebook.get_nth_page(i).set_hvalue(pos)
                 else:
                     err_dialog = gtk.MessageDialog(self, gtk.DIALOG_DESTROY_WITH_PARENT,
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})