Merge pull request #7 from G1OJS/V1.4

V1.4 Add timeline plots

Author: G1OJS

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wsjt_all"
-version = "1.3.1"
+version = "1.4.0"
 license = "MIT"
 license-files = ["LICENSE"]
 
@@ -27,6 +27,8 @@ Homepage = "https://github.com/G1OJS/wsjt_all"
 Issues = "https://github.com/G1OJS/wsjt_all/issues"
 
 [project.scripts]
+wsjt_all = "wsjt_all:wsjt_all"
+wsjt_all_live = "wsjt_all:wsjt_all_live"
 wsjt_all_ab = "wsjt_all:wsjt_all_ab"
 wsjt_all_ab_live = "wsjt_all:wsjt_all_ab_live"
 

src/wsjt_all/__init__.py

@@ -1 +1,2 @@
-from .prog_flow import wsjt_all_ab, wsjt_all_ab_live 
+from .prog_flow import wsjt_all, wsjt_all_live, wsjt_all_ab, wsjt_all_ab_live
+

src/wsjt_all/plotter.py src/wsjt_all/plotter_dual.pysrc/wsjt_all/plotter.py renamed to src/wsjt_all/plotter_dual.py

@@ -56,7 +56,7 @@ def plot_snrs(ax, calls, decodes_A, decodes_B, show_best_snrs_only):
             if(show_best_snrs_only):
                 series_x = [max(series_x)]
                 series_y = [max(series_y)]
-            ax.plot(series_x, series_y, color = colourseries[i % len(colourseries)] , marker ="o", alpha = 0.9)
+            ax.plot(series_x, series_y, color = colourseries[i % len(colourseries)] , marker ="o", alpha = 0.9, lw = 0.2)
     ax.axline((0, 0), slope=1, color="black", linestyle=(0, (5, 5)))
     axrng = (min(ax.get_xlim()[0], ax.get_ylim()[0]), max(ax.get_xlim()[1], ax.get_ylim()[1]))
     ax.set_xlim(axrng)
@@ -90,7 +90,7 @@ def venn(ax, ns):
     ax.text(0.5+x2/2,0.5, f'B {ns[2]}', horizontalalignment='center',verticalalignment='center')
     ax.set_title("Number of callsigns in A only, A&B, B only")
 
-def make_chart(plt, fig, axs, decodes_A, decodes_B, session_info, show_best_snrs_only = False):
+def make_chart_dual(plt, fig, axs, decodes_A, decodes_B, session_info, show_best_snrs_only = False):
     decs_A = time_window_decodes(decodes_A, session_info[0], session_info[1])
     decs_B = time_window_decodes(decodes_B, session_info[0], session_info[1])
     calls_a= get_callsigns(decs_A)

src/wsjt_all/plotter_single.py

@@ -0,0 +1,57 @@
+import matplotlib.pyplot as plt
+import random
+import os
+from wsjt_all.load_sessions import load_sessions, time_window_decodes,get_session_info_string
+global colourseries
+import datetime
+import mplcursors
+import hashlib
+
+def hash_color(callsign, cmap=plt.cm.tab20):
+    h = int(hashlib.sha1(callsign.encode()).hexdigest(), 16)
+    return cmap(h % cmap.N)
+
+def make_chart_single(plt, fig, axs, decodes_A, session_info):
+    decs_A = time_window_decodes(decodes_A, session_info[0], session_info[1])
+    session_info_string = get_session_info_string(session_info)
+        
+    print("Plotting number of reports")
+    timebins_mins = range(int((session_info[1] - session_info[0]) / 60) + 1)
+    numbs = [0]*len(timebins_mins)
+    call_rpts = {}
+    for d in decodes_A:
+        call_rpts.setdefault(d['oc'],[]).append({'t':d['t'], 'rp':d['rp']})
+        tmins = int((d['t'] - session_info[0])/60)
+        if(tmins in timebins_mins ):                # this shouldn't return false? Check prior windowing?
+            time_idx = timebins_mins.index(tmins)    
+            numbs[time_idx] += 1
+    xc = [0.5+x for x in timebins_mins] # marker at centre of minute bin
+    axs[0].plot(xc, numbs, marker = 'o', alpha = 0.9, lw = 0.5)
+
+    axs[0].set_title("Decode rate")
+    axs[0].set_xlabel("Time (mins)")
+    axs[0].set_ylabel("Number of decodes per minute")
+
+
+    print("Plotting snr of reports")
+    cols = []
+    for i, c in enumerate(call_rpts):
+        xc, yc = [], []
+        cols.append(hash_color(c))
+        for rpt in call_rpts[c]:
+            if(rpt['t']>= session_info[0] and rpt['t']<= session_info[1]):
+                xc.append((rpt['t'] - session_info[0]) / 60)
+                yc.append(rpt['rp'])
+        axs[1].plot(xc, yc, label = c, marker ="o", color = cols[i], alpha = 0.9, lw = 0.2)
+
+    axs[1].set_title("SNR per callsign")
+    axs[1].set_xlabel("Time (mins)")
+    axs[1].set_ylabel("SNR per callsign")
+
+    axs[0].set_xlim(0, int((session_info[1]-session_info[0])/60)+1)
+    axs[1].set_xlim(0, int((session_info[1]-session_info[0])/60)+1)
+
+    fig.suptitle(f"Session: {session_info_string}") 
+    plt.tight_layout()
+
+

src/wsjt_all/prog_flow.py

@@ -2,7 +2,8 @@
 import os
 import datetime
 import matplotlib.pyplot as plt
-from .plotter import make_chart, save_chart, init_colours
+from .plotter_dual import make_chart_dual, save_chart, init_colours
+from .plotter_single import make_chart_single
 from .load_sessions import load_sessions, load_overlapping_sessions, get_session_info_string
 
 def check_config():
@@ -24,18 +25,18 @@ def check_config():
             print("A wsjt_all.ini file has been created, but please edit the paths to point to the two ALL.txt files you want to compare.")
         print("Exiting program")
 
-def plot_all_historic(allfilepath_A, allfilepath_B, session_guard_seconds, show_best_snrs_only):
+def plot_all_historic_dual(allfilepath_A, allfilepath_B, session_guard_seconds, show_best_snrs_only):
     sessions_AB, decodes_A, decodes_B = load_overlapping_sessions(allfilepath_A, allfilepath_B, session_guard_seconds)
     init_colours()
-    print("Plotting sessions:")
-    for session_info in sessions_AB:
+    for i, session_info in enumerate(sessions_AB):
         session_info_string = get_session_info_string(session_info)
+        print(f"Plotting session {i} of {len(sessions_AB)}: {session_info_string}")
         fig, axs = plt.subplots(3,1, figsize=(7, 9), height_ratios = (0.1,1,1))
-        make_chart(plt, fig, axs, decodes_A, decodes_B, session_info, show_best_snrs_only)
+        make_chart_dual(plt, fig, axs, decodes_A, decodes_B, session_info, show_best_snrs_only)
         save_chart(plt, session_info_string+".png")
         plt.close()
 
-def plot_live(allfilepath_A, allfilepath_B, session_guard_seconds, plot_window_seconds, show_best_snrs_only):
+def plot_live_dual(allfilepath_A, allfilepath_B, session_guard_seconds, plot_window_seconds, show_best_snrs_only):
     fig, axs = plt.subplots(3,1, figsize=(7, 9), height_ratios = (0.1,1,1))
     plt.ion()
     init_colours()
@@ -52,9 +53,37 @@ def plot_live(allfilepath_A, allfilepath_B, session_guard_seconds, plot_window_s
             bm = sessions_A[-1][2]
             session_info=(ts,te,bm)
             axs[0].cla(), axs[1].cla(), axs[2].cla()
-            make_chart(plt, fig, axs, decodes_A, decodes_B, session_info, show_best_snrs_only)
+            make_chart_dual(plt, fig, axs, decodes_A, decodes_B, session_info, show_best_snrs_only)
             plt.pause(5)
 
+def plot_live_single(allfilepath_A, session_guard_seconds, plot_window_seconds, show_best_snrs_only):
+    fig, axs = plt.subplots(2,1, figsize=(6, 9), height_ratios = (1,1))
+    plt.ion()
+    print("Waiting for live session data")
+    while(True):
+        t_recent = datetime.datetime.now().timestamp() - plot_window_seconds * 3 # allow for delay in receiving live spots
+        decodes_A, sessions_A = load_sessions(allfilepath_A, session_guard_seconds, skip_all_before = t_recent)
+        if(len(sessions_A)>0):
+            te = sessions_A[-1][1]
+            ts = te - plot_window_seconds
+            bm = sessions_A[-1][2]
+            session_info=(ts,te,bm)
+            axs[0].cla(), axs[1].cla()
+            make_chart_single(plt, fig, axs, decodes_A, session_info, show_best_snrs_only)
+            plt.pause(5)
+
+def plot_all_historic_single(allfilepath_A, session_guard_seconds):
+    decodes_A, sessions_A = load_sessions(allfilepath_A, session_guard_seconds)
+    for i, session_info in enumerate(sessions_A):
+        if(session_info[1] > session_info[0] and len(sessions_A)>2):
+            session_info_string = get_session_info_string(session_info)
+            print(f"Plotting session {i} of {len(sessions_A)}: {session_info_string}")
+            fig, axs = plt.subplots(2,1, figsize=(6, 9), height_ratios = (1,1))
+            make_chart_single(plt, fig, axs, decodes_A, session_info)
+            save_chart(plt, session_info_string+"_timeline.png")
+            plt.close()
+
+
 def run(option):
     if(check_config()):
         config = configparser.ConfigParser()
@@ -63,13 +92,26 @@ def run(option):
         session_guard_seconds = int(config.get("settings","session_guard_seconds"))
         live_plot_window_seconds = int(config.get("settings","live_plot_window_seconds"))
         show_best_snrs_only = (config.get("settings","show_best_snrs_only") == "Y")
-        if(option=="hist"):
-            plot_all_historic(allfilepath_A, allfilepath_B, session_guard_seconds, show_best_snrs_only)
-        else:
-            plot_live(allfilepath_A, allfilepath_B, session_guard_seconds, live_plot_window_seconds, show_best_snrs_only)
+        if(option=="hist_single"):
+            plot_all_historic_single(allfilepath_A, session_guard_seconds)
+        if(option=="hist_ab"):
+            plot_all_historic_dual(allfilepath_A, allfilepath_B, session_guard_seconds, show_best_snrs_only)
+        if(option=="live_ab"):
+            plot_live_dual(allfilepath_A, allfilepath_B, session_guard_seconds, live_plot_window_seconds, show_best_snrs_only)
+        if(option=="live_single"):
+            plot_live_single(allfilepath_A,session_guard_seconds, live_plot_window_seconds,False)
+
+
+def wsjt_all():
+    run("hist_single")
+
+def wsjt_all_live():
+    run("live_single") 
 
 def wsjt_all_ab():
-    run("hist")
+    run("hist_ab")
 
 def wsjt_all_ab_live():
-    run("live")        
+    run("live_ab")        
+
+