Merge branch 'wip-gary'

- Adds time_per_maj option to visualizer

Conflicts:
	unit-trace

1 files changed, 5 insertions, 3 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)