Fix plotting without DISPLAY

3 files changed, 18 insertions, 2 deletions

diff --git a/dpd/src/Dab_Util.py b/dpd/src/Dab_Util.py
index aee66d2..212175c 100644
--- a/dpd/src/Dab_Util.py
+++ b/dpd/src/Dab_Util.py
@@ -2,7 +2,10 @@
 
 import numpy as np
 import scipy
+import matplotlib
+matplotlib.use('agg')
 import matplotlib.pyplot as plt
+import datetime
 import src.subsample_align as sa
 from scipy import signal
 import logging
@@ -27,7 +30,16 @@ class Dab_Util:
             sig_rec: The signal that has been recored
         """
         off = sig_rec.shape[0]
-        c = np.abs(signal.correlate(sig_orig, sig_rec))
+        c = signal.correlate(sig_orig, sig_rec)
+
+        corr_path = ('/tmp/tx_rx_corr_' +
+                            datetime.datetime.now().isoformat() +
+                            '.pdf')
+        plt.plot(np.real(c[:10000]), label="corr")
+        plt.legend()
+        plt.savefig(corr_path)
+        plt.clf()
+
         return np.argmax(c) - off + 1
 
     def lag_upsampling(self, sig_orig, sig_rec, n_up):
diff --git a/dpd/src/Measure.py b/dpd/src/Measure.py
index 7b5379d..49e2431 100644
--- a/dpd/src/Measure.py
+++ b/dpd/src/Measure.py
@@ -4,6 +4,8 @@ import sys
 import socket
 import struct
 import numpy as np
+import matplotlib
+matplotlib.use('agg')
 import matplotlib.pyplot as plt
 from matplotlib.animation import FuncAnimation
 import argparse
@@ -116,7 +118,7 @@ class Measure:
             % (len(txframe), txframe.dtype, len(rxframe), rxframe.dtype,
             len(txframe_aligned), txframe_aligned.dtype, len(rxframe_aligned), rxframe_aligned.dtype) )
 
-        return txframe_aligned, rxframe_aligned
+        return txframe_aligned, None, rxframe_aligned, None
 
 # The MIT License (MIT)
 #
diff --git a/dpd/src/Model.py b/dpd/src/Model.py
index 9ad7532..008dc1b 100644
--- a/dpd/src/Model.py
+++ b/dpd/src/Model.py
@@ -3,6 +3,8 @@
 import numpy as np
 import datetime
 import logging
+import matplotlib
+matplotlib.use('agg')
 import matplotlib.pyplot as plt
 
 class Model: