not1mm 23.3.23__py3-none-any.whl → 23.3.24.1__py3-none-any.whl

not1mm/__main__.py

@@ -8,13 +8,12 @@ import importlib
 import logging
 import os
 import pkgutil
-
-# import re
+import re
 import socket
+import subprocess
 
 # import sqlite3
 import sys
-import subprocess
 import threading
 import uuid
 from datetime import datetime
@@ -23,16 +22,10 @@ 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,  # pylint: disable=no-name-in-module
-    QRect,
-    QSize,
-    Qt,
-)
+from PyQt5.QtCore import QPoint  # pylint: disable=no-name-in-module
+from PyQt5.QtCore import QDir, QRect, QSize, Qt
 from PyQt5.QtGui import QFontDatabase  # pylint: disable=no-name-in-module
 
 from not1mm.lib.cat_interface import CAT
@@ -47,8 +40,8 @@ from not1mm.lib.ham_utility import (
     calculate_wpx_prefix,
     distance,
     distance_with_latlon,
-    getband,
     get_logged_band,
+    getband,
     reciprocol,
 )
 from not1mm.lib.lookup import QRZlookup
@@ -191,19 +184,20 @@ class MainWindow(QtWidgets.QMainWindow):
     multicast_group = None
     multicast_port = None
     interface_ip = None
+    rig_control = None
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         logger.info("MainWindow: __init__")
         self.database = DataBase(self.dbname, WORKING_PATH)
-        if not check_process("logwindow.py"):
-            _ = subprocess.Popen([sys.executable, WORKING_PATH + "/logwindow.py"])
+        self.launch_log_window()
         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)
         self.n1mm = N1MM()
         self.next_field = self.other_2
+        self.dupe_indicator.hide()
         self.cw_speed.valueChanged.connect(self.cwspeed_spinbox_changed)
         self.actionCW_Macros.triggered.connect(self.cw_macros_state_changed)
         self.actionCommand_Buttons.triggered.connect(self.command_buttons_state_change)
@@ -212,6 +206,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.actionPreferences.triggered.connect(self.preference_selected)
         self.actionQRZ_Settings.triggered.connect(self.qrz_preference_selected)
         self.actionGenerate_Cabrillo.triggered.connect(self.generate_cabrillo)
+        self.actionLog_Window.triggered.connect(self.launch_log_window)
         self.radioButton_run.clicked.connect(self.run_sp_buttons_clicked)
         self.radioButton_sp.clicked.connect(self.run_sp_buttons_clicked)
         self.score.setText("0")
@@ -270,7 +265,19 @@ class MainWindow(QtWidgets.QMainWindow):
         self.current_op = self.pref.get("callsign", "")
         self.read_cw_macros()
         self.clearinputs()
-        self.rig_control = CAT("rigctld", "localhost", 4532)
+
+        self.rig_control = None
+        local_flrig = self.check_process("flrig")
+        local_rigctld = self.check_process("rigctld")
+        if local_flrig:
+            logger.debug("Found flrig")
+            address, port = "localhost", "12345"
+            self.rig_control = CAT("flrig", address, int(port))
+        if local_rigctld:
+            logger.debug("Found rigctld")
+            address, port = "localhost", "4532"
+            self.rig_control = CAT("rigctld", address, int(port))
+
         self.band_indicators = {
             "160": self.band_160,
             "80": self.band_80,
@@ -280,6 +287,19 @@ class MainWindow(QtWidgets.QMainWindow):
             "10": self.band_10,
         }
 
+    @staticmethod
+    def check_process(name: str) -> bool:
+        """checks to see if program of name is in the active process list"""
+        for proc in psutil.process_iter():
+            if bool(re.match(name, proc.name().lower())):
+                return True
+        return False
+
+    def launch_log_window(self):
+        """launch the Log Window"""
+        if not check_process("logwindow.py"):
+            _ = subprocess.Popen([sys.executable, WORKING_PATH + "/logwindow.py"])
+
     def clear_band_indicators(self):
         """Clear the indicators"""
         self.band_160.setFrameShape(QtWidgets.QFrame.NoFrame)
@@ -463,6 +483,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def clearinputs(self):
         """Clears the text input fields and sets focus to callsign field."""
+        self.dupe_indicator.hide()
         self.contact = self.database.empty_contact
         self.heading_distance.setText("No Heading")
         self.dx_entity.setText("dxentity")
@@ -507,13 +528,21 @@ class MainWindow(QtWidgets.QMainWindow):
         self.contact["ContestName"] = self.contest.cabrillo_name
         self.contact["StationPrefix"] = self.pref.get("callsign", "")
         self.contact["WPXPrefix"] = calculate_wpx_prefix(self.callsign.text())
-        # 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["IsRunQSO"] = self.radioButton_run.isChecked()
+        self.contact["Operator"] = self.current_op
+        self.contact["NetBiosName"] = socket.gethostname()
+        self.contact["IsOriginal"] = 1
+        self.contact["ID"] = uuid.uuid4().hex
+        self.contest.set_contact_vars(self)
+        self.contact["Points"] = self.contest.points(self)
+        debug_output = f"{self.contact}"
+        logger.debug(debug_output)
+        self.database.log_contact(self.contact)
+        self.n1mm.send_contact_info()
+        self.clearinputs()
+        cmd = {}
+        cmd["cmd"] = "UPDATELOG"
+        self.multicast_interface.send_as_json(cmd)
         # self.contact["ContestName"] = self.contest.name
         # self.contact["SNT"] = self.sent.text()
         # self.contact["RCV"] = self.receive.text()
@@ -539,29 +568,14 @@ class MainWindow(QtWidgets.QMainWindow):
         # self.contact["ContestNR"]
         # self.contact["isMultiplier3"]
         # self.contact["MiscText"]
-        self.contact["IsRunQSO"] = self.radioButton_run.isChecked()
         # 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"] = 1
-        self.contact["ID"] = uuid.uuid4().hex
         # self.contact["CLAIMEDQSO"]
-        self.contest.set_contact_vars(self)
-        self.contact["Points"] = self.contest.points(self)
-        debug_output = f"{self.contact}"
-        logger.debug(debug_output)
-        self.database.log_contact(self.contact)
-        self.n1mm.send_contact_info()
-        self.clearinputs()
-        cmd = {}
-        cmd["cmd"] = "UPDATELOG"
-        self.multicast_interface.send_as_json(cmd)
 
     def qrz_preference_selected(self):
         """Show QRZ settings dialog"""
@@ -975,30 +989,32 @@ class MainWindow(QtWidgets.QMainWindow):
         if text[-1:] == " ":
             if stripped_text == "CW":
                 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.radio_state["mode"] = "CW"
+                if self.rig_control:
+                    if self.rig_control.online:
+                        self.rig_control.set_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()
+                if self.rig_control:
+                    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")
-                self.radio_state["mode"] = "SSB"
-                self.set_window_title()
                 if int(self.radio_state.get("vfoa", 0)) > 10000000:
-                    self.rig_control.set_mode("USB")
+                    self.radio_state["mode"] = "USB"
                 else:
-                    self.rig_control.set_mode("LSB")
+                    self.radio_state["mode"] = "LSB"
+                self.set_window_title()
+                if self.rig_control:
+                    self.rig_control.set_mode(self.radio_state.get("mode"))
                 self.clearinputs()
                 return
             if stripped_text == "OPON":
@@ -1010,13 +1026,19 @@ class MainWindow(QtWidgets.QMainWindow):
                 vfo = int(vfo * 1000)
                 band = getband(str(vfo))
                 self.set_band_indicator(band)
+                # self.contact["Band"] = get_logged_band(str(self.radio_state.get("vfoa", 0.0)))
                 self.radio_state["vfoa"] = vfo
                 self.set_window_title()
                 self.clearinputs()
-                self.rig_control.set_vfo(vfo)
+                if self.rig_control:
+                    self.rig_control.set_vfo(vfo)
                 return
 
-            self.check_callsign(text)
+            self.check_callsign(stripped_text)
+            if self.check_dupe(stripped_text):
+                self.dupe_indicator.show()
+            else:
+                self.dupe_indicator.hide()
             _thethread = threading.Thread(
                 target=self.check_callsign2,
                 args=(text,),
@@ -1063,6 +1085,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def check_callsign2(self, callsign):
         """Check call once entered"""
+        callsign = callsign.strip()
         debug_lookup = f"{self.look_up}"
         logger.debug("%s, %s", callsign, debug_lookup)
         if hasattr(self.look_up, "session"):
@@ -1085,6 +1108,17 @@ class MainWindow(QtWidgets.QMainWindow):
                 # else:
                 # self.heading_distance.setText("Lookup failed.")
 
+    def check_dupe(self, call: str) -> bool:
+        """Checks if a callsign is a dupe on current band/mode."""
+        band = float(get_logged_band(str(self.radio_state.get("vfoa", 0.0))))
+        mode = self.radio_state.get("mode", "")
+        debugline = f"Call: {call} Band: {band} Mode: {mode}"
+        logger.debug("%s", debugline)
+        result = self.database.check_dupe_on_band_mode(call, band, mode)
+        debugline = f"{result}"
+        logger.debug("%s", debugline)
+        return result.get("isdupe", False)
+
     def setmode(self, mode: str) -> None:
         """stub for when the mode changes."""
         if mode == "CW":
@@ -1120,22 +1154,23 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def poll_radio(self):
         """stub"""
-        if self.rig_control.online:
-            vfo = self.rig_control.get_vfo()
-            mode = self.rig_control.get_mode()
-            if mode == "CW":
-                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.contact["Band"] = get_logged_band(str(vfo))
-            self.set_band_indicator(band)
-            self.radio_state["mode"] = mode
-            # logger.debug("VFO: %s  MODE: %s", vfo, mode)
-            self.set_window_title()
+        if self.rig_control:
+            if self.rig_control.online:
+                vfo = self.rig_control.get_vfo()
+                mode = self.rig_control.get_mode()
+                if mode == "CW":
+                    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.contact["Band"] = get_logged_band(str(vfo))
+                self.set_band_indicator(band)
+                self.radio_state["mode"] = mode
+                # logger.debug("VFO: %s  MODE: %s", vfo, mode)
+                self.set_window_title()
 
     def read_cw_macros(self) -> None:
         """

not1mm/data/logwindow.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>732</width>
+    <width>825</width>
     <height>392</height>
    </rect>
   </property>

not1mm/data/main.ui

@@ -395,6 +395,26 @@
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QLabel" name="dupe_indicator">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="font">
+               <font>
+                <family>JetBrains Mono</family>
+                <pointsize>20</pointsize>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">color: rgb(246, 10, 10);</string>
+              </property>
+              <property name="text">
+               <string>Dupe</string>
+              </property>
+             </widget>
+            </item>
             <item>
              <spacer name="horizontalSpacer_3">
               <property name="orientation">
@@ -785,8 +805,15 @@
     <addaction name="actionMode_and_Bands"/>
     <addaction name="actionDark_Mode"/>
    </widget>
+   <widget class="QMenu" name="menuWindow">
+    <property name="title">
+     <string>Window</string>
+    </property>
+    <addaction name="actionLog_Window"/>
+   </widget>
    <addaction name="menuFile"/>
    <addaction name="menuView"/>
+   <addaction name="menuWindow"/>
    <addaction name="menuHelp"/>
   </widget>
   <action name="actionAbout">
@@ -898,6 +925,11 @@
     <string>Generate Cabrillo</string>
    </property>
   </action>
+  <action name="actionLog_Window">
+   <property name="text">
+    <string>Log Window</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

not1mm/data/settings.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>876</width>
-    <height>636</height>
+    <height>638</height>
    </rect>
   </property>
   <property name="font">
@@ -299,7 +299,7 @@
       </palette>
      </property>
      <property name="placeholderText">
-      <string>USA</string>
+      <string>United States</string>
      </property>
     </widget>
    </item>
@@ -343,7 +343,7 @@
       </palette>
      </property>
      <property name="placeholderText">
-      <string>Dm13at</string>
+      <string>DM13at</string>
      </property>
     </widget>
    </item>

not1mm/lib/cat_interface.py

@@ -60,6 +60,7 @@ class CAT:
             target = f"http://{host}:{port}"
             logger.debug("%s", target)
             self.server = xmlrpc.client.ServerProxy(target)
+            self.online = True
         if self.interface == "rigctld":
             self.__initialize_rigctrld()
 

not1mm/lib/database.py

@@ -357,6 +357,19 @@ class DataBase:
             )
             return cursor.fetchone()
 
+    def check_dupe_on_band_mode(self, call, band, mode) -> dict:
+        """Checks if a call is dupe on band/mode"""
+        with sqlite3.connect(self.database) as conn:
+            conn.row_factory = self.row_factory
+            cursor = conn.cursor()
+            print(
+                f"select count(*) as isdupe from dxlog where Call = '{call}' and Mode = '{mode}' and Band = '{band}';"
+            )
+            cursor.execute(
+                f"select count(*) as isdupe from dxlog where Call = '{call}' and Mode = '{mode}' and Band = '{band}';"
+            )
+            return cursor.fetchone()
+
     def fetch_points(self) -> dict:
         """return points"""
         with sqlite3.connect(self.database) as conn:

not1mm/lib/version.py

@@ -1,2 +1,2 @@
 """It's the version"""
-__version__ = "23.3.23"
+__version__ = "23.3.24.1"

not1mm/logwindow.py

@@ -69,8 +69,8 @@ class MainWindow(QtWidgets.QMainWindow):
         self.contact = self.database.empty_contact
         data_path = WORKING_PATH + "/data/logwindow.ui"
         uic.loadUi(data_path, self)
-        self.generalLog.setColumnCount(11)
-        self.focusedLog.setColumnCount(11)
+        self.generalLog.setColumnCount(14)
+        self.focusedLog.setColumnCount(14)
         icon_path = WORKING_PATH + "/data/"
         self.checkmark = QtGui.QPixmap(icon_path + "check.png")
         self.checkicon = QtGui.QIcon()
@@ -85,23 +85,30 @@ class MainWindow(QtWidgets.QMainWindow):
         self.generalLog.setHorizontalHeaderItem(2, QtWidgets.QTableWidgetItem("Freq"))
         self.generalLog.setHorizontalHeaderItem(3, QtWidgets.QTableWidgetItem("Snt"))
         self.generalLog.setHorizontalHeaderItem(4, QtWidgets.QTableWidgetItem("Rcv"))
-        self.generalLog.setHorizontalHeaderItem(5, QtWidgets.QTableWidgetItem("M1"))
-        self.generalLog.setHorizontalHeaderItem(6, QtWidgets.QTableWidgetItem("ZN"))
-        self.generalLog.setHorizontalHeaderItem(7, QtWidgets.QTableWidgetItem("M2"))
-        self.generalLog.setHorizontalHeaderItem(8, QtWidgets.QTableWidgetItem("PFX"))
-        self.generalLog.setHorizontalHeaderItem(9, QtWidgets.QTableWidgetItem("PTS"))
-        self.generalLog.setHorizontalHeaderItem(10, QtWidgets.QTableWidgetItem("UUID"))
+        self.generalLog.setHorizontalHeaderItem(5, QtWidgets.QTableWidgetItem("SentNr"))
+        self.generalLog.setHorizontalHeaderItem(6, QtWidgets.QTableWidgetItem("RcvNr"))
+        self.generalLog.setHorizontalHeaderItem(7, QtWidgets.QTableWidgetItem("WPX"))
+        self.generalLog.setHorizontalHeaderItem(8, QtWidgets.QTableWidgetItem("M1"))
+        self.generalLog.setHorizontalHeaderItem(9, QtWidgets.QTableWidgetItem("ZN"))
+        self.generalLog.setHorizontalHeaderItem(10, QtWidgets.QTableWidgetItem("M2"))
+        self.generalLog.setHorizontalHeaderItem(11, QtWidgets.QTableWidgetItem("PFX"))
+        self.generalLog.setHorizontalHeaderItem(12, QtWidgets.QTableWidgetItem("PTS"))
+        self.generalLog.setHorizontalHeaderItem(13, QtWidgets.QTableWidgetItem("UUID"))
         self.generalLog.setColumnWidth(0, 200)
         self.generalLog.setColumnWidth(3, 50)
         self.generalLog.setColumnWidth(4, 50)
-        self.generalLog.setColumnWidth(5, 25)
-        self.generalLog.setColumnWidth(6, 50)
-        self.generalLog.setColumnWidth(7, 25)
+        self.generalLog.setColumnWidth(5, 75)
+        self.generalLog.setColumnWidth(6, 75)
+        self.generalLog.setColumnWidth(7, 50)
         self.generalLog.setColumnWidth(8, 50)
         self.generalLog.setColumnWidth(9, 50)
+        self.generalLog.setColumnWidth(12, 50)
         self.generalLog.cellDoubleClicked.connect(self.double_clicked)
         self.generalLog.cellChanged.connect(self.cell_changed)
+        self.generalLog.setColumnHidden(9, True)
         self.generalLog.setColumnHidden(10, True)
+        self.generalLog.setColumnHidden(11, True)
+        self.generalLog.setColumnHidden(13, True)
 
         self.focusedLog.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.focusedLog.customContextMenuRequested.connect(
@@ -115,23 +122,30 @@ class MainWindow(QtWidgets.QMainWindow):
         self.focusedLog.setHorizontalHeaderItem(2, QtWidgets.QTableWidgetItem("Freq"))
         self.focusedLog.setHorizontalHeaderItem(3, QtWidgets.QTableWidgetItem("Snt"))
         self.focusedLog.setHorizontalHeaderItem(4, QtWidgets.QTableWidgetItem("Rcv"))
-        self.focusedLog.setHorizontalHeaderItem(5, QtWidgets.QTableWidgetItem("M1"))
-        self.focusedLog.setHorizontalHeaderItem(6, QtWidgets.QTableWidgetItem("ZN"))
-        self.focusedLog.setHorizontalHeaderItem(7, QtWidgets.QTableWidgetItem("M2"))
-        self.focusedLog.setHorizontalHeaderItem(8, QtWidgets.QTableWidgetItem("PFX"))
-        self.focusedLog.setHorizontalHeaderItem(9, QtWidgets.QTableWidgetItem("PTS"))
-        self.focusedLog.setHorizontalHeaderItem(10, QtWidgets.QTableWidgetItem("UUID"))
+        self.focusedLog.setHorizontalHeaderItem(5, QtWidgets.QTableWidgetItem("SentNr"))
+        self.focusedLog.setHorizontalHeaderItem(6, QtWidgets.QTableWidgetItem("RcvNr"))
+        self.focusedLog.setHorizontalHeaderItem(7, QtWidgets.QTableWidgetItem("WPX"))
+        self.focusedLog.setHorizontalHeaderItem(8, QtWidgets.QTableWidgetItem("M1"))
+        self.focusedLog.setHorizontalHeaderItem(9, QtWidgets.QTableWidgetItem("ZN"))
+        self.focusedLog.setHorizontalHeaderItem(10, QtWidgets.QTableWidgetItem("M2"))
+        self.focusedLog.setHorizontalHeaderItem(11, QtWidgets.QTableWidgetItem("PFX"))
+        self.focusedLog.setHorizontalHeaderItem(12, QtWidgets.QTableWidgetItem("PTS"))
+        self.focusedLog.setHorizontalHeaderItem(13, QtWidgets.QTableWidgetItem("UUID"))
         self.focusedLog.setColumnWidth(0, 200)
         self.focusedLog.setColumnWidth(3, 50)
         self.focusedLog.setColumnWidth(4, 50)
-        self.focusedLog.setColumnWidth(5, 25)
-        self.focusedLog.setColumnWidth(6, 50)
-        self.focusedLog.setColumnWidth(7, 25)
+        self.focusedLog.setColumnWidth(5, 75)
+        self.focusedLog.setColumnWidth(6, 75)
+        self.focusedLog.setColumnWidth(7, 50)
         self.focusedLog.setColumnWidth(8, 50)
         self.focusedLog.setColumnWidth(9, 50)
+        self.focusedLog.setColumnWidth(12, 50)
         # self.focusedLog.cellDoubleClicked.connect(self.double_clicked)
         # self.focusedLog.cellChanged.connect(self.cell_changed)
+        self.focusedLog.setColumnHidden(9, True)
         self.focusedLog.setColumnHidden(10, True)
+        self.focusedLog.setColumnHidden(11, True)
+        self.focusedLog.setColumnHidden(13, True)
         self.get_log()
         self.multicast_interface = Multicast(
             MULTICAST_GROUP, MULTICAST_PORT, INTERFACE_IP
@@ -166,10 +180,15 @@ class MainWindow(QtWidgets.QMainWindow):
             "Freq": self.generalLog.item(row, 2).text(),
             "SNT": self.generalLog.item(row, 3).text(),
             "RCV": self.generalLog.item(row, 4).text(),
-            "ZN": self.generalLog.item(row, 6).text(),
-            "WPXPrefix": self.generalLog.item(row, 8).text().upper(),
-            "Points": self.generalLog.item(row, 9).text(),
-            "ID": self.generalLog.item(row, 10).text(),
+            "SentNr": self.generalLog.item(row, 5).text(),
+            "NR": self.generalLog.item(row, 6).text(),
+            "WPXPrefix": self.generalLog.item(row, 7).text(),
+            "IsMultiplier1": self.generalLog.item(row, 8).text(),
+            "ZN": self.generalLog.item(row, 9).text(),
+            "IsMultiplier2": self.generalLog.item(row, 10).text().upper(),
+            "CountryPrefix": self.generalLog.item(row, 11).text(),
+            "Points": self.generalLog.item(row, 12).text(),
+            "ID": self.generalLog.item(row, 13).text(),
         }
         self.database.change_contact(db_record)
         self.get_log()
@@ -182,19 +201,19 @@ class MainWindow(QtWidgets.QMainWindow):
         """Show edit contact dialog"""
         logger.debug("Opening EditContact dialog")
         item = self.focusedLog.itemAt(clicked_cell)
-        uuid = self.focusedLog.item(item.row(), 10).text()
+        uuid = self.focusedLog.item(item.row(), 13).text()
         self.edit_contact(uuid)
 
     def edit_contact_selected(self, clicked_cell):
         """Show edit contact dialog"""
         logger.debug("Opening EditContact dialog")
         item = self.generalLog.itemAt(clicked_cell)
-        uuid = self.generalLog.item(item.row(), 10).text()
+        uuid = self.generalLog.item(item.row(), 13).text()
         self.edit_contact(uuid)
 
     def edit_contact(self, uuid):
         """Show edit contact dialog"""
-
+        logger.debug("Edit: %s", uuid)
         self.edit_contact_dialog = EditContact(WORKING_PATH)
         self.edit_contact_dialog.accepted.connect(self.save_edited_contact)
         self.contact = self.database.fetch_contact_by_uuid(uuid)
@@ -337,17 +356,32 @@ class MainWindow(QtWidgets.QMainWindow):
                 4,
                 QtWidgets.QTableWidgetItem(str(log_item.get("RCV", ""))),
             )
+            self.generalLog.setItem(
+                number_of_rows,
+                5,
+                QtWidgets.QTableWidgetItem(str(log_item.get("SentNr", ""))),
+            )
+            self.generalLog.setItem(
+                number_of_rows,
+                6,
+                QtWidgets.QTableWidgetItem(str(log_item.get("NR", ""))),
+            )
+            self.generalLog.setItem(
+                number_of_rows,
+                7,
+                QtWidgets.QTableWidgetItem(str(log_item.get("WPXPrefix", ""))),
+            )
             item = QtWidgets.QTableWidgetItem()
             if log_item.get("IsMultiplier1", False):
                 item.setIcon(self.checkicon)
             self.generalLog.setItem(
                 number_of_rows,
-                5,
+                8,
                 item,
             )
             self.generalLog.setItem(
                 number_of_rows,
-                6,
+                9,
                 QtWidgets.QTableWidgetItem(str(log_item.get("ZN", ""))),
             )
             item = QtWidgets.QTableWidgetItem()
@@ -355,22 +389,22 @@ class MainWindow(QtWidgets.QMainWindow):
                 item.setIcon(self.checkicon)
             self.generalLog.setItem(
                 number_of_rows,
-                7,
+                10,
                 item,
             )
             self.generalLog.setItem(
                 number_of_rows,
-                8,
-                QtWidgets.QTableWidgetItem(str(log_item.get("WPXPrefix", ""))),
+                11,
+                QtWidgets.QTableWidgetItem(str(log_item.get("CountryPrefix", ""))),
             )
             self.generalLog.setItem(
                 number_of_rows,
-                9,
+                12,
                 QtWidgets.QTableWidgetItem(str(log_item.get("Points", ""))),
             )
             self.generalLog.setItem(
                 number_of_rows,
-                10,
+                13,
                 QtWidgets.QTableWidgetItem(str(log_item.get("ID", ""))),
             )
         self.table_loading = False
@@ -437,17 +471,34 @@ class MainWindow(QtWidgets.QMainWindow):
                 4,
                 QtWidgets.QTableWidgetItem(str(log_item.get("RCV", ""))),
             )
+
+            self.focusedLog.setItem(
+                number_of_rows,
+                5,
+                QtWidgets.QTableWidgetItem(str(log_item.get("SentNr", ""))),
+            )
+            self.focusedLog.setItem(
+                number_of_rows,
+                6,
+                QtWidgets.QTableWidgetItem(str(log_item.get("NR", ""))),
+            )
+            self.focusedLog.setItem(
+                number_of_rows,
+                7,
+                QtWidgets.QTableWidgetItem(str(log_item.get("WPXPrefix", ""))),
+            )
+
             item = QtWidgets.QTableWidgetItem()
             if log_item.get("IsMultiplier1", False):
                 item.setIcon(self.checkicon)
             self.focusedLog.setItem(
                 number_of_rows,
-                5,
+                8,
                 item,
             )
             self.focusedLog.setItem(
                 number_of_rows,
-                6,
+                9,
                 QtWidgets.QTableWidgetItem(str(log_item.get("ZN", ""))),
             )
             item = QtWidgets.QTableWidgetItem()
@@ -455,22 +506,22 @@ class MainWindow(QtWidgets.QMainWindow):
                 item.setIcon(self.checkicon)
             self.focusedLog.setItem(
                 number_of_rows,
-                7,
+                10,
                 item,
             )
             self.focusedLog.setItem(
                 number_of_rows,
-                8,
-                QtWidgets.QTableWidgetItem(str(log_item.get("WPXPrefix", ""))),
+                11,
+                QtWidgets.QTableWidgetItem(str(log_item.get("CountryPrefix", ""))),
             )
             self.focusedLog.setItem(
                 number_of_rows,
-                9,
+                12,
                 QtWidgets.QTableWidgetItem(str(log_item.get("Points", ""))),
             )
             self.focusedLog.setItem(
                 number_of_rows,
-                10,
+                13,
                 QtWidgets.QTableWidgetItem(str(log_item.get("ID", ""))),
             )
 

{not1mm-23.3.23.dist-info → not1mm-23.3.24.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.3.23
+Version: 23.3.24.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -43,6 +43,9 @@ Requires-Dist: xmltodict
   - [Other uses for the call field](#other-uses-for-the-call-field)
   - [Log Display](#log-display)
   - [Editing a contact](#editing-a-contact)
+  - [Cabrillo](#cabrillo)
+  - [Dupe checking](#dupe-checking)
+  - [CAT](#cat)
 
 ## What and why is Not1MM
 
@@ -71,6 +74,7 @@ Feature complete.
 
 ## Changes of note
 
+- [23-3-24] Added dupe checking. Added CAT check for flrig or rigctld. Added online flag for flrig.
 - [23-3-23] Added most of Cabrillo generation. Plan to test it this weekends CQ WPX SSB.
 - [23-3-22] Add prefill of serial nr. set OP call on startup. Set IsMultiplier1 new unique wpx. Add OP and contest name to window title. and stuff.
 - [23-3-21] Worked on CQ WPX SSB plugin.
@@ -177,3 +181,25 @@ You can double click a cell in the log window and edit its contents.
 You can also Right-Click on a cell to bring up the edit dialog.
 
 ![Log Display Window](https://github.com/mbridak/not1mm/raw/master/pic/edit_dialog.png)
+
+## Cabrillo
+
+Kinda working in a forced way. Need to generalize it for multiple contests. Click on `File` then `Generate Cabrillo`
+
+There's a few more fields I have to code in. But it's enough for me to edit and submit.
+
+The file will be placed in your home directory. The name will be in the format of:
+
+`StationCall`_`ContestName`.log
+
+So for me it would be:
+
+K6GTE_CQ-WPX-SSB.log
+
+## Dupe checking
+
+Added dupe checking. Big Red 'Dupe' will appear if it's a dupe...
+
+## CAT
+
+Added rudimentary check for running instance of flrig or rigctld. It will connect to whichever it finds first.

{not1mm-23.3.23.dist-info → not1mm-23.3.24.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=N7VHt7BbOOspGg-jgKFbpIJleixgzl_ojUWqgHX84bI,53242
-not1mm/logwindow.py,sha256=xNfwkyMxUJj1v44TALoij_ESpN38mxOQ4qDbmLdeN5c,22565
+not1mm/__main__.py,sha256=aKa3xzSdqtR-8S9j4g-DEgIaqy1G7e_DkPFxby4doFE,54896
+not1mm/logwindow.py,sha256=yjBaHKlAUA3nDeZdBIT6-IGsHi-PZGuV1Kgolxunurk,24930
 not1mm/test.py,sha256=sCAd6OZQlakGm2gMbjhwZ17UyI-Y5L2CCqsYymx7IPQ,3906
 not1mm/data/Combinear.qss,sha256=SKqM0g8GvNXay1ovgtwCw3Egt0eLfN5P3iTREInC1eE,16590
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
@@ -16,16 +16,16 @@ 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/logwindow.ui,sha256=cS1eKjalLRTV1vuQc3Y1M6VL_-MmnMacxCA-Iw2L-Uo,970
-not1mm/data/main.ui,sha256=_xHzBgIEPQns1noojq7ES3YiYKi8jkI6ME_Cyk-kzYg,28298
+not1mm/data/logwindow.ui,sha256=_-wobHhIjALzCswyXIrqNadnLdc88eay1GNF23a-Qh0,970
+not1mm/data/main.ui,sha256=9bE0X3QT6qeHHditMK3jMBTzQnflNUNjbkIweJStIq0,29313
 not1mm/data/opon.ui,sha256=6r9_6ORGfNqwOnpzQjaJ1tWP_81amuXqLYlx1hHgdME,2018
 not1mm/data/reddot.png,sha256=M33jEMoU8W4rQ4_MVyzzKxDPDte1ypKBch5VnUMNLKE,565
-not1mm/data/settings.ui,sha256=gR8G7DJzUaKXEPL0TBR2MGFZkheciE35nh4gErXqiYc,35548
+not1mm/data/settings.ui,sha256=-uEW4fQWolcv6QrNVpQ_TYhpJLCnhnCiggVSMR27cpA,35558
 not1mm/data/use_qrz_dialog.ui,sha256=sXV1K1tsmYEF7K8nnV_t_UR3k1PzQp43CgvX4KSnR94,4554
 not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/lib/cat_interface.py,sha256=mYkDV80gMDuchkEMKyf7geroplGJ1Ne8cEBoH9nrq3o,10311
+not1mm/lib/cat_interface.py,sha256=5EhVLWfMOvg-zLkLTGtNLJj2VohxG48uaMCelEdL1wg,10342
 not1mm/lib/cwinterface.py,sha256=77I7RFtrIljuuWna3mjkjxaPSM1kGaPV4duPkoiT8wA,1772
-not1mm/lib/database.py,sha256=3sQ9KjXflzWlZE96YDZfAFnSseHocHEfBoJe0VZag8Q,15501
+not1mm/lib/database.py,sha256=HBGiZI4cHk8SLhqzzLEvBztvmbk5LI4jaiPS9quJTZQ,16105
 not1mm/lib/edit_contact.py,sha256=YwuX-BuIa7AuPtLRENs4jTzxOrtk6MCxZj3BR_bDPW8,357
 not1mm/lib/edit_macro.py,sha256=lyToZb1nmcONNFh6W35NzYHLU48gbAs2_OsnuRQGHck,559
 not1mm/lib/edit_opon.py,sha256=GqAOJMiC265_4YRVbkT1PflBuCa4HiCNfRhq8-J6ZVY,363
@@ -35,7 +35,7 @@ not1mm/lib/lookup.py,sha256=4OiWZWc3smcB0lqLk4WTs1U3i2k8yZFsX_1OoCGlaWc,13916
 not1mm/lib/multicast.py,sha256=4-vesMxt5n_pDk2oYnL7R_exxLl9C197t569AM2lrD4,1954
 not1mm/lib/n1mm.py,sha256=bK5d21Yfn6xRpQcu2RdpL2zR8lOlRWOadD6Ai4_lFdc,4434
 not1mm/lib/qrz_dialog.py,sha256=fLFBkvQ9cuIqKk0-1yl5OFuQ40n904fNi_Vt23je99E,350
-not1mm/lib/version.py,sha256=lLe0Q6AexqjCthMfOH6rxe5MAbxePj9_cdI0VJ3ce2A,47
+not1mm/lib/version.py,sha256=fOBHG97a4Ep1HAdcuBFWWrv7DF_4o_tJZCZXqguMeAs,49
 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
@@ -48,9 +48,9 @@ not1mm/plugins/cqww_dx_cw.py,sha256=eKBIQ8WdJXlGtSTDds7BuoFPpn3odEoiiu_RIQQLHb8,
 not1mm/plugins/cqww_dx_ssb.py,sha256=7lPh-VH8nb-qQ-9wYx5pd6Es_qSbiL3ETHpibqhH_r0,2090
 not1mm/plugins/general_logging.py,sha256=UwHO3g84bghuIaa1JyqMeMFVfmMRvLgV3NQY3zZWW-w,2077
 not1mm/plugins/winter_field_day.py,sha256=L7co3YEoKt-jaAFJfGw_Y3-uK-G6eQNsOQSCEkT5U24,1631
-not1mm-23.3.23.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-23.3.23.dist-info/METADATA,sha256=CaXyCAMZ6DC6tivrW_4wA_-fYqgFC8f1hl9tHddw_Xc,8092
-not1mm-23.3.23.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-not1mm-23.3.23.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-23.3.23.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-23.3.23.dist-info/RECORD,,
+not1mm-23.3.24.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-23.3.24.1.dist-info/METADATA,sha256=uULB7l6FwzkNN4KUWg3RIC0cFdl7prAeE6FyfbyK9eQ,8860
+not1mm-23.3.24.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+not1mm-23.3.24.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-23.3.24.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-23.3.24.1.dist-info/RECORD,,