Merge branch 'master' of ssh://git.black-mesa.xyz:434/langspielplatte/measurement-scripts

plot_single_transmission_timeline.py

@@ -2,6 +2,7 @@
 import math
 import multiprocessing
 import os
+import pickle
 from argparse import ArgumentParser
 
 import matplotlib
@@ -79,6 +80,7 @@ if __name__ == "__main__":
         serial_df["datetime"] = pd.to_datetime(serial_df["datetime"]) - pd.Timedelta(hours=1)
         serial_df = serial_df.set_index("datetime")
         serial_df.index = pd.to_datetime(serial_df.index)
+        serial_df.sort_index()
 
         transmission_df = pd.merge_asof(
             transmission_df,
@@ -161,8 +163,8 @@ if __name__ == "__main__":
 
         if args.save:
             plt.savefig("{}{}_plot.pdf".format(args.save, csv.replace(".csv", "")))
-        else:
-            plt.show()
+        if args.export:
+            pickle.dump(fig, open("{}{}_plot.pkl".format(args.save, csv.replace(".csv", "")), "wb"))
         counter += 1
 
         plt.clf()

plot_transmission_timeline.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import multiprocessing
 import os
+import pickle
 from argparse import ArgumentParser
 from math import ceil
 from time import sleep
@@ -68,6 +69,7 @@ if __name__ == "__main__":
     parser.add_argument("-s", "--serial_file", required=True, help="Serial csv file.")
     parser.add_argument("-p", "--pcap_csv_folder", required=True, help="PCAP csv folder.")
     parser.add_argument("--save", default=None, help="Location to save pdf file.")
+    parser.add_argument("--export", default=None, help="Export figure as an pickle file.")
     parser.add_argument(
         "-c",
         "--cores",
@@ -165,6 +167,7 @@ if __name__ == "__main__":
     serial_df["datetime"] = pd.to_datetime(serial_df["datetime"]) - pd.Timedelta(hours=1)
     serial_df = serial_df.set_index("datetime")
     serial_df.index = pd.to_datetime(serial_df.index)
+    serial_df.sort_index()
 
     transmission_df = pd.merge_asof(
         transmission_df,
@@ -240,8 +243,8 @@ if __name__ == "__main__":
 
     if args.save:
         plt.savefig("{}timeline_plot.pdf".format(args.save))
-    else:
-        plt.show()
+    if args.export:
+        pickle.dump(fig, open("{}timeline_plot.pkl".format(args.export), "wb"))
 
     #goodput cdf
     plt.clf()