Fix decode rate counting

Author: G1OJS

src/wsjt_all/plotter_single.py

@@ -13,9 +13,10 @@ def make_chart_single(plt, fig, axs, decodes_A, session_info):
     numbs = [0] * timerange_mins
     call_rpts = {}
     for d in decodes_A:
-        call_rpts.setdefault(d['oc'],[]).append({'t':d['t'], 'rp':d['rp']})
-        tmins = int((int(d['t']) - session_info[0])/60)
-        if(tmins>=0 and tmins < timerange_mins):
+        t = d['t'] - session_info[0]
+        if(t>=0 and t < 60*timerange_mins):
+            call_rpts.setdefault(d['oc'],[]).append({'t':t, 'rp':d['rp']})
+            tmins = int(t/60)
             numbs[tmins] += 1
     xc = [x + 0.5 for x in range(0,timerange_mins)] # marker at centre of minute bin
     axs[0].plot(xc, numbs, marker = 'o', alpha = 0.9, lw = 0.5)
@@ -30,8 +31,8 @@ def make_chart_single(plt, fig, axs, decodes_A, session_info):
         xc, yc = [], []
         cols.append(hash_color(c, plt.cm.tab20))
         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)
+            if(rpt['t']>= 0 and rpt['t']<= 60*timerange_mins):
+                xc.append(rpt['t'] / 60)
                 yc.append(rpt['rp'])
         axs[1].plot(xc, yc, label = c, marker ="o", color = cols[i], alpha = 0.9, lw = 0.2)
 

src/wsjt_all/prog_flow.py

@@ -1,6 +1,6 @@
 import configparser
 import os
-from .plotter_dual import plot_all_historic_dual, make_chart_dual
+from .plotter_dual import plot_all_historic_dual, plot_live_dual
 from .plotter_single import plot_all_historic_single, plot_live_single
 
 def check_config():

tests/plot_test.py

@@ -1,5 +1,22 @@
 import matplotlib.pyplot as plt
 
+def count_rate():
+    dectimes=[-30,-30,-30,0,0,0,0,0,15,15,15,15, 120,120,120, 240,240,240,240, 480,480]
+        
+    print("Plotting number of reports")
+    timerange_mins = int((600 - 0) / 60)
+    numbs = [0] * timerange_mins
+    call_rpts = {}
+    for dt in dectimes:
+        if(dt>=0 and dt < 60*timerange_mins):
+            tmins = int(dt/60)
+            print(tmins)
+            numbs[tmins] += 1
+    xc = [x + 0.5 for x in range(0,timerange_mins)] # marker at centre of minute bin
+    axs[0].plot(xc, numbs, marker = 'o', alpha = 0.9, lw = 0.5)
+
+
+
 def venn(ax, ns):
     x1 = n[0]/sum(ns)
     x2 = (sum(ns)-ns[2])/sum(ns)
@@ -17,8 +34,8 @@ def venn(ax, ns):
 fig.suptitle(f"Session: 1st line\n2nd line") 
 
 n=[30,30,30]    # A, AB, B
-venn(axs[0],n)
-    
+#venn(axs[0],n)
+count_rate()
 axs[1].set_title("Number of decodes of each callsign in session for A and B")
 axs[1].set_xlabel("Number of decodes in all.txt A")
 axs[1].set_ylabel("Number of decodes in all.txt B")

tests/test.py

@@ -3,5 +3,5 @@
 
 from wsjt_all import *
 
-wsjt_all_live()
+wsjt_all_ab_live()
 

tests/wsjt_all.ini

@@ -4,5 +4,5 @@ allB = C:\Users\drala\AppData\Local\WSJT-X - AltAB\all.txt
 
 [settings]
 session_guard_seconds = 300
-live_plot_window_seconds = 600
+live_plot_window_seconds = 300
 show_best_snrs_only = N