not1mm 24.9.24__tar.gz → 24.9.25.1__tar.gz

{not1mm-24.9.24 → not1mm-24.9.25.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.24
+Version: 24.9.25.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -230,6 +230,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-25-1] Added WARC and 4M bands.
+- [24-9-25] Fix QRZ lookup crash on non-existant call.
 - [24-9-24] Correct crash in CWT.
 - [24-9-23] Improved serial interface to rigctld. Send RTTY macros to fldigi when radio modes are RTTY, USB-D, LSB-D, PKTLSB, PKTUSB, DIGI-U, DIGI-L.
 - [24-9-22] Merged in changes for CQ WW RTTY

{not1mm-24.9.24 → not1mm-24.9.25.1}/README.md

@@ -199,6 +199,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-25-1] Added WARC and 4M bands.
+- [24-9-25] Fix QRZ lookup crash on non-existant call.
 - [24-9-24] Correct crash in CWT.
 - [24-9-23] Improved serial interface to rigctld. Send RTTY macros to fldigi when radio modes are RTTY, USB-D, LSB-D, PKTLSB, PKTUSB, DIGI-U, DIGI-L.
 - [24-9-22] Merged in changes for CQ WW RTTY

{not1mm-24.9.24 → not1mm-24.9.25.1}/not1mm/__main__.py

@@ -95,7 +95,7 @@ class MainWindow(QtWidgets.QMainWindow):
         "command_buttons": False,
         "cw_macros": True,
         "bands_modes": True,
-        "bands": ["160", "80", "40", "20", "15", "10"],
+        "bands": ["160", "80", "60", "40", "30", "20", "17", "15", "12", "10"],
         "current_database": "ham.db",
         "contest": "",
         "multicast_group": "239.1.1.1",
@@ -187,9 +187,7 @@ class MainWindow(QtWidgets.QMainWindow):
         }
 
         self.setCorner(Qt.Corner.TopRightCorner, Qt.DockWidgetArea.RightDockWidgetArea)
-        self.setCorner(
-            Qt.Corner.BottomRightCorner, Qt.DockWidgetArea.RightDockWidgetArea
-        )
+        self.setCorner(Qt.Corner.BottomRightCorner, Qt.DockWidgetArea.RightDockWidgetArea)
         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)
@@ -220,9 +218,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.actionGenerate_Cabrillo.triggered.connect(self.generate_cabrillo)
         self.actionGenerate_ADIF.triggered.connect(self.generate_adif)
 
-        self.actionConfiguration_Settings.triggered.connect(
-            self.edit_configuration_settings
-        )
+        self.actionConfiguration_Settings.triggered.connect(self.edit_configuration_settings)
         self.actionStationSettings.triggered.connect(self.edit_station_settings)
 
         self.actionNew_Contest.triggered.connect(self.new_contest_dialog)
@@ -303,121 +299,72 @@ class MainWindow(QtWidgets.QMainWindow):
         self.F12.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F12))
         self.F12.clicked.connect(lambda x: self.process_function_key(self.F12))
 
-        self.cw_band_160.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            160, "CW"
-        )
-        self.cw_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            80, "CW"
-        )
-        self.cw_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            40, "CW"
-        )
-        self.cw_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            20, "CW"
-        )
-        self.cw_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            15, "CW"
-        )
-        self.cw_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            10, "CW"
-        )
+        self.cw_band_160.mousePressEvent = lambda x: self.change_to_band_and_mode(160, "CW")
+        self.cw_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(80, "CW")
+        self.cw_band_60.mousePressEvent = lambda x: self.change_to_band_and_mode(60, "CW")
+        self.cw_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(40, "CW")
+        self.cw_band_30.mousePressEvent = lambda x: self.change_to_band_and_mode(30, "CW")
+        self.cw_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(20, "CW")
+        self.cw_band_17.mousePressEvent = lambda x: self.change_to_band_and_mode(17, "CW")
+        self.cw_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(15, "CW")
+        self.cw_band_12.mousePressEvent = lambda x: self.change_to_band_and_mode(12, "CW")
+        self.cw_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(10, "CW")
         self.cw_band_6.mousePressEvent = lambda x: self.change_to_band_and_mode(6, "CW")
+        self.cw_band_4.mousePressEvent = lambda x: self.change_to_band_and_mode(4, "CW")
         self.cw_band_2.mousePressEvent = lambda x: self.change_to_band_and_mode(2, "CW")
-        self.cw_band_125.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            222, "CW"
-        )
-        self.cw_band_70cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            432, "CW"
-        )
-        self.cw_band_33cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            902, "CW"
-        )
-        self.cw_band_23cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            1240, "CW"
-        )
-
-        self.ssb_band_160.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            160, "SSB"
-        )
-        self.ssb_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            80, "SSB"
-        )
-        self.ssb_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            40, "SSB"
-        )
-        self.ssb_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            20, "SSB"
-        )
-        self.ssb_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            15, "SSB"
-        )
-        self.ssb_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            10, "SSB"
-        )
-        self.ssb_band_6.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            6, "SSB"
-        )
-        self.ssb_band_2.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            2, "SSB"
-        )
-        self.ssb_band_125.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            222, "SSB"
-        )
-        self.ssb_band_70cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            432, "SSB"
-        )
-        self.ssb_band_33cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            902, "SSB"
-        )
-        self.ssb_band_23cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            1240, "SSB"
-        )
-
-        self.rtty_band_160.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            160, "RTTY"
-        )
-        self.rtty_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            80, "RTTY"
-        )
-        self.rtty_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            40, "RTTY"
-        )
-        self.rtty_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            20, "RTTY"
-        )
-        self.rtty_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            15, "RTTY"
-        )
-        self.rtty_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            10, "RTTY"
-        )
-        self.rtty_band_6.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            6, "RTTY"
-        )
-        self.rtty_band_2.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            2, "RTTY"
-        )
-        self.rtty_band_125.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            222, "RTTY"
-        )
-        self.rtty_band_70cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            432, "RTTY"
-        )
-        self.rtty_band_33cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            902, "RTTY"
-        )
-        self.rtty_band_23cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
-            1240, "RTTY"
-        )
+        self.cw_band_125.mousePressEvent = lambda x: self.change_to_band_and_mode(222, "CW")
+        self.cw_band_70cm.mousePressEvent = lambda x: self.change_to_band_and_mode(432, "CW")
+        self.cw_band_33cm.mousePressEvent = lambda x: self.change_to_band_and_mode(902, "CW")
+        self.cw_band_23cm.mousePressEvent = lambda x: self.change_to_band_and_mode(1240, "CW")
+
+        self.ssb_band_160.mousePressEvent = lambda x: self.change_to_band_and_mode(160, "SSB")
+        self.ssb_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(80, "SSB")
+        self.ssb_band_60.mousePressEvent = lambda x: self.change_to_band_and_mode(60, "SSB")
+        self.ssb_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(40, "SSB")
+        self.ssb_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(20, "SSB")
+        self.ssb_band_17.mousePressEvent = lambda x: self.change_to_band_and_mode(17, "SSB")
+        self.ssb_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(15, "SSB")
+        self.ssb_band_12.mousePressEvent = lambda x: self.change_to_band_and_mode(12, "SSB")
+        self.ssb_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(10, "SSB")
+        self.ssb_band_6.mousePressEvent = lambda x: self.change_to_band_and_mode(6, "SSB")
+        self.ssb_band_4.mousePressEvent = lambda x: self.change_to_band_and_mode(4, "SSB")
+        self.ssb_band_2.mousePressEvent = lambda x: self.change_to_band_and_mode(2, "SSB")
+        self.ssb_band_125.mousePressEvent = lambda x: self.change_to_band_and_mode(222, "SSB")
+        self.ssb_band_70cm.mousePressEvent = lambda x: self.change_to_band_and_mode(432, "SSB")
+        self.ssb_band_33cm.mousePressEvent = lambda x: self.change_to_band_and_mode(902, "SSB")
+        self.ssb_band_23cm.mousePressEvent = lambda x: self.change_to_band_and_mode(1240, "SSB")
+
+        self.rtty_band_160.mousePressEvent = lambda x: self.change_to_band_and_mode(160, "RTTY")
+        self.rtty_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(80, "RTTY")
+        self.rtty_band_60.mousePressEvent = lambda x: self.change_to_band_and_mode(60, "RTTY")
+        self.rtty_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(40, "RTTY")
+        self.rtty_band_30.mousePressEvent = lambda x: self.change_to_band_and_mode(30, "RTTY")
+        self.rtty_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(20, "RTTY")
+        self.rtty_band_17.mousePressEvent = lambda x: self.change_to_band_and_mode(17, "RTTY")
+        self.rtty_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(15, "RTTY")
+        self.rtty_band_12.mousePressEvent = lambda x: self.change_to_band_and_mode(12, "RTTY")
+        self.rtty_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(10, "RTTY")
+        self.rtty_band_6.mousePressEvent = lambda x: self.change_to_band_and_mode(6, "RTTY")
+        self.rtty_band_4.mousePressEvent = lambda x: self.change_to_band_and_mode(4, "RTTY")
+        self.rtty_band_2.mousePressEvent = lambda x: self.change_to_band_and_mode(2, "RTTY")
+        self.rtty_band_125.mousePressEvent = lambda x: self.change_to_band_and_mode(222, "RTTY")
+        self.rtty_band_70cm.mousePressEvent = lambda x: self.change_to_band_and_mode(432, "RTTY")
+        self.rtty_band_33cm.mousePressEvent = lambda x: self.change_to_band_and_mode(902, "RTTY")
+        self.rtty_band_23cm.mousePressEvent = lambda x: self.change_to_band_and_mode(1240, "RTTY")
 
         self.band_indicators_cw = {
             "160": self.cw_band_160,
             "80": self.cw_band_80,
+            "60": self.cw_band_60,
             "40": self.cw_band_40,
+            "30": self.cw_band_30,
             "20": self.cw_band_20,
+            "17": self.cw_band_17,
             "15": self.cw_band_15,
+            "12": self.cw_band_12,
             "10": self.cw_band_10,
             "6": self.cw_band_6,
+            "4": self.cw_band_4,
             "2": self.cw_band_2,
             "1.25": self.cw_band_125,
             "70cm": self.cw_band_70cm,
@@ -428,11 +375,15 @@ class MainWindow(QtWidgets.QMainWindow):
         self.band_indicators_ssb = {
             "160": self.ssb_band_160,
             "80": self.ssb_band_80,
+            "60": self.ssb_band_60,
             "40": self.ssb_band_40,
             "20": self.ssb_band_20,
+            "17": self.ssb_band_17,
             "15": self.ssb_band_15,
+            "12": self.ssb_band_12,
             "10": self.ssb_band_10,
             "6": self.ssb_band_6,
+            "4": self.ssb_band_4,
             "2": self.ssb_band_2,
             "1.25": self.ssb_band_125,
             "70cm": self.ssb_band_70cm,
@@ -443,11 +394,16 @@ class MainWindow(QtWidgets.QMainWindow):
         self.band_indicators_rtty = {
             "160": self.rtty_band_160,
             "80": self.rtty_band_80,
+            "60": self.rtty_band_60,
             "40": self.rtty_band_40,
+            "30": self.rtty_band_30,
             "20": self.rtty_band_20,
+            "17": self.rtty_band_17,
             "15": self.rtty_band_15,
+            "12": self.rtty_band_12,
             "10": self.rtty_band_10,
             "6": self.rtty_band_6,
+            "4": self.rtty_band_4,
             "2": self.rtty_band_2,
             "1.25": self.rtty_band_125,
             "70cm": self.rtty_band_70cm,
@@ -652,8 +608,7 @@ class MainWindow(QtWidgets.QMainWindow):
             darkPalette.setColor(QPalette.ColorRole.BrightText, QColorConstants.Red)
             darkPalette.setColor(QPalette.ColorRole.Link, QColor(42, 130, 218))
             darkPalette.setColor(QPalette.ColorRole.Highlight, QColor(42, 130, 218))
-            darkPalette.setColor(
-                QPalette.ColorRole.HighlightedText, QColorConstants.Black
+            darkPalette.setColor(QPalette.ColorRole.HighlightedText, QColorConstants.Black
             )
             darkPalette.setColor(
                 QPalette.ColorGroup.Disabled,
@@ -2563,7 +2518,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
         # If bands list is empty fill it with HF.
         if self.pref.get("bands", []) == []:
-            self.pref["bands"] = ["160", "80", "40", "20", "15", "10"]
+            self.pref["bands"] = ["160", "80", "60", "40", "30", "20", "17", "15", "12", "10"]
 
         # Hide all the bands and then show only the wanted bands.
         for _indicator in [
@@ -2661,32 +2616,34 @@ class MainWindow(QtWidgets.QMainWindow):
                     json_data.get("cmd", "") == "LOOKUP_RESPONSE"
                     and json_data.get("station", "") == platform.node()
                 ):
-
-                    fname = json_data.get("result", {}).get("fname", "")
-                    name = json_data.get("result", {}).get("name", "")
-                    grid = json_data.get("result", {}).get("grid", "")
-                    # error_text = json_data.get("result", {}).get("error_text", "")
-                    nickname = json_data.get("result", {}).get("nickname", "")
-
-                    if self.contest:
-                        if "General Logging" in self.contest.name:
-                            if nickname:
-                                self.other_1.setText(nickname)
-                            elif fname:
-                                self.other_1.setText(fname)
-                            elif name:
-                                self.other_1.setText(name)
-
-                    if grid:
-                        self.contact["GridSquare"] = grid
-                    # _theircountry = response.get("country", "")
-                    if self.station.get("GridSquare", ""):
-                        heading = bearing(self.station.get("GridSquare", ""), grid)
-                        kilometers = distance(self.station.get("GridSquare", ""), grid)
-                        self.heading_distance.setText(
-                            f"{grid} Hdg {heading}° LP {reciprocol(heading)}° / "
-                            f"distance {int(kilometers*0.621371)}mi {kilometers}km"
-                        )
+                    if json_data.get("result", None) is not None:
+                        fname = json_data.get("result", {}).get("fname", "")
+                        name = json_data.get("result", {}).get("name", "")
+                        grid = json_data.get("result", {}).get("grid", "")
+                        # error_text = json_data.get("result", {}).get("error_text", "")
+                        nickname = json_data.get("result", {}).get("nickname", "")
+
+                        if self.contest:
+                            if "General Logging" in self.contest.name:
+                                if nickname:
+                                    self.other_1.setText(nickname)
+                                elif fname:
+                                    self.other_1.setText(fname)
+                                elif name:
+                                    self.other_1.setText(name)
+
+                        if grid:
+                            self.contact["GridSquare"] = grid
+                        # _theircountry = response.get("country", "")
+                        if self.station.get("GridSquare", ""):
+                            heading = bearing(self.station.get("GridSquare", ""), grid)
+                            kilometers = distance(
+                                self.station.get("GridSquare", ""), grid
+                            )
+                            self.heading_distance.setText(
+                                f"{grid} Hdg {heading}° LP {reciprocol(heading)}° / "
+                                f"distance {int(kilometers*0.621371)}mi {kilometers}km"
+                            )
 
     def dark_mode_state_changed(self) -> None:
         """Called when the Dark Mode menu state is changed."""