From 873c7d835507412b1f7ddd6b45359d1c53a9f450 Mon Sep 17 00:00:00 2001
From: Loris1123 <molottermann@gmail.com>
Date: Thu, 25 Jun 2020 20:58:55 +0200
Subject: [PATCH] Added requirements, Support for extended CAN IDs and fixes a
 bug for static singnals

---
 Pipeline/FromCanUtilsLog.py | 4 +---
 Pipeline/Plotter.py         | 6 +++++-
 requirements.txt            | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 requirements.txt

diff --git a/Pipeline/FromCanUtilsLog.py b/Pipeline/FromCanUtilsLog.py
index cda5579..042fad8 100644
--- a/Pipeline/FromCanUtilsLog.py
+++ b/Pipeline/FromCanUtilsLog.py
@@ -1,12 +1,10 @@
 import re
 
-
 def canUtilsToTSV(filename):
     outFileName = filename + ".tsv"
     with open(outFileName, "w") as outFile:
         with open(filename, "r") as file:
-            linePattern = re.compile(
-                r"\((\d+.\d+)\)\s+[^\s]+\s+(.{3})#([0-9A-F]+)")
+            linePattern = re.compile(r"\((\d+.\d+)\)\s+[^\s]+\s+(.{3}|.{8})#([0-9A-F]+)")
 
             while True:
                 line = file.readline()
diff --git a/Pipeline/Plotter.py b/Pipeline/Plotter.py
index ff2c919..8dfa8df 100644
--- a/Pipeline/Plotter.py
+++ b/Pipeline/Plotter.py
@@ -1,6 +1,6 @@
 import matplotlib.pyplot as plt
 from matplotlib.pyplot import savefig
-from numpy import where, isin
+from numpy import where, isin, ndarray
 from os import chdir, mkdir, path
 from shutil import rmtree
 from PipelineTimer import PipelineTimer
@@ -39,6 +39,10 @@ def plot_signals_by_arb_id(a_timer: PipelineTimer, arb_id_dict: dict, signal_dic
                     signals_to_plot.append(signal)
             # One row per signal plus one for the TANG
             fig, axes = plt.subplots(nrows=1 + len(signals_to_plot), ncols=1)
+            if not isinstance(axes, ndarray):
+                print("Static signal. No figures to plot")
+                continue
+
             plt.suptitle("Time Series and TANG for Arbitration ID " + hex(k_id),
                          weight='bold',
                          position=(0.5, 1))
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..8a575cb
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+scikit-learn
+pandas
+matplotlib