not1mm 23.3.8__py3-none-any.whl → 23.3.15__py3-none-any.whl

not1mm/__main__.py

@@ -9,44 +9,49 @@ import logging
 import os
 import pkgutil
 import re
+import socket
 import sqlite3
 import sys
+import subprocess
+import threading
+import uuid
 from datetime import datetime
 from json import dumps, loads
 from pathlib import Path
 from shutil import copyfile
 from xmlrpc.client import Error, ServerProxy
 
+# import dbus
 import psutil
 from PyQt5 import QtCore, QtGui, QtWidgets, uic
 from PyQt5.QtCore import (
     QDir,
-    QPoint,
-    QSize,
+    QPoint,  # pylint: disable=no-name-in-module
     QRect,
+    QSize,
     Qt,
-)  # pylint: disable=no-name-in-module
+)
 from PyQt5.QtGui import QFontDatabase  # pylint: disable=no-name-in-module
 
-from not1mm.lib.database import DataBase
 from not1mm.lib.cat_interface import CAT
 from not1mm.lib.cwinterface import CW
-from not1mm.lib.edit_settings import EditSettings
+from not1mm.lib.database import DataBase
 from not1mm.lib.edit_macro import EditMacro
 from not1mm.lib.edit_opon import OpOn
-from not1mm.lib.qrz_dialog import UseQRZ
+from not1mm.lib.edit_settings import EditSettings
 from not1mm.lib.ham_utility import (
     bearing,
-    distance,
-    reciprocol,
     bearing_with_latlon,
+    calculate_wpx_prefix,
+    distance,
     distance_with_latlon,
     getband,
+    reciprocol,
 )
 from not1mm.lib.lookup import QRZlookup
+from not1mm.lib.qrz_dialog import UseQRZ
 from not1mm.lib.version import __version__
 
-
 # os.environ["QT_QPA_PLATFORM"] = "wayland"
 os.environ["QT_QPA_PLATFORMTHEME"] = "gnome"
 # os.environ["QT_STYLE_OVERRIDE"] = "Fusion"
@@ -163,6 +168,12 @@ class MainWindow(QtWidgets.QMainWindow):
         super().__init__(*args, **kwargs)
         logger.info("MainWindow: __init__")
         self.database = DataBase(self.dbname, WORKING_PATH)
+        _ = subprocess.Popen(
+            [sys.executable, WORKING_PATH + "/logwindow.py"]
+        )  # Call subprocess
+        # subprocess.run(WORKING_PATH + "/logwindow.py")
+        self.cw = CW(1, "127.0.0.1", 6789)
+        self.contact = self.database.empty_contact
         data_path = WORKING_PATH + "/data/main.ui"
         uic.loadUi(data_path, self)
 
@@ -177,6 +188,11 @@ class MainWindow(QtWidgets.QMainWindow):
         self.radioButton_sp.clicked.connect(self.run_sp_buttons_clicked)
         self.score.setText("0")
         self.callsign.textEdited.connect(self.callsign_changed)
+        self.callsign.returnPressed.connect(self.save_contact)
+        self.sent.returnPressed.connect(self.save_contact)
+        self.receive.returnPressed.connect(self.save_contact)
+        self.other_1.returnPressed.connect(self.save_contact)
+        self.other_2.returnPressed.connect(self.save_contact)
         self.sent.setText("59")
         self.receive.setText("59")
         icon_path = WORKING_PATH + "/data/"
@@ -278,6 +294,8 @@ class MainWindow(QtWidgets.QMainWindow):
         #         if self.cw.servertype == 1:
         #             self.cw.speed -= 1
         #             self.cw.sendcw(f"\x1b2{self.cw.speed}")
+        # if event.key() == Qt.Key.Key_Enter:
+        #     self.save_contact()
         if event.key() == Qt.Key.Key_Tab or event.key() == Qt.Key.Key_Backtab:
             if self.sent.hasFocus():
                 logger.debug("From sent")
@@ -339,25 +357,18 @@ class MainWindow(QtWidgets.QMainWindow):
                     prev_tab.deselect()
                     prev_tab.end(False)
                 else:
+                    text = self.callsign.text()
+                    text = text.upper()
+                    _thethread = threading.Thread(
+                        target=self.check_callsign2,
+                        args=(text,),
+                        daemon=True,
+                    )
+                    _thethread.start()
                     next_tab = self.tab_next.get(self.callsign)
                     next_tab.setFocus()
                     next_tab.deselect()
                     next_tab.end(False)
-                # cse = self.callsign_entry.text()
-                # if len(cse):
-                #     if cse[0] == ".":
-                #         self.keyboardcommand(cse)
-                #         return
-                #     else:
-                #         _thethread = threading.Thread(
-                #             target=self.lazy_lookup,
-                #             args=(self.callsign_entry.text(),),
-                #             daemon=True,
-                #         )
-                #         _thethread.start()
-                # self.class_entry.setFocus()
-                # self.class_entry.deselect()
-                # self.class_entry.end(False)
                 return
         if event.key() == Qt.Key_F1:
             self.sendf1()
@@ -389,6 +400,8 @@ class MainWindow(QtWidgets.QMainWindow):
         vfoa = self.radio_state.get("vfoa", "")
         if vfoa:
             vfoa = int(vfoa) / 1000
+        else:
+            vfoa = 0.0
         self.setWindowTitle(
             f"{round(vfoa,2)} "
             f"{self.radio_state.get('mode', '')} - Not1MM v{__version__}"
@@ -396,6 +409,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def clearinputs(self):
         """Clears the text input fields and sets focus to callsign field."""
+        self.contact = self.database.empty_contact
         self.heading_distance.setText("No Heading")
         self.dx_entity.setText("")
         self.callsign.clear()
@@ -409,6 +423,59 @@ class MainWindow(QtWidgets.QMainWindow):
         self.other_2.clear()
         self.callsign.setFocus()
 
+    def save_contact(self):
+        """Save to db"""
+        logger.debug("saving")
+        self.contact["TS"] = datetime.utcnow().isoformat(" ")[:19]
+        self.contact["Call"] = self.callsign.text()
+        self.contact["Freq"] = round(float(self.radio_state.get("vfoa", 0.0)) / 1000, 2)
+        self.contact["QSXFreq"] = round(
+            float(self.radio_state.get("vfoa", 0.0)) / 1000, 2
+        )
+        self.contact["Mode"] = self.radio_state.get("mode", "")
+        self.contact["ContestName"] = self.contest.name
+        self.contact["SNT"] = self.sent.text()
+        self.contact["RCV"] = self.receive.text()
+        # self.contact["CountryPrefix"]
+        # self.contact["StationPrefix"]
+        # self.contact["QTH"]
+        # self.contact["Name"]
+        # self.contact["Comment"]
+        # self.contact["NR"]
+        # self.contact["Sect"]
+        # self.contact["Prec"]
+        # self.contact["CK"]
+        # self.contact["ZN"]
+        # self.contact["SentNr"]
+        # self.contact["Points"]
+        # self.contact["IsMultiplier1"]
+        # self.contact["IsMultiplier2"]
+        # self.contact["Power"]
+        # self.contact["Band"]
+        self.contact["WPXPrefix"] = calculate_wpx_prefix(self.callsign.text())
+        # self.contact["Exchange1"]
+        # self.contact["RadioNR"]
+        # self.contact["ContestNR"]
+        # self.contact["isMultiplier3"]
+        # self.contact["MiscText"]
+        # self.contact["IsRunQSO"]
+        # self.contact["ContactType"]
+        # self.contact["Run1Run2"]
+        # self.contact["GridSquare"]
+        self.contact["Operator"] = self.current_op
+        # self.contact["Continent"]
+        # self.contact["RoverLocation"]
+        # self.contact["RadioInterfaced"]
+        # self.contact["NetworkedCompNr"]
+        self.contact["NetBiosName"] = socket.gethostname()
+        # self.contact["IsOriginal"]
+        self.contact["ID"] = uuid.uuid4().hex
+        # self.contact["CLAIMEDQSO"]
+        debug_output = f"{self.contact}"
+        logger.debug(debug_output)
+        self.database.log_contact(self.contact)
+        self.clearinputs()
+
     def qrz_preference_selected(self):
         """Show QRZ settings dialog"""
         logger.debug("QRZ preference selected")
@@ -578,53 +645,91 @@ class MainWindow(QtWidgets.QMainWindow):
         logger.debug("F12 Right Clicked.")
         self.edit_macro(self.F12)
 
+    def process_macro(self, macro: str) -> str:
+        """Process CW macro substitutions"""
+        macro = macro.upper()
+        # if self.groupcall and self.connect_to_server:
+        #     macro = macro.replace("{MYCALL}", self.groupcall)
+        # else:
+        macro = macro.replace("{MYCALL}", self.pref.get("callsign"))
+        # macro = macro.replace("{MYCLASS}", self.preference.get("myclass"))
+        # macro = macro.replace("{MYSECT}", self.preference.get("mysection"))
+        macro = macro.replace("{HISCALL}", self.callsign.text())
+        return macro
+
     def sendf1(self):
         """stub"""
         logger.debug("F1 Clicked")
+        if self.cw:
+            # if self.preference.get("send_n1mm_packets"):
+            #     self.n1mm.radio_info["FunctionKeyCaption"] = self.F1.text()
+            self.cw.sendcw(self.process_macro(self.F1.toolTip()))
 
     def sendf2(self):
         """stub"""
         logger.debug("F2 Clicked")
+        if self.cw:
+            self.cw.sendcw(self.process_macro(self.F2.toolTip()))
 
     def sendf3(self):
         """stub"""
         logger.debug("F3 Clicked")
+        if self.cw:
+            self.cw.sendcw(self.process_macro(self.F3.toolTip()))
 
     def sendf4(self):
         """stub"""
         logger.debug("F4 Clicked")
+        if self.cw:
+            self.cw.sendcw(self.process_macro(self.F4.toolTip()))
 
     def sendf5(self):
         """stub"""
         logger.debug("F5 Clicked")
+        if self.cw:
+            self.cw.sendcw(self.process_macro(self.F5.toolTip()))
 
     def sendf6(self):
         """stub"""
         logger.debug("F6 Clicked")
+        if self.cw:
+            self.cw.sendcw(self.process_macro(self.F6.toolTip()))
 
     def sendf7(self):
         """stub"""
         logger.debug("F7 Clicked")
+        if self.cw:
+            self.cw.sendcw(self.process_macro(self.F7.toolTip()))
 
     def sendf8(self):
         """stub"""
         logger.debug("F8 Clicked")
+        if self.cw:
+            self.cw.sendcw(self.process_macro(self.F8.toolTip()))
 
     def sendf9(self):
         """stub"""
         logger.debug("F9 Clicked")
+        if self.cw:
+            self.cw.sendcw(self.process_macro(self.F9.toolTip()))
 
     def sendf10(self):
         """stub"""
         logger.debug("F10 Clicked")
+        if self.cw:
+            self.cw.sendcw(self.process_macro(self.F10.toolTip()))
 
     def sendf11(self):
         """stub"""
         logger.debug("F11 Clicked")
+        if self.cw:
+            self.cw.sendcw(self.process_macro(self.F11.toolTip()))
 
     def sendf12(self):
         """stub"""
         logger.debug("F12 Clicked")
+        if self.cw:
+            self.cw.sendcw(self.process_macro(self.F12.toolTip()))
 
     def run_sp_buttons_clicked(self):
         """Handle run/s&p mode"""
@@ -779,21 +884,28 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.setmode("CW")
                 if self.rig_control.online:
                     self.rig_control.set_mode("CW")
+                else:
+                    self.radio_state["mode"] = "CW"
+                    self.set_window_title()
                 self.clearinputs()
                 return
             if stripped_text == "RTTY":
                 self.setmode("RTTY")
                 if self.rig_control.online:
                     self.rig_control.set_mode("RTTY")
+                else:
+                    self.radio_state["mode"] = "RTTY"
+                    self.set_window_title()
                 self.clearinputs()
                 return
             if stripped_text == "SSB":
                 self.setmode("SSB")
-                if self.rig_control.online:
-                    if int(self.radio_state.get("vfoa", 0)) > 10000000:
-                        self.rig_control.set_mode("USB")
-                    else:
-                        self.rig_control.set_mode("LSB")
+                self.radio_state["mode"] = "SSB"
+                self.set_window_title()
+                if int(self.radio_state.get("vfoa", 0)) > 10000000:
+                    self.rig_control.set_mode("USB")
+                else:
+                    self.rig_control.set_mode("LSB")
                 self.clearinputs()
                 return
             if stripped_text == "OPON":
@@ -805,13 +917,19 @@ class MainWindow(QtWidgets.QMainWindow):
                 vfo = int(vfo * 1000)
                 band = getband(str(vfo))
                 self.set_band_indicator(band)
-                logger.debug("Set VFO - %s", vfo)
+                self.radio_state["vfoa"] = vfo
+                self.set_window_title()
                 self.clearinputs()
                 self.rig_control.set_vfo(vfo)
                 return
 
             self.check_callsign(text)
-            self.check_callsign2(text)
+            _thethread = threading.Thread(
+                target=self.check_callsign2,
+                args=(text,),
+                daemon=True,
+            )
+            _thethread.start()
             self.next_field.setFocus()
             return
         self.check_callsign(stripped_text)
@@ -837,6 +955,9 @@ class MainWindow(QtWidgets.QMainWindow):
                     f"Regional Hdg {heading}° LP {reciprocol(heading)}° / "
                     f"distance {int(kilometers*0.621371)}mi {kilometers}km"
                 )
+                self.contact["CountryPrefix"] = primary_pfx
+                self.contact["ZN"] = int(cq)
+                self.contact["Continent"] = continent
                 self.dx_entity.setText(
                     f"{primary_pfx}: {continent}/{entity} cq:{cq} itu:{itu}"
                 )
@@ -852,6 +973,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 logger.debug("The Response: %s\n", debug_response)
                 if response:
                     theirgrid = response.get("grid")
+                    self.contact["GridSquare"] = theirgrid
                     _theircountry = response.get("country")
                     if self.pref.get("gridsquare"):
                         heading = bearing(self.pref.get("gridsquare"), theirgrid)
@@ -906,6 +1028,8 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.setmode(mode)
             if mode == "LSB" or mode == "USB":
                 self.setmode("SSB")
+            if mode == "RTTY":
+                self.setmode("RTTY")
             self.radio_state["vfoa"] = vfo
             band = getband(str(vfo))
             self.set_band_indicator(band)
@@ -1018,7 +1142,6 @@ def run():
     sys.exit(app.exec())
 
 
-# logger = logging
 logger = logging.getLogger("__main__")
 handler = logging.StreamHandler()
 formatter = logging.Formatter(
@@ -1029,7 +1152,6 @@ handler.setFormatter(formatter)
 logger.addHandler(handler)
 
 if Path("./debug").exists():
-    # if True:
     logger.setLevel(logging.DEBUG)
     logger.debug("debugging on")
 else:
@@ -1037,7 +1159,6 @@ else:
     logger.warning("debugging off")
 
 app = QtWidgets.QApplication(sys.argv)
-# app.setStyle("Fusion")
 font_path = WORKING_PATH + "/data"
 families = load_fonts_from_dir(os.fspath(font_path))
 logger.info(families)

not1mm/data/logwindow.ui

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1189</width>
+    <height>366</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
+     <widget class="QTableWidget" name="generalLog">
+      <property name="font">
+       <font>
+        <family>JetBrains Mono</family>
+       </font>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <widget class="QTableWidget" name="focusedLog">
+      <property name="font">
+       <font>
+        <family>JetBrains Mono</family>
+       </font>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

not1mm/data/main.ui

@@ -48,6 +48,12 @@
        <layout class="QHBoxLayout" name="mainsection">
         <item>
          <widget class="QFrame" name="Band_Mode_Frame">
+          <property name="minimumSize">
+           <size>
+            <width>40</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="lineWidth">
            <number>0</number>
           </property>
@@ -309,6 +315,12 @@
           </item>
           <item>
            <layout class="QHBoxLayout" name="run_vs_sanp">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <property name="sizeConstraint">
+             <enum>QLayout::SetDefaultConstraint</enum>
+            </property>
             <item>
              <widget class="QLabel" name="leftdot">
               <property name="text">
@@ -345,11 +357,26 @@
             </item>
             <item>
              <widget class="QSpinBox" name="cw_speed">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="focusPolicy">
                <enum>Qt::NoFocus</enum>
               </property>
+              <property name="wrapping">
+               <bool>false</bool>
+              </property>
+              <property name="frame">
+               <bool>true</bool>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
               <property name="buttonSymbols">
-               <enum>QAbstractSpinBox::PlusMinus</enum>
+               <enum>QAbstractSpinBox::UpDownArrows</enum>
               </property>
               <property name="suffix">
                <string/>
@@ -357,6 +384,15 @@
               <property name="prefix">
                <string/>
               </property>
+              <property name="minimum">
+               <number>5</number>
+              </property>
+              <property name="maximum">
+               <number>40</number>
+              </property>
+              <property name="value">
+               <number>20</number>
+              </property>
              </widget>
             </item>
             <item>
@@ -756,6 +792,11 @@
    <property name="text">
     <string>About</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
   <action name="actionCommand_Buttons">
    <property name="checkable">
@@ -813,23 +854,43 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Dark Mode</string>
+    <string>Force Dark Mode</string>
+   </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
    </property>
   </action>
   <action name="actionPreferences">
    <property name="text">
     <string>Station Settings</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
   <action name="actionQRZ_Settings">
    <property name="text">
     <string>QRZ Settings</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
   <action name="actionConnection_Settings">
    <property name="text">
     <string>Connection Settings</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
  </widget>
  <resources/>

not1mm/lib/database.py

@@ -35,17 +35,17 @@ class DataBase:
             "QTH": "",
             "Name": "",
             "Comment": "",
-            "NR": "",
+            "NR": 0,
             "Sect": "",
             "Prec": "",
-            "CK": "",
-            "ZN": "",
-            "SentNr": "",
-            "Points": "",
-            "IsMultiplier1": "",
-            "IsMultiplier2": "",
-            "Power": "",
-            "Band": "",
+            "CK": 0,
+            "ZN": 0,
+            "SentNr": 0,
+            "Points": 0,
+            "IsMultiplier1": 0,
+            "IsMultiplier2": 0,
+            "Power": 0,
+            "Band": 0.0,
             "WPXPrefix": "",
             "Exchange1": "",
             "RadioNR": "",
@@ -60,11 +60,11 @@ class DataBase:
             "Continent": "",
             "RoverLocation": "",
             "RadioInterfaced": "",
-            "NetworkedCompNr": "",
+            "NetworkedCompNr": 1,
             "NetBiosName": "",
-            "IsOriginal": "",
+            "IsOriginal": 1,
             "ID": "",
-            "CLAIMEDQSO": "",
+            "CLAIMEDQSO": 1,
         }
         self.database = database
         self.create_dxlog_table()
@@ -326,7 +326,7 @@ class DataBase:
         with sqlite3.connect(self.database) as conn:
             conn.row_factory = self.row_factory
             cursor = conn.cursor()
-            cursor.execute("select * from dxlog order by ts ASC;")
+            cursor.execute("select * from dxlog order by TS ASC;")
             return cursor.fetchall()
 
     def fetch_all_contacts_desc(self) -> list:

not1mm/lib/ham_utility.py

@@ -1,13 +1,38 @@
 """A sad collection of maybe useful things."""
 
-import socket
 import logging
+import socket
+import re
 from datetime import datetime
-from math import sin, cos, radians, asin, sqrt, atan2, pi
+from math import asin, atan2, cos, pi, radians, sin, sqrt
 
 logger = logging.getLogger("__main__")
 
 
+def calculate_wpx_prefix(the_call: str) -> str:
+    """Calculate a WPX Prefix"""
+    if not the_call:
+        return ""
+    suffix_to_ignore = ["M", "MM", "P", "QRP", "A", "LH", "NLD"]
+    result = None
+    working_call = the_call.split("/")
+    if len(working_call) > 1:
+        result = min(working_call, key=len)
+        if not result.isnumeric():
+            if result not in suffix_to_ignore:
+                if any(chr.isdigit() for chr in result):
+                    return result
+                return result + "0"
+
+    working_call = max(working_call, key=len)
+    last_digit = re.match(".+([0-9])[^0-9]*$", working_call)
+    position = last_digit.start(1)
+    prefix = working_call[: position + 1]
+    if not result:
+        return prefix
+    return prefix[:-1] + result
+
+
 def gridtolatlon(maiden):
     """
     Converts a maidenhead gridsquare to a latitude longitude pair.
@@ -125,9 +150,10 @@ def update_time() -> None:
     Update local and UTC time on screen.
     """
     _now = datetime.now().isoformat(" ")[5:19].replace("-", "/")
-    _utcnow = datetime.utcnow().isoformat(" ")[5:19].replace("-", "/")
+    _utcnow = datetime.utcnow().isoformat(" ")[1:19]
     # self.localtime.setText(now)
     # self.utctime.setText(utcnow)
+    return _utcnow
 
 
 def haversine(lon1, lat1, lon2, lat2):

not1mm/lib/version.py

@@ -1,2 +1,2 @@
 """It's the version"""
-__version__ = "23.3.8"
+__version__ = "23.3.15"

not1mm/logwindow.py

@@ -0,0 +1,188 @@
+#!/usr/bin/env python3
+"""
+Display current log
+"""
+# pylint: disable=no-name-in-module, unused-import, no-member
+# QTableWidget
+# focusedLog, generalLog
+import os
+import pkgutil
+import sys
+
+# from json import dumps, loads
+from pathlib import Path
+
+from PyQt5 import QtCore, QtGui, QtWidgets, uic
+from PyQt5.QtCore import QDir, QItemSelectionModel
+from PyQt5.QtGui import QFontDatabase
+from watchdog.events import FileSystemEventHandler
+from watchdog.observers import Observer
+
+from not1mm.lib.database import DataBase
+
+loader = pkgutil.get_loader("not1mm")
+WORKING_PATH = os.path.dirname(loader.get_filename())
+
+if "XDG_DATA_HOME" in os.environ:
+    DATA_PATH = os.environ.get("XDG_DATA_HOME")
+else:
+    DATA_PATH = str(Path.home() / ".local" / "share")
+DATA_PATH += "/not1mm"
+
+if "XDG_CONFIG_HOME" in os.environ:
+    CONFIG_PATH = os.environ.get("XDG_CONFIG_HOME")
+else:
+    CONFIG_PATH = str(Path.home() / ".config")
+CONFIG_PATH += "/not1mm"
+
+
+class Watcher:
+    """Keep an eye out"""
+
+    def __init__(self, directory=".", handler=FileSystemEventHandler()):
+        self.observer = Observer()
+        self.handler = handler
+        self.directory = directory
+
+    def start(self):
+        """Starts the file watcher"""
+        self.observer.schedule(self.handler, self.directory, recursive=True)
+        self.observer.start()
+
+    def stop(self):
+        """Stops the file watcher"""
+        self.observer.stop()
+        self.observer.join()
+
+
+class Handler(FileSystemEventHandler):
+    """Make them accoutable"""
+
+    def on_modified(self, event):
+        if not event.is_directory:
+            window.get_log()
+
+
+class MainWindow(QtWidgets.QMainWindow):
+    """
+    The main window
+    """
+
+    dbname = DATA_PATH + "/ham.db"
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.database = DataBase(self.dbname, WORKING_PATH)
+        self.contact = self.database.empty_contact
+        data_path = WORKING_PATH + "/data/logwindow.ui"
+        uic.loadUi(data_path, self)
+        self.generalLog.setColumnCount(11)
+        # item = QtWidgets.QTableWidgetItem("")
+        self.generalLog.setHorizontalHeaderItem(0, QtWidgets.QTableWidgetItem("MM-DD"))
+        self.generalLog.setHorizontalHeaderItem(1, QtWidgets.QTableWidgetItem("HH:MM"))
+        self.generalLog.setHorizontalHeaderItem(2, QtWidgets.QTableWidgetItem("Call"))
+        self.generalLog.setHorizontalHeaderItem(3, QtWidgets.QTableWidgetItem("Freq"))
+        self.generalLog.setHorizontalHeaderItem(4, QtWidgets.QTableWidgetItem("Snt"))
+        self.generalLog.setHorizontalHeaderItem(5, QtWidgets.QTableWidgetItem("Rcv"))
+        self.generalLog.setHorizontalHeaderItem(6, QtWidgets.QTableWidgetItem("M1"))
+        self.generalLog.setHorizontalHeaderItem(7, QtWidgets.QTableWidgetItem("ZN"))
+        self.generalLog.setHorizontalHeaderItem(8, QtWidgets.QTableWidgetItem("M2"))
+        self.generalLog.setHorizontalHeaderItem(9, QtWidgets.QTableWidgetItem("PFX"))
+        self.generalLog.setHorizontalHeaderItem(10, QtWidgets.QTableWidgetItem("PTS"))
+        path = sys.argv[1] if len(sys.argv) > 1 else DATA_PATH + "/ham.db"
+        watcher = Watcher(path, Handler())
+        watcher.start()
+        self.get_log()
+
+    def get_log(self):
+        """Get Log, Show it."""
+        current_log = self.database.fetch_all_contacts_asc()
+        self.generalLog.setRowCount(0)
+        for log_item in current_log:
+            number_of_rows = self.generalLog.rowCount()
+            self.generalLog.insertRow(number_of_rows)
+            time_stamp = log_item.get("TS", "MM-DD HH:MM")
+            month_day, hour_min = time_stamp.split(" ")
+            _, month, day = month_day.split("-")
+            hour, minute, _ = hour_min.split(":")
+            month_day = f"{month}-{day}"
+            hour_min = f"{hour}:{minute}"
+
+            first_item = QtWidgets.QTableWidgetItem(month_day)
+            self.generalLog.setItem(number_of_rows, 0, first_item)
+            self.generalLog.setCurrentItem(first_item, QItemSelectionModel.NoUpdate)
+            self.generalLog.setItem(
+                number_of_rows, 1, QtWidgets.QTableWidgetItem(hour_min)
+            )
+
+            self.generalLog.setItem(
+                number_of_rows,
+                2,
+                QtWidgets.QTableWidgetItem(str(log_item.get("Call", ""))),
+            )
+            self.generalLog.setItem(
+                number_of_rows,
+                3,
+                QtWidgets.QTableWidgetItem(str(log_item.get("Freq", ""))),
+            )
+            self.generalLog.setItem(
+                number_of_rows,
+                4,
+                QtWidgets.QTableWidgetItem(str(log_item.get("SNT", ""))),
+            )
+            self.generalLog.setItem(
+                number_of_rows,
+                5,
+                QtWidgets.QTableWidgetItem(str(log_item.get("RCV", ""))),
+            )
+            self.generalLog.setItem(
+                number_of_rows,
+                6,
+                QtWidgets.QTableWidgetItem(str(log_item.get("IsMultiplier1", ""))),
+            )
+            self.generalLog.setItem(
+                number_of_rows,
+                7,
+                QtWidgets.QTableWidgetItem(str(log_item.get("ZN", ""))),
+            )
+            self.generalLog.setItem(
+                number_of_rows,
+                8,
+                QtWidgets.QTableWidgetItem(str(log_item.get("IsMultiplier2", ""))),
+            )
+            self.generalLog.setItem(
+                number_of_rows,
+                9,
+                QtWidgets.QTableWidgetItem(str(log_item.get("WPXPrefix", ""))),
+            )
+            self.generalLog.setItem(
+                number_of_rows,
+                10,
+                QtWidgets.QTableWidgetItem(str(log_item.get("Points", ""))),
+            )
+
+
+def load_fonts_from_dir(directory: str) -> set:
+    """
+    Well it loads fonts from a directory...
+    """
+    font_families = set()
+    for _fi in QDir(directory).entryInfoList(["*.ttf", "*.woff", "*.woff2"]):
+        _id = QFontDatabase.addApplicationFont(_fi.absoluteFilePath())
+        font_families |= set(QFontDatabase.applicationFontFamilies(_id))
+    return font_families
+
+
+def main():
+    """main entry"""
+    sys.exit(app.exec())
+
+
+if __name__ == "__main__":
+    app = QtWidgets.QApplication(sys.argv)
+    font_path = WORKING_PATH + "/data"
+    _families = load_fonts_from_dir(os.fspath(font_path))
+    window = MainWindow()
+    window.setWindowTitle("Log Display")
+    window.show()
+    main()

{not1mm-23.3.8.dist-info → not1mm-23.3.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.3.8
+Version: 23.3.15
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -20,6 +20,7 @@ Requires-Dist: PyQt5
 Requires-Dist: requests
 Requires-Dist: dicttoxml
 Requires-Dist: xmltodict
+Requires-Dist: watchdog
 
 # Not1MM
 
@@ -41,6 +42,7 @@ Requires-Dist: xmltodict
   - [cty.dat and QRZ lookups for distance and bearing](#ctydat-and-qrz-lookups-for-distance-and-bearing)
   - [Settings dialog](#settings-dialog)
   - [Other uses for the call field](#other-uses-for-the-call-field)
+  - [Log Display](#log-display)
 
 ## What and why is Not1MM
 
@@ -69,10 +71,13 @@ Feature complete.
 
 ## Changes of note
 
-- [23.3.8] Band/Frequency/Mode indicators. Direct frequency/mode entry in call field.
-- [23.3.7] Changed dxlog table column names.
-- [23.3.1] Add shift tab for field movement.
-- [23.2.23] Dialogs now do darkmode, Add settings dialog. App remembers window size and location.
+- [23-3-15] Added a rudimentary log view window.
+- [23-3-10] Started work on saving contacts to the DB. Added a claculate_wpx_prefix routine.
+- [23-3-9] Placed network call lookup in a thread. Display freq/mode for non CAT radios. Hooked up the CW macros to cwdaemon.
+- [23-3-8] Band/Frequency/Mode indicators. Direct frequency/mode entry in call field.
+- [23-3-7] Changed dxlog table column names.
+- [23-3-1] Add shift tab for field movement.
+- [23-2-23] Dialogs now do darkmode, Add settings dialog. App remembers window size and location.
 - [23-2-22] Added cty.dat file.
 - [23-2-21] Added edit macro dialog.
 - [23-2-20] Save view states. fixed debug messages. Started coding plugins/stubs.
@@ -149,3 +154,9 @@ You can fill. You can fill. Everyone look at your keys.
 - [OPON] Change the operator currently logging.
 
 **You must press the SPACE bar after entering any of the above.**
+
+## Log Display
+
+At this point the log display window doesn't do all that much except exist.
+
+![Log Display Window](https://github.com/mbridak/not1mm/raw/master/pic/logdisplay.png)

{not1mm-23.3.8.dist-info → not1mm-23.3.15.dist-info}/RECORD

@@ -1,5 +1,6 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=tJ5H9Tg-_81D2ZHoc68estUtG7deV-aUE8txzzh_jys,38753
+not1mm/__main__.py,sha256=CeZZAz4qQm39_azVP8gpqCpF-pr0ZzHvy7QgIVh7VIA,43790
+not1mm/logwindow.py,sha256=stL0majNjXnlqJfcsBWxh_O7uJqMTmB7SB2DSV_BgOo,6487
 not1mm/test.py,sha256=sCAd6OZQlakGm2gMbjhwZ17UyI-Y5L2CCqsYymx7IPQ,3906
 not1mm/data/Combinear.qss,sha256=SKqM0g8GvNXay1ovgtwCw3Egt0eLfN5P3iTREInC1eE,16590
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
@@ -13,7 +14,8 @@ not1mm/data/k6gte-not1mm.desktop,sha256=bSiSG7PzGygv0bBaF7Nf48PApVyrobSBVNk7j7wR
 not1mm/data/k6gte.not1mm-128.png,sha256=vWqt3Cgsaguj-BBiIoSJApzzhisPxldM8HZQbZ05z6Y,4010
 not1mm/data/k6gte.not1mm-32.png,sha256=yucSwzlmqv3NegdWUvPvZzSgP7G22Ky3se8TWRXvzfI,1108
 not1mm/data/k6gte.not1mm-64.png,sha256=1KQvk0WBckUds79BvIFUt-KdTwQKKvTz6hiJu8MiT68,2152
-not1mm/data/main.ui,sha256=PVPGU8FhmPNwYb9zKe2V5PyC95MpRej1RphCQUtzDDQ,26359
+not1mm/data/logwindow.ui,sha256=Ujeqppqm-U53CRKzkesiQ3kkCooYIv-uixCYEedvs7A,971
+not1mm/data/main.ui,sha256=YelX04sNlp5Wu_Hq06fr5Ezscj4kjpLX5GIoKsHpW4E,28116
 not1mm/data/opon.ui,sha256=6r9_6ORGfNqwOnpzQjaJ1tWP_81amuXqLYlx1hHgdME,2018
 not1mm/data/reddot.png,sha256=M33jEMoU8W4rQ4_MVyzzKxDPDte1ypKBch5VnUMNLKE,565
 not1mm/data/settings.ui,sha256=egXLgKAKKwwlqE8t0D8aXaP-4mRAV3EAcuSTnAeVwFc,12459
@@ -21,15 +23,15 @@ not1mm/data/use_qrz_dialog.ui,sha256=sXV1K1tsmYEF7K8nnV_t_UR3k1PzQp43CgvX4KSnR94
 not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/lib/cat_interface.py,sha256=mYkDV80gMDuchkEMKyf7geroplGJ1Ne8cEBoH9nrq3o,10311
 not1mm/lib/cwinterface.py,sha256=i9VCxORHXYOK44Rcco7deHXdmTyrI1lA_pKm-kpdxtE,1748
-not1mm/lib/database.py,sha256=Yke4S78Vc8xPejzPVj0o0jOomU9xomTLAgOKu9Bf4jU,13987
+not1mm/lib/database.py,sha256=fIJHL0FaqxgCNqfpP6EL2l7_XSToU1TYCppfEZ4WgQQ,13977
 not1mm/lib/edit_macro.py,sha256=lyToZb1nmcONNFh6W35NzYHLU48gbAs2_OsnuRQGHck,559
 not1mm/lib/edit_opon.py,sha256=GqAOJMiC265_4YRVbkT1PflBuCa4HiCNfRhq8-J6ZVY,363
 not1mm/lib/edit_settings.py,sha256=lFTUDB-BjuV57QPMn8EqWjks-uAB1xripV4FBduQIDA,727
-not1mm/lib/ham_utility.py,sha256=_ZbzCguJkBlqyXULBwcTO6hp8yR5FFbsdMIEpI2y0K0,6571
+not1mm/lib/ham_utility.py,sha256=PEF9ZU_HI3HeDsoIfxD6sx-Qdb3SYKyqLPILYdq3bn8,7367
 not1mm/lib/lookup.py,sha256=4OiWZWc3smcB0lqLk4WTs1U3i2k8yZFsX_1OoCGlaWc,13916
 not1mm/lib/n1mm.py,sha256=zfz0PU-iEz9dd6-wnIHXvPAmmxSYJ2bzk_MgnsIX3Sw,4461
 not1mm/lib/qrz_dialog.py,sha256=fLFBkvQ9cuIqKk0-1yl5OFuQ40n904fNi_Vt23je99E,350
-not1mm/lib/version.py,sha256=QbTy-5mSYnc1yFhyYDrL0nHoxaQotCRaR9MI-bbL7qI,46
+not1mm/lib/version.py,sha256=A6ywWYCqMVtSmnrAAoGWfNhZe3G67p542uCjfZ-HLz0,47
 not1mm/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/plugins/arrl_dx_cw.py,sha256=VRP-H65SgEaCff6efF85DzU5KMoECkLQad4DraNgUec,1382
 not1mm/plugins/arrl_dx_phone.py,sha256=9uLZWogzTfLm0SjmcG149dTG_GjDbbVhdInl4Uz7Fck,1385
@@ -41,9 +43,9 @@ not1mm/plugins/cqww_dx_cw.py,sha256=rr0vqgIqQ9kErxL8pcVDQh60lkIad5f049270_cF2FQ,
 not1mm/plugins/cqww_dx_ssb.py,sha256=ejT_V5WSYbtaIBqSkSSAEmIVECA0g9Z2nMQ0d3xKpXw,1392
 not1mm/plugins/general_logging.py,sha256=41iuEN8mnLjIIK4SBnwG0RGp2Or9ue-x-j-wZI8MYGU,1630
 not1mm/plugins/winter_field_day.py,sha256=L7co3YEoKt-jaAFJfGw_Y3-uK-G6eQNsOQSCEkT5U24,1631
-not1mm-23.3.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-23.3.8.dist-info/METADATA,sha256=yqoZMc4fo9dPnDHv5uLaRQ_4lN3CboUHMjOjz8cdaAQ,6402
-not1mm-23.3.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-not1mm-23.3.8.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-23.3.8.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-23.3.8.dist-info/RECORD,,
+not1mm-23.3.15.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-23.3.15.dist-info/METADATA,sha256=lBNy3ePPu7B_OxRl5KanH-JJzaM4b0h4-ZyhDrGpSzU,6908
+not1mm-23.3.15.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+not1mm-23.3.15.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-23.3.15.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-23.3.15.dist-info/RECORD,,

{not1mm-23.3.8.dist-info → not1mm-23.3.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any