not1mm 24.9.25__tar.gz → 24.9.28__tar.gz

{not1mm-24.9.25 → not1mm-24.9.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.25
+Version: 24.9.28
 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-28] Fixed crash with CAT None, Display tweek. Refactored a couple conditionals.
+- [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.

{not1mm-24.9.25 → not1mm-24.9.28}/README.md

@@ -199,6 +199,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-28] Fixed crash with CAT None, Display tweek. Refactored a couple conditionals.
+- [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.

{not1mm-24.9.25 → not1mm-24.9.28}/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",
@@ -309,19 +309,32 @@ class MainWindow(QtWidgets.QMainWindow):
         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"
@@ -342,21 +355,33 @@ class MainWindow(QtWidgets.QMainWindow):
         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"
         )
@@ -379,21 +404,36 @@ class MainWindow(QtWidgets.QMainWindow):
         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"
         )
@@ -413,11 +453,16 @@ class MainWindow(QtWidgets.QMainWindow):
         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 +473,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 +492,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,
@@ -2432,19 +2486,6 @@ class MainWindow(QtWidgets.QMainWindow):
         except (IOError, TypeError, ValueError) as exception:
             logger.critical("Error: %s", exception)
 
-        # self.look_up = None
-        # if self.pref.get("useqrz"):
-        #     self.look_up = QRZlookup(
-        #         self.pref.get("lookupusername"),
-        #         self.pref.get("lookuppassword"),
-        #     )
-
-        # if self.pref.get("usehamqth"):
-        #     self.look_up = HamQTH(
-        #         self.pref.get("lookupusername"),
-        #         self.pref.get("lookuppassword"),
-        #     )
-
         if self.pref.get("run_state"):
             self.radioButton_run.setChecked(True)
         else:
@@ -2493,6 +2534,7 @@ class MainWindow(QtWidgets.QMainWindow):
         except (RuntimeError, AttributeError):
             ...
 
+        self.rig_control = None
         self.fldigi_util = FlDigi_Comm()
 
         if self.pref.get("useflrig", False):
@@ -2563,7 +2605,18 @@ 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 [
@@ -2981,13 +3034,12 @@ class MainWindow(QtWidgets.QMainWindow):
         if mode in ("CW", "CW-U", "CW-L", "CWR"):
             self.setmode("CW")
             self.radio_state["mode"] = "CW"
-            if self.rig_control:
-                if self.rig_control.online:
-                    self.rig_control.set_mode("CW")
-                    if self.pref.get("cwtype") == 3 and self.rig_control is not None:
-                        if self.rig_control.interface == "flrig":
-                            self.cwspeed_spinbox_changed()
-                            self.rig_control.cat.set_flrig_cw_send(True)
+            if self.rig_control and self.rig_control.online:
+                self.rig_control.set_mode("CW")
+                if self.pref.get("cwtype") == 3 and self.rig_control is not None:
+                    if self.rig_control.interface == "flrig":
+                        self.cwspeed_spinbox_changed()
+                        self.rig_control.cat.set_flrig_cw_send(True)
             band = getband(str(self.radio_state.get("vfoa", "0.0")))
             self.set_band_indicator(band)
             self.set_window_title()
@@ -2996,11 +3048,10 @@ class MainWindow(QtWidgets.QMainWindow):
             return
         if mode == "RTTY":
             self.setmode("RTTY")
-            if self.rig_control:
-                if self.rig_control.online:
-                    self.rig_control.set_mode("RTTY")
-                else:
-                    self.radio_state["mode"] = "RTTY"
+            if self.rig_control and self.rig_control.online:
+                self.rig_control.set_mode("RTTY")
+            else:
+                self.radio_state["mode"] = "RTTY"
             band = getband(str(self.radio_state.get("vfoa", "0.0")))
             self.set_band_indicator(band)
             self.set_window_title()
@@ -3220,9 +3271,8 @@ class MainWindow(QtWidgets.QMainWindow):
         self.contact["Band"] = get_logged_band(str(vfo))
         self.set_band_indicator(band)
 
-        if self.rig_control:
-            if self.rig_control.online:
-                self.rig_control.get_modes()
+        if self.rig_control and self.rig_control.online:
+            self.rig_control.get_modes()
 
         if self.radio_state.get("mode") != mode:
             info_dirty = True
@@ -3236,7 +3286,19 @@ class MainWindow(QtWidgets.QMainWindow):
             self.setmode(mode)
         if mode == "LSB" or mode == "USB":
             self.setmode("SSB")
-        if mode == "RTTY":
+        if mode in (
+            "RTTY",
+            "RTTY-R",
+            "LSB-D",
+            "USB-D",
+            "AM-D",
+            "FM-D",
+            "DIGI-U",
+            "DIGI-L",
+            "RTTYR",
+            "PKTLSB",
+            "PKTUSB",
+        ):
             self.setmode("RTTY")
 
         if info_dirty:

{not1mm-24.9.25 → not1mm-24.9.28}/not1mm/data/configuration.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>703</width>
-    <height>395</height>
+    <height>443</height>
    </rect>
   </property>
   <property name="font">
@@ -41,7 +41,7 @@
       <enum>Qt::LayoutDirection::LeftToRight</enum>
      </property>
      <property name="orientation">
-      <enum>Qt::Orientation::Horizontal</enum>
+      <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
       <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Save</set>
@@ -300,7 +300,7 @@
        <item row="2" column="0">
         <spacer name="horizontalSpacer">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -313,7 +313,7 @@
        <item row="2" column="6">
         <spacer name="horizontalSpacer_2">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -343,7 +343,7 @@
        <item row="3" column="0">
         <spacer name="verticalSpacer_4">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -379,7 +379,7 @@
        <item row="0" column="0">
         <spacer name="verticalSpacer_5">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -432,7 +432,7 @@
          <item>
           <spacer name="horizontalSpacer_4">
            <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
+            <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -527,7 +527,7 @@
          <item>
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
+            <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -542,7 +542,7 @@
        <item row="2" column="1" colspan="3">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -573,7 +573,7 @@
        <item row="0" column="2">
         <spacer name="verticalSpacer">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -604,7 +604,7 @@
        <item row="4" column="0" colspan="4">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -695,7 +695,7 @@
        <item row="2" column="0">
         <spacer name="horizontalSpacer_5">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -805,7 +805,7 @@
        <item row="2" column="4">
         <spacer name="horizontalSpacer_6">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -825,7 +825,7 @@
        <item row="5" column="0">
         <spacer name="horizontalSpacer_7">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -838,7 +838,7 @@
        <item row="6" column="1">
         <spacer name="verticalSpacer_7">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -851,7 +851,7 @@
        <item row="5" column="4">
         <spacer name="horizontalSpacer_11">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -864,7 +864,7 @@
        <item row="5" column="3">
         <spacer name="horizontalSpacer_9">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -877,7 +877,7 @@
        <item row="5" column="5">
         <spacer name="horizontalSpacer_10">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -890,7 +890,7 @@
        <item row="5" column="1">
         <spacer name="horizontalSpacer_8">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -903,7 +903,7 @@
        <item row="0" column="1">
         <spacer name="verticalSpacer_6">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -1499,84 +1499,119 @@
        <string>Bands</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_9">
-       <item row="1" column="1">
-        <widget class="QCheckBox" name="activate_2m">
+       <item row="0" column="0">
+        <widget class="QCheckBox" name="activate_160m">
          <property name="text">
-          <string>2M</string>
+          <string>160M</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QCheckBox" name="activate_1dot25">
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="activate_80m">
          <property name="text">
-          <string>1.25M</string>
+          <string>80M</string>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
-        <widget class="QCheckBox" name="activate_40m">
+        <widget class="QCheckBox" name="activate_60m">
          <property name="text">
-          <string>40M</string>
+          <string>60M</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QCheckBox" name="activate_80m">
+       <item row="3" column="0">
+        <widget class="QCheckBox" name="activate_40m">
          <property name="text">
-          <string>80M</string>
+          <string>40M</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QCheckBox" name="activate_160m">
+       <item row="4" column="0">
+        <widget class="QCheckBox" name="activate_30m">
          <property name="text">
-          <string>160M</string>
+          <string>30M</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QCheckBox" name="activate_6m">
+       <item row="5" column="0">
+        <widget class="QCheckBox" name="activate_20m">
          <property name="text">
-          <string>6M</string>
+          <string>20M</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="activate_20m">
+       <item row="6" column="0">
+        <widget class="QCheckBox" name="activate_17m">
          <property name="text">
-          <string>20M</string>
+          <string>17M</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item row="7" column="0">
         <widget class="QCheckBox" name="activate_15m">
          <property name="text">
           <string>15M</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="9" column="0">
+        <widget class="QCheckBox" name="activate_12m">
+         <property name="text">
+          <string>12M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
         <widget class="QCheckBox" name="activate_10m">
          <property name="text">
           <string>10M</string>
          </property>
         </widget>
        </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="activate_6m">
+         <property name="text">
+          <string>6M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QCheckBox" name="activate_4m">
+         <property name="text">
+          <string>4M</string>
+         </property>
+        </widget>
+       </item>
        <item row="3" column="1">
+        <widget class="QCheckBox" name="activate_2m">
+         <property name="text">
+          <string>2M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QCheckBox" name="activate_1dot25">
+         <property name="text">
+          <string>1.25M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
         <widget class="QCheckBox" name="activate_70cm">
          <property name="text">
           <string>70cm</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
+       <item row="6" column="1">
         <widget class="QCheckBox" name="activate_33cm">
          <property name="text">
           <string>33cm</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="1">
+       <item row="7" column="1">
         <widget class="QCheckBox" name="activate_23cm">
          <property name="text">
           <string>23cm</string>