Fix message offset (#374)

* Correct message iterator offset append
* Added destructor and removed opening file twice
* Added close of trace

Author: vkresch

format/OSITrace.py

@@ -45,11 +45,6 @@ def __init__(self, path=None, type_name="SensorView"):
         self.timestep_count = 0
         self.retrieved_scenario_size = 0
 
-        if path is not None and type_name is not None:
-            self.from_file(path)
-
-    # Open and Read text file
-
     def from_file(self, path, type_name="SensorView", max_index=-1, format_type=None):
         """Import a scenario from a file"""
 
@@ -142,7 +137,7 @@ def retrieve_message(self):
             message_length = struct.unpack("<L", serialized_message[i:INT_LENGTH+i])[0]
             message.ParseFromString(serialized_message[i+INT_LENGTH:i+INT_LENGTH+message_length])
             i += message_length + INT_LENGTH
-            self.message_offsets.append(message)
+            self.message_offsets.append(i)
 
         if eof:
             self.retrieved_scenario_size = scenario_size

format/osi2read.py

@@ -56,7 +56,8 @@ def main():
     if args.output == 'converted.txth':
         args.output = args.data.split('.', 1)[0] + '.txth'
 
-    trace.make_readable(args.output)    
+    trace.make_readable(args.output)
+    trace.scenario_file.close()  
 
 if __name__ == "__main__":
     main()

format/txt2osi.py

@@ -69,6 +69,7 @@ def main():
         f.write(struct.pack("<L", len(byte_buffer)) + byte_buffer) 
 
     f.close()
+    trace.scenario_file.close()
 
 if __name__ == "__main__":
     main()