not1mm 24.10.27.1__tar.gz → 24.11.2__tar.gz

{not1mm-24.10.27.1 → not1mm-24.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.27.1
+Version: 24.11.2
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -232,35 +232,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
-- [24-10-27-1] Fixed setting radios ssb mode when crossing 10M boundary.
-- [24-10-27] Fix bug where a contacts info could be carried over to new contact if no new value was written.
-- [24-10-26] Clear inputs when seeking to a call from the bandmap via the arrow up and down. Fixed bandmap crash from bad telnet data. Drop beacons from bandmap.
-- [24-10-25] Add File Menu option to create either an ASCII or UTF8 Cabrillo.
-- [24-10-24-1] Make all Cabrillo files with UTF-8.
-- [24-10-24] Forgot to convert the VFO dockwidget along with the rest. CQ WW CW, Dupes now score 0.
-- [24-10-23] Remove duplicate marked calls in the bandmap.
-- [24-10-22] Added ESM to RAC Canada Day. Added French REF.
-- [24-10-21] Scaled back the hits returned from the check window from 25 to 20. Seems less resource hungry now.
-- [24-10-20-1] ReWrote how the widgets interact. I probably broke a thing or two. Let me know.
-- [24-10-20] Add ESM to ARRL DX.
-- [24-10-19-1] Rewrite part of CAT control.
-- [24-10-19] Change ESM button states when the run state is toggled. Add ESM to ARRL Field Day and Winter Field Day.
-- [24-10-18] Fixed marked spots showing the correct time.
-- [24-10-17-2] Add ESM to ARRL Sweepstakes.
-- [24-10-17-1] Fix dupe check. Reordered change mode and interface update sequence. Resend mode if rigctld does not report back `RPRT 0`
-- [24-10-17] Increased max CW speed to 99, 'cause people be crazy. Trying smaller timeout for the rigctlsocket. Not having the checkwindow process events while not visible since it's a resource hog.
-- [24-10-15-1] Fix callsigns with a slash failing check during ESM.
-- [24-10-15] Add NAQP RTTY, Added ESM to NAQP.
-- [24-10-14] Add ESM to CQ WPX.
-- [24-10-13] Added ESM to Weekly RTTY, K1USN and CWT.
-- [24-10-11] added ESM to CQWW SSB and RTTY.
-- [24-10-10] Add ESM to CQ WW CW to test it out.
-- [24-10-8] Fix crash on Tune to spot. Change placeholder text for the CW port for those unable to read documentation.
-- [24-10-6] Removed 60, 30, 17 and 12M from the default list of bands.
-- [24-10-5-1] Store the bandmap spots age timer in the preferences.
-- [24-10-5] Force reselction of contest after different DB opened.
-- [24-10-2] Add WPX RTTY.
-- [24-10-1] Merged PR removing leading zeros from serial numbers. Merged PR correcting the parsing of lookups for previous name and state in the CWT.
+- [24-11-2] Add beginning of call history files. Add command buttons.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-24.10.27.1 → not1mm-24.11.2}/README.md

@@ -201,35 +201,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
-- [24-10-27-1] Fixed setting radios ssb mode when crossing 10M boundary.
-- [24-10-27] Fix bug where a contacts info could be carried over to new contact if no new value was written.
-- [24-10-26] Clear inputs when seeking to a call from the bandmap via the arrow up and down. Fixed bandmap crash from bad telnet data. Drop beacons from bandmap.
-- [24-10-25] Add File Menu option to create either an ASCII or UTF8 Cabrillo.
-- [24-10-24-1] Make all Cabrillo files with UTF-8.
-- [24-10-24] Forgot to convert the VFO dockwidget along with the rest. CQ WW CW, Dupes now score 0.
-- [24-10-23] Remove duplicate marked calls in the bandmap.
-- [24-10-22] Added ESM to RAC Canada Day. Added French REF.
-- [24-10-21] Scaled back the hits returned from the check window from 25 to 20. Seems less resource hungry now.
-- [24-10-20-1] ReWrote how the widgets interact. I probably broke a thing or two. Let me know.
-- [24-10-20] Add ESM to ARRL DX.
-- [24-10-19-1] Rewrite part of CAT control.
-- [24-10-19] Change ESM button states when the run state is toggled. Add ESM to ARRL Field Day and Winter Field Day.
-- [24-10-18] Fixed marked spots showing the correct time.
-- [24-10-17-2] Add ESM to ARRL Sweepstakes.
-- [24-10-17-1] Fix dupe check. Reordered change mode and interface update sequence. Resend mode if rigctld does not report back `RPRT 0`
-- [24-10-17] Increased max CW speed to 99, 'cause people be crazy. Trying smaller timeout for the rigctlsocket. Not having the checkwindow process events while not visible since it's a resource hog.
-- [24-10-15-1] Fix callsigns with a slash failing check during ESM.
-- [24-10-15] Add NAQP RTTY, Added ESM to NAQP.
-- [24-10-14] Add ESM to CQ WPX.
-- [24-10-13] Added ESM to Weekly RTTY, K1USN and CWT.
-- [24-10-11] added ESM to CQWW SSB and RTTY.
-- [24-10-10] Add ESM to CQ WW CW to test it out.
-- [24-10-8] Fix crash on Tune to spot. Change placeholder text for the CW port for those unable to read documentation.
-- [24-10-6] Removed 60, 30, 17 and 12M from the default list of bands.
-- [24-10-5-1] Store the bandmap spots age timer in the preferences.
-- [24-10-5] Force reselction of contest after different DB opened.
-- [24-10-2] Add WPX RTTY.
-- [24-10-1] Merged PR removing leading zeros from serial numbers. Merged PR correcting the parsing of lookups for previous name and state in the CWT.
+- [24-11-2] Add beginning of call history files. Add command buttons.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-24.10.27.1 → not1mm-24.11.2}/not1mm/__main__.py

@@ -37,6 +37,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets, uic
 from PyQt6.QtCore import QDir, Qt, QThread, QSettings, QCoreApplication
 from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor, QPixmap
 from PyQt6.QtWidgets import QFileDialog, QSplashScreen, QApplication
+from PyQt6.QtCore import QT_VERSION_STR, PYQT_VERSION_STR
 
 from not1mm.lib.about import About
 from not1mm.lib.cwinterface import CW
@@ -163,6 +164,7 @@ class MainWindow(QtWidgets.QMainWindow):
     text_color = QColorConstants.Black
     current_palette = None
     use_esm = False
+    use_call_history = False
     esm_dict = {}
 
     radio_thread = QThread()
@@ -198,6 +200,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.setCorner(Qt.Corner.TopLeftCorner, Qt.DockWidgetArea.LeftDockWidgetArea)
         self.setCorner(Qt.Corner.BottomLeftCorner, Qt.DockWidgetArea.LeftDockWidgetArea)
         uic.loadUi(fsutils.APP_DATA_PATH / "main.ui", self)
+        self.history_info.hide()
         QApplication.instance().focusObjectChanged.connect(self.on_focus_changed)
         self.inputs_dict = {
             self.callsign: "callsign",
@@ -223,12 +226,15 @@ class MainWindow(QtWidgets.QMainWindow):
 
         self.actionCW_Macros.triggered.connect(self.cw_macros_state_changed)
         self.actionDark_Mode_2.triggered.connect(self.dark_mode_state_changed)
-        self.actionCommand_Buttons.triggered.connect(self.command_buttons_state_change)
+        self.actionCommand_Buttons_2.triggered.connect(
+            self.command_buttons_state_change
+        )
         self.actionLog_Window.triggered.connect(self.launch_log_window)
         self.actionBandmap.triggered.connect(self.launch_bandmap_window)
         self.actionCheck_Window.triggered.connect(self.launch_check_window)
         self.actionVFO.triggered.connect(self.launch_vfo)
         self.actionRecalculate_Mults.triggered.connect(self.recalculate_mults)
+        self.actionLoad_Call_History_File.triggered.connect(self.load_call_history)
 
         self.actionGenerate_Cabrillo_ASCII.triggered.connect(
             lambda x: self.generate_cabrillo("ascii")
@@ -289,6 +295,12 @@ class MainWindow(QtWidgets.QMainWindow):
         self.radio_green = QtGui.QPixmap(str(icon_path / "radio_green.png"))
         self.radio_icon.setPixmap(self.radio_grey)
 
+        self.log_it.clicked.connect(self.save_contact)
+        self.wipe.clicked.connect(self.clearinputs)
+        self.esc_stop.clicked.connect(self.stop_cw)
+        self.mark.clicked.connect(self.mark_spot)
+        self.spot_it.clicked.connect(self.spot_dx)
+
         self.F1.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu)
         self.F1.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F1))
         self.F1.clicked.connect(lambda x: self.process_function_key(self.F1))
@@ -589,7 +601,21 @@ class MainWindow(QtWidgets.QMainWindow):
         self.voice_process.current_op = self.current_op
         self.make_op_dir()
 
-        # Featureset for wayland
+        logger.debug(f"{QT_VERSION_STR=} {PYQT_VERSION_STR=}")
+        x = PYQT_VERSION_STR.split(".")
+        old_Qt = True
+        # test if pyqt version is at least 6.7.1
+        if len(x) == 1:
+            if int(x[0]) > 6:
+                old_Qt = False
+        elif len(x) == 2:
+            if int(x[0]) >= 6 and int(x[1]) > 8:
+                old_Qt = False
+        elif len(x) == 3:
+            if int(x[0]) >= 6 and int(x[1]) >= 7 and int(x[2]) >= 2:
+                old_Qt = False
+
+        # Featureset for wayland if pyqt is older that 6.7.1
         dockfeatures = (
             QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetClosable
             | QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetMovable
@@ -598,7 +624,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Setting up BandMapWindow.")
         self.bandmap_window = BandMapWindow()
         self.bandmap_window.setObjectName("bandmap-window")
-        if os.environ.get("WAYLAND_DISPLAY"):
+        if os.environ.get("WAYLAND_DISPLAY") and old_Qt is True:
             self.bandmap_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.bandmap_window)
         self.bandmap_window.hide()
@@ -609,7 +635,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Setting up CheckWindow.")
         self.check_window = CheckWindow()
         self.check_window.setObjectName("check-window")
-        if os.environ.get("WAYLAND_DISPLAY"):
+        if os.environ.get("WAYLAND_DISPLAY") and old_Qt is True:
             self.check_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
         self.check_window.hide()
@@ -618,7 +644,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Setting up VFOWindow.")
         self.vfo_window = VfoWindow()
         self.vfo_window.setObjectName("vfo-window")
-        if os.environ.get("WAYLAND_DISPLAY"):
+        if os.environ.get("WAYLAND_DISPLAY") and old_Qt is True:
             self.vfo_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
         self.vfo_window.hide()
@@ -626,7 +652,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Setting up LogWindow.")
         self.log_window = LogWindow()
         self.log_window.setObjectName("log-window")
-        if os.environ.get("WAYLAND_DISPLAY"):
+        if os.environ.get("WAYLAND_DISPLAY") and old_Qt is True:
             self.log_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
         self.log_window.hide()
@@ -688,6 +714,45 @@ class MainWindow(QtWidgets.QMainWindow):
                     "You can udate to the current version by using:\npip install -U not1mm"
                 )
 
+    def load_call_history(self) -> None:
+        """"""
+        filename = self.filepicker("other")
+        if filename:
+            self.database.create_callhistory_table()
+            self.database.delete_callhistory()
+
+            try:
+                with open(filename, "rt", encoding="utf-8") as file_descriptor:
+                    lines = file_descriptor.readlines()
+                    if "!!Order!!" in lines[0]:
+                        item_names = lines[0].strip().split(",")
+                        # ['!!Order!!', 'Call', 'Sect', 'State', 'CK', 'UserText', '']
+                        item_names = item_names[1:-1]
+                        # ['Call', 'Sect', 'State', 'CK', 'UserText']
+                        lines = lines[1:]
+                        group_list = []
+                        for line in lines:
+                            if line.startswith("#"):
+                                continue
+                            group = {}
+                            fields = line.strip().split(",")
+                            # ['4U1WB','MDC','DC','89','']
+                            count = 0
+                            try:
+                                for item in item_names:
+                                    if item == "":
+                                        continue
+                                    group[item] = fields[count]
+                                    count += 1
+                                group_list.append(group)
+                                # database.add_callhistory_item(group)
+                                # print(f"{group=}")
+                            except IndexError:
+                                ...
+                        self.database.add_callhistory_items(group_list)
+            except FileNotFoundError as err:
+                self.show_message_box(f"{err}")
+
     def on_focus_changed(self, new):
         """"""
         if self.use_esm:
@@ -1713,6 +1778,14 @@ class MainWindow(QtWidgets.QMainWindow):
                 "Database (*.db)",
                 options=options,
             )
+        if action == "other":
+            file, _ = QFileDialog.getOpenFileName(
+                self,
+                "Choose a File",
+                "~/",
+                "Any (*.*)",
+                options=options,
+            )
         return file
 
     def recalculate_mults(self) -> None:
@@ -1892,6 +1965,43 @@ class MainWindow(QtWidgets.QMainWindow):
                 if self.rig_control.interface == "flrig":
                     self.rig_control.cat.set_flrig_cw_speed(self.cw_speed.value())
 
+    def stop_cw(self):
+        """"""
+        if self.cw is not None:
+            if self.cw.servertype == 1:
+                self.cw.sendcw("\x1b4")
+                return
+        if self.rig_control:
+            if self.rig_control.online:
+                if self.pref.get("cwtype") == 3 and self.rig_control is not None:
+                    if self.rig_control.interface == "flrig":
+                        self.rig_control.cat.set_flrig_cw_send(False)
+                        self.rig_control.cat.set_flrig_cw_send(True)
+
+    def mark_spot(self):
+        """"""
+        freq = self.radio_state.get("vfoa")
+        dx = self.callsign.text()
+        if freq and dx:
+            cmd = {}
+            cmd["cmd"] = "MARKDX"
+            cmd["dx"] = dx
+            cmd["freq"] = float(int(freq) / 1000)
+            if self.bandmap_window:
+                self.bandmap_window.msg_from_main(cmd)
+
+    def spot_dx(self):
+        """"""
+        freq = self.radio_state.get("vfoa")
+        dx = self.callsign.text()
+        if freq and dx:
+            cmd = {}
+            cmd["cmd"] = "SPOTDX"
+            cmd["dx"] = dx
+            cmd["freq"] = float(int(freq) / 1000)
+            if self.bandmap_window:
+                self.bandmap_window.msg_from_main(cmd)
+
     def keyPressEvent(self, event) -> None:  # pylint: disable=invalid-name
         """
         This overrides Qt key event.
@@ -1906,6 +2016,12 @@ class MainWindow(QtWidgets.QMainWindow):
         None
         """
         modifier = event.modifiers()
+        if (
+            event.key() == Qt.Key.Key_Equal
+            and modifier == Qt.KeyboardModifier.ControlModifier
+        ):
+            self.save_contact()
+            return
         if event.key() == Qt.Key.Key_K:
             self.toggle_cw_entry()
             return
@@ -2886,6 +3002,9 @@ class MainWindow(QtWidgets.QMainWindow):
             "DISABLED": None,
         }
 
+        self.use_call_history = self.pref.get("use_call_history", False)
+        if self.use_call_history:
+            self.history_info.show()
         self.use_esm = self.pref.get("use_esm", False)
         self.esm_dict["CQ"] = fkey_dict.get(self.pref.get("esm_cq", "DISABLED"))
         self.esm_dict["EXCH"] = fkey_dict.get(self.pref.get("esm_exch", "DISABLED"))
@@ -2953,7 +3072,7 @@ class MainWindow(QtWidgets.QMainWindow):
         None
         """
 
-        self.pref["command_buttons"] = self.actionCommand_Buttons.isChecked()
+        self.pref["command_buttons"] = self.actionCommand_Buttons_2.isChecked()
         self.write_preference()
         self.show_command_buttons()
 
@@ -3109,6 +3228,13 @@ class MainWindow(QtWidgets.QMainWindow):
             if self.lookup_service:
                 self.lookup_service.msg_from_main(cmd)
             self.next_field.setFocus()
+            if self.contest:
+                if self.use_call_history and hasattr(
+                    self.contest, "check_call_history"
+                ):
+                    self.contest.check_call_history(self)
+                if "CQ WW" in self.contest.name or "IARU HF" in self.contest.name:
+                    self.contest.prefill(self)
             return
         cmd = {}
         cmd["cmd"] = "CALLCHANGED"
@@ -3278,7 +3404,11 @@ class MainWindow(QtWidgets.QMainWindow):
                 )
                 if len(callsign) > 2:
                     if self.contest:
-                        self.contest.prefill(self)
+                        if (
+                            "CQ WW" not in self.contest.name
+                            and "IARU HF" not in self.contest.name
+                        ):
+                            self.contest.prefill(self)
 
     def check_dupe(self, call: str) -> bool:
         """Checks if a callsign is a dupe on current band/mode."""