PyFT8 3.6.3__tar.gz → 3.6.4__tar.gz

{pyft8-3.6.3 → pyft8-3.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 3.6.3
+Version: 3.6.4
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later

{pyft8-3.6.3 → pyft8-3.6.4}/PyFT8/gui.py

@@ -26,9 +26,8 @@ def add_my_axes(fig, pos):
 MESSAGE_TYPES = {'generic':{'bg':'blue', 'fg':'white', 'alpha':0.5}, 'CQ':{'bg':'green', 'fg':'white', 'alpha':0.8},
                  'from_me': {'bg':'yellow', 'fg':'black', 'alpha':0.95}, 'to_me':{'bg':'red', 'fg':'white', 'alpha':0.9}} 
 class Msg_box:
-    def __init__(self, fig, ax, x, y, w, h, message, onclick):
+    def __init__(self, fig, ax, x, y, w, h, message):
         from matplotlib.patches import Rectangle
-        self.onclick = onclick
         self.fig, self.ax = fig, ax
         message_type_params = MESSAGE_TYPES[message['message_type']]
         rect = Rectangle((x, y), w, h, edgecolor='lime', lw=2)
@@ -36,7 +35,6 @@ class Msg_box:
         self.patch.set_visible(False)
         text_inst = self.ax.text(x, y+1, message['display_text'], fontsize='small', fontweight = 'bold' )
         text_inst.set_visible(False)
-        self.cid = fig.canvas.mpl_connect('button_press_event', self._onclick)
         text_inst.set_color(message_type_params['fg'])
         self.patch.set_facecolor(message_type_params['bg'])
         self.patch.set_alpha(message_type_params['alpha'])
@@ -46,6 +44,10 @@ class Msg_box:
         for a in self.artists:
             a.set_visible(True)
 
+    def contains(self, x, y):
+        if self.patch.get_visible():
+            return self.patch.get_extents().contains(x, y)
+
     def draw(self):
         for a in self.artists:
             self.ax.draw_artist(a)
@@ -61,11 +63,6 @@ class Msg_box:
             self.artists.remove(a)
         self = None
 
-    def _onclick(self, event):
-        b, _ = self.patch.contains(event)
-        if(b):
-            self.onclick({'action': 'MESSAGE_CLICK', 'message':self.message})
-
 class Panel:
     def __init__(self, fig, pos):
         self.fig = fig
@@ -93,16 +90,16 @@ class Panel:
         self.ax.draw_artist(a)
 
 class ButtonBox:
-    def __init__(self, fig, box, btn_pc = 30, onclick = None, clickargs=None, btn_text = ' ', info_text = ' '):
-        self.clickargs = clickargs
+    def __init__(self, fig, box, btn_pc = 30, btn_text = ' ', info_text = ' '):
+        self.id = btn_text
         btnbox, infobox = box.copy(), box.copy()
         btnbox[2] = box[2] * btn_pc /100
         infobox[2] = box[2] * (100-btn_pc) /100
         infobox[0] = box[0] + box[2] * (btn_pc /100)
         self.btn_axs = add_my_axes(fig, btnbox)
         self.btn_axs.set_facecolor(BUTTONCOLOR)
+        self.bbox = self.btn_axs.bbox
         self.btn_widg = Button(self.btn_axs, btn_text, color = BUTTONCOLOR, hovercolor = HOVERCOLOR)
-        self.btn_widg.on_clicked(lambda x: onclick(clickargs))
         self.info_axs = add_my_axes(fig, infobox)
         self.info_art = self.info_axs.text(0.03, 0.5, info_text, color = INFO_TEXT_COLOR, verticalalignment = 'center', clip_on = True)        
         self.state_is_active = None
@@ -120,7 +117,7 @@ class ButtonBox:
             self.info_art.set_text(info_text)
         if color is not None:
             self.info_art.set_color(color)
-        
+
 class Gui:
     def __init__(self, message_broker, rig_control, console_print, configured_bands, hearing_me_since_mins = 5):
         self.hearing_me_since_mins = hearing_me_since_mins
@@ -151,44 +148,33 @@ class Gui:
         self.msg_boxes = []
         self.button_boxes = []
 
-        bh, bs = 0.02, 0.002
-        bb = ButtonBox(self.fig, [L['pmargin'], self.wf_top - (len(self.button_boxes)+1) * bh + bs, L['sidebar_width'], bh-bs], btn_pc = 100,
-                        btn_text = "CQ", onclick = self._on_click_local, clickargs = {'action':'CQ'})                            
-        self.button_boxes.append(bb)
-        bb = ButtonBox(self.fig, [L['pmargin'], self.wf_top - (len(self.button_boxes)+1) * bh + bs, L['sidebar_width'], bh-bs], btn_pc = 100,
-                        btn_text = "Repeat last", onclick = self._on_click_local, clickargs = {'action':'RPT_LAST'})                            
-        self.button_boxes.append(bb)
-        bb = ButtonBox(self.fig, [L['pmargin'], self.wf_top - (len(self.button_boxes)+1) * bh + bs, L['sidebar_width'], bh-bs], btn_pc = 100,
-                        btn_text = "Tx off", onclick = self._on_click_local, clickargs = {'action':'TX_OFF'})                            
-        self.button_boxes.append(bb)            
-        for band_info in self.configured_bands:
-            band, fMHz = band_info['band'], band_info['fMHz']
-            bb = ButtonBox(self.fig, [L['pmargin'], self.wf_top - (len(self.button_boxes)+1) * bh + bs, L['sidebar_width'], bh-bs], btn_pc = 30,
-                            btn_text = band, onclick = self._on_click_local, clickargs = {'action':'SET_BAND', 'band':band, 'fMHz':fMHz})
-            self.button_boxes.append(bb)
+        bh, bsep = 0.02, 0.002
+        bx, bw = L['pmargin'], L['sidebar_width']
+        bxs = self.button_boxes
+        self.button_boxes.append(ButtonBox(self.fig, [bx, self.wf_top - (len(bxs)+1)*bh + bsep, bw, bh-bsep], btn_text = "CQ", btn_pc = 100) )
+        self.button_boxes.append(ButtonBox(self.fig, [bx, self.wf_top - (len(bxs)+1)*bh + bsep, bw, bh-bsep], btn_text = "Repeat last", btn_pc = 100) )
+        self.button_boxes.append(ButtonBox(self.fig, [bx, self.wf_top - (len(bxs)+1)*bh + bsep, bw, bh-bsep], btn_text = "Tx off", btn_pc = 100) )           
+        for band in self.configured_bands:
+            self.button_boxes.append(ButtonBox(self.fig, [bx, self.wf_top - (len(self.button_boxes)+1) * bh + bsep, bw, bh-bsep], btn_pc = 30, btn_text = band))
             
-        hm_top = self.wf_top - (len(self.button_boxes)+2) * bh + bs - L['vsep1']
+        hm_top = self.wf_top - (len(self.button_boxes)+2) * bh + bsep - L['vsep1']
 
         self.console = Panel(self.fig, [self.wf_left, self.wf_top+L['vsep1'], 1-self.wf_left-L['pmargin'], L['banner_height']])
         self.console_rows_text = None
         self.hearing_panel = Panel(self.fig, [L['pmargin'], L['pmargin'], L['sidebar_width'], hm_top])
 
+        self.cid = self.fig.canvas.mpl_connect('button_press_event', self._oncanvasclick)
+
     def main_loop(self):
         last_ptr = 0
         self.plt.show(block = False)
-        t0 = time_utils.time()
         while True:
-            t = time_utils.time()
-            #print(f"{t-t0:6.3f}")
-            t0=t
-            time_utils.sleep(0.05)
             self.image.set_data(self.waterfall_data['data'])
             if self.needs_redraw:
                 self.needs_redraw = False
-                plt.pause(0.1)
+                plt.pause(0.01)
             else:
                 self.ax_wf.draw_artist(self.image)
-                self.fig.canvas.update()
                 for mb in self.msg_boxes:
                     mb.draw()
                 self.fig.canvas.update()
@@ -202,13 +188,13 @@ class Gui:
         self._refresh_band_buttons()
         self._refresh_home_panel()
         self._clear_msg_boxes(curr_cycle)
-        self.needs_redraw = True
 
     def display_message(self, message):
         x = int(message['t0'] / self.waterfall_data['dt'] + message['their_tx_cycle'] * self.waterfall_data['pixels_per_cycle'])
         y = int(message['fHz'] / self.waterfall_data['df'])
-        mb = Msg_box(self.fig, self.ax_wf, x, y, self.waterfall_data['sig_w'], self.waterfall_data['sig_h'], message, onclick = self._on_click_local)
+        mb = Msg_box(self.fig, self.ax_wf, x, y, self.waterfall_data['sig_w'], self.waterfall_data['sig_h'], message)
         self.msg_boxes.append(mb)
+        
     def get_band_info(self):
         return self.band_info
 
@@ -229,24 +215,30 @@ class Gui:
                                    color = row_text['color'])
         self.needs_redraw = True
 
-    def _on_click_local(self, clickargs):
-        btn_action = clickargs['action']
-        if(btn_action == 'SET_BAND'):
-            current_band, freqMHz = clickargs['band'], clickargs['fMHz']
-            self.band_info = {'current_band':current_band, 'fMHz':freqMHz, 'time_set':time_utils.time()}
+    def _set_band(self, band):
+        if band in self.configured_bands:
+            self.band_info = {'current_band':band, 'fMHz':self.configured_bands[band], 'time_set':time_utils.time()}
             self.console_print(f"[PyFT8] Set band: {self.band_info['current_band']} {self.band_info['fMHz']}")
-            self._refresh_hearing()
-            for cyc in range(2):
-                self._clear_msg_boxes(cyc)
-            self._refresh_band_buttons()
-            self._refresh_home_panel()
-        if clickargs['action'] == "MESSAGE_CLICK":
-            m = clickargs['message']
-            m_string = f"{m['hail']} {m['their_call']} {m['grid_rpt']}"
-            self.console_print(f"[GUI] Clicked on message '{m_string}'")
-        self.needs_redraw = True
-        self.qso_manager.on_click(clickargs)
 
+    def _oncanvasclick(self, clickargs):
+        #print(f"Click at {time_utils.cycle_time():6.2f}")
+         
+        if clickargs.inaxes is self.ax_wf:
+            for mb in self.msg_boxes:
+                if mb.contains(clickargs.x, clickargs.y):
+                    self.console_print(f"[GUI] Clicked on message '{mb.message['msg_text']}'")
+                    self.qso_manager.on_click({'action':"MESSAGE_CLICK", 'message':mb.message})
+                    return
+        for bb in self.button_boxes:
+            if bb.bbox.contains(clickargs.x, clickargs.y):
+                if bb.id[:-1].isnumeric():
+                    self.needs_redraw = True
+                    self._set_band(bb.id)
+                    self.qso_manager.on_click({'action':"SET_BAND", 'fMHz':self.configured_bands[bb.id]})
+                    self.after_search(curr_cycle = None)
+                else:
+                    action = ["CQ", "RPT_LAST", "TX_OFF"][['CQ', 'Repeat last', 'Tx off'].index(bb.id)]
+                    self.qso_manager.on_click({'action':action})
 
     def _hide_msg_boxes(self, curr_cycle):
         to_hide = [mb for mb in self.msg_boxes if mb.cycle == curr_cycle]
@@ -254,8 +246,8 @@ class Gui:
             mb.hide()
         self.needs_redraw = True
 
-    def _clear_msg_boxes(self, curr_cycle):
-        to_remove = [mb for mb in self.msg_boxes if mb.cycle == curr_cycle]
+    def _clear_msg_boxes(self, curr_cycle = None):
+        to_remove = [mb for mb in self.msg_boxes if mb.cycle == curr_cycle or curr_cycle is None]
         self.msg_boxes = [mb for mb in self.msg_boxes if mb.cycle != curr_cycle]
         for mb in to_remove:
             mb.remove()
@@ -282,12 +274,10 @@ class Gui:
         current_band = self.band_info['current_band']
         grd = self.myGrid[:4]
         for bb in self.button_boxes:
-            button_band = bb.clickargs.get('band',None)
-            if button_band is not None:
-                bb.set_state(button_band == current_band)
-                if button_band in self.history.home_activity:
-                    cnts = self.history.home_activity[button_band]
-                    bb.set_info_text(f"{cnts[0]}Tx, {cnts[1]}Rx")
+            bb.set_state(bb.id == current_band)
+            if bb.id in self.history.home_activity:
+                cnts = self.history.home_activity[bb.id]
+                bb.set_info_text(f"{cnts[0]}Tx, {cnts[1]}Rx")
         self.needs_redraw = True
 
     def _refresh_hearing(self):

{pyft8-3.6.3 → pyft8-3.6.4}/PyFT8/message_broker.py

@@ -22,28 +22,25 @@ class Broker():
     def process_message(self, message_dict):
         hail, their_call, grid_rpt = message_dict['hail'], message_dict['their_call'], message_dict['grid_rpt']
         cyclestart_string, their_snr = message_dict['cyclestart_string'], message_dict['their_snr']
-        m = message_dict
-        screen_format = f"{cyclestart_string} {their_snr} {m['dt']:4.1f} {m['fHz']:4.0f} ~ {hail} {their_call} {grid_rpt}"
-        print(f"{screen_format:50s} decoded@ {m['decode_completed']:5.1f}s, dec = {m['decode_status']}")
-
         mtype_val = 0 + 1*(their_call == self.myCall) + 2*(hail == self.myCall) + 3*(their_call != self.myCall and hail.startswith('CQ'))
         mtype = ['generic', 'from_me', 'to_me', 'CQ'][mtype_val]        
         message_dict.update( {'message_type':mtype, 'display_text':f"{hail} {their_call} {grid_rpt}",
                               'priority':(mtype == 'to_me' or mtype == 'CQ')} )
-        
         if self.history:
             current_band = self.gui.get_band_info()['current_band'] 
             hearing_me, wb_text, geo_text = self.history.get_message_extra_info(their_call, current_band)
             display_text = f"{message_dict['hail']} {message_dict['their_call']} {message_dict['grid_rpt']} {hearing_me} {wb_text} {geo_text}"
             message_dict.update( {'hearing_me':hearing_me, 'wb_text':wb_text, 'geo_text':geo_text, 'display_text':display_text } )            
+
         if message_dict['priority']:
             if self.gui:
                 self.gui.display_message(message_dict)
-
-        self.message_queue_non_time_critical.put(message_dict)
-
         if self.on_decode:
             self.on_decode(message_dict)
+        m = message_dict
+        screen_format = f"{cyclestart_string} {their_snr} {m['dt']:4.1f} {m['fHz']:4.0f} ~ {hail} {their_call} {grid_rpt}"
+        print(f"{screen_format:50s} decoded@ {m['decode_completed']:5.1f}s, dec = {m['decode_status']}")
+        self.message_queue_non_time_critical.put(message_dict)
 
     def _process_message_ntc(self):
         while True:

{pyft8-3.6.3 → pyft8-3.6.4}/PyFT8/pyft8.py

@@ -11,7 +11,7 @@ from PyFT8.databases import ADIF
 from PyFT8.qso_manager import QSO_manager
 from PyFT8.message_broker import Broker
 
-VER = '3.6.3'
+VER = '3.6.4'
 PSKR_REFRESH_MINS = 20
 message_broker = None
 
@@ -129,9 +129,9 @@ def cli():
         message_broker.soundcard_out = soundcard_out
         message_broker.adif_logging = ADIF(f"{config_folder}/PyFT8.adi")
         message_broker.history = History(config_folder, myCall, myGrid, config['gui']['loc'])
-        configured_bands = []
-        for b,f in config['bands'].items():
-            configured_bands.append({'band':b, 'fMHz':f})
+        configured_bands = {}
+        for b, f in config['bands'].items():
+            configured_bands[b] = f
         message_broker.gui = Gui(message_broker, rig_control, console_print,  configured_bands)
         qso_manager = QSO_manager(message_broker, rig_control, console_print)
         message_broker.gui.register_qso_manager(qso_manager)

{pyft8-3.6.3 → pyft8-3.6.4}/PyFT8/qso_manager.py

@@ -11,7 +11,7 @@ class QSO_manager:
         self.find_clear_freq = message_broker.rx.find_clear_freq
         self.adif_logging = message_broker.adif_logging
         self.in_qso_with = False
-        self.tx_payload = None
+        self.tx_payload, self.last_tx_payload = None, None
         self.transmitting = False
         self.tx_cycle = 0
         self.console_print = console_print

{pyft8-3.6.3 → pyft8-3.6.4}/PyFT8/receiver.py

@@ -589,6 +589,7 @@ class Receiver():
                         duplicate_filter.add(key)
                         hail, their_call, grid_rpt = c.msg_tuple
                         message_dict = {'cyclestart_string':c.cyclestart['string'], 'hail':hail, 'their_call':their_call, 'grid_rpt':grid_rpt,
+                                        'msg_text':f"{hail} {their_call} {grid_rpt}",
                                         'their_snr':f"{c.snr:+03d}", 'their_tx_cycle':c.origin['odd_even'], 
                                         't0':c.origin['t0'], 'dt':c.origin['t0'] - 0.5, 'fHz':c.origin['f0'],
                                         'decode_status':c.decode_status, 'decode_completed':time_utils.cycle_time()}

{pyft8-3.6.3 → pyft8-3.6.4}/PyFT8.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 3.6.3
+Version: 3.6.4
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later

{pyft8-3.6.3 → pyft8-3.6.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PyFT8"
-version = "3.6.3"
+version = "3.6.4"
 license = "GPL-3.0-or-later"
 
 authors = [