Created Trace object

1 files changed, 18 insertions, 18 deletions

diff --git a/sta.py b/sta.py
index 4a53b6e..14617ef 100755
--- a/sta.py
+++ b/sta.py
@@ -10,24 +10,24 @@ from sta_output import *
 from sta_types import *
 
 
-
-
 ##################
 # Business logic #
 ##################
-
-def trace_iter(files):
-    """Returns an iterator for iterating over trace(s) and producing records."""
-    for file in files:
-        f = open(file,'rb')
-        while True:
-            try:
-                data = f.read(st_record_size)
-                typenum = struct.unpack_from('<b',data)[0]
-                type = get_type(typenum)
-                values = struct.unpack_from(StHeader.format + type.format,data)
-                record = dict(zip(type.keys,values))
-                yield record
-            except struct.error:
-                f.close()
-                break
+class Trace:
+    def __init__(self,files):
+        self.iter = self.make_iter(files) 
+    def make_iter(self, files):
+        for file in files:
+            f = open(file,'rb')
+            while True:
+                try:
+                    data = f.read(st_record_size)
+                    typenum = struct.unpack_from('<b',data)[0]
+                    type = get_type(typenum)
+                    values = struct.unpack_from(StHeader.format + 
+                        type.format,data)
+                    record = dict(zip(type.keys,values))
+                    yield record
+                except struct.error:
+                    f.close()
+                    break