Added ability to specify units along with -t command-line option

3 files changed, 26 insertions, 9 deletions

diff --git a/unit_trace/viz/__init__.py b/unit_trace/viz/__init__.py
index 91093c1..118a026 100644
--- a/unit_trace/viz/__init__.py
+++ b/unit_trace/viz/__init__.py
@@ -11,8 +11,8 @@ try:
 except ImportError:
     import sys
 
-    print 'Unit-Trace could not find pycairo and/or pygtk installed on your system. Please\n' \
-            + 'make sure these libraries are installed before attempting to use the visualizer.'
+    sys.stderr.write('Unit-Trace could not find pycairo and/or pygtk installed on your system. Please\n' \
+            + 'make sure these libraries are installed before attempting to use the visualizer.')
     sys.exit(1)
 
 gobject.signal_new('set-scroll-adjustments', viewer.GraphArea, gobject.SIGNAL_RUN_FIRST,
diff --git a/unit_trace/viz/util.py b/unit_trace/viz/util.py
index 430063b..12d65f4 100644
--- a/unit_trace/viz/util.py
+++ b/unit_trace/viz/util.py
@@ -63,6 +63,29 @@ class Sec(TimeUnit):
         if time is None: return time
         return time * 1000000000.0
 
+def parse_time(text):
+    # perhaps the user didn't put a space between the number and
+    # the time unit
+    for i, char in enumerate(text):
+        if char == ' ':
+            break
+        elif char.isalpha():
+            text = text[0:i] + ' ' + text[i:]
+            break
+
+    tokens = text.split()
+
+    if len(tokens) > 2 or len(tokens) == 0:
+        raise ValueError
+
+    unit = None
+    if len(tokens) == 2:
+        unit = parse_unit(tokens[1])
+    else:
+        unit = MilliSec()
+
+    return unit.native_to_nsec(float(tokens[0]))
+
 def parse_unit(expr):
     expr = expr.strip().lower()
 
diff --git a/unit_trace/viz/viewer.py b/unit_trace/viz/viewer.py
index bb1385c..4613c47 100644
--- a/unit_trace/viz/viewer.py
+++ b/unit_trace/viz/viewer.py
@@ -856,14 +856,8 @@ class MainWindow(gtk.Window):
             if ret == gtk.RESPONSE_ACCEPT:
                 err, time = None, None
                 try:
-                    input_tokens = self.text_input_dialog.get_input().split()
-                    if len(input_tokens) > 2:
-                        raise ValueError
+                    time = util.parse_time(self.text_input_dialog.get_input())
 
-                    if len(input_tokens) > 1:
-                        unit = util.parse_unit(input_tokens[1])
-
-                    time = unit.native_to_nsec(float(input_tokens[0]))
                     start, end = self.notebook.get_nth_page(self.notebook.last_page).get_graph_area() \
                                  .get_schedule().get_time_bounds()
                     if time < start or time > end: