not1mm 23.12.17__tar.gz → 23.12.20__tar.gz

{not1mm-23.12.17 → not1mm-23.12.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.12.17
+Version: 23.12.20
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -79,6 +79,7 @@ The worlds #1 unfinished contest logger <sup>*According to my daughter Corinna.<
     - [CW Keyer interface](#cw-keyer-interface)
     - [Cluster](#cluster)
     - [N1MM Packets](#n1mm-packets)
+    - [Bands](#bands)
   - [Sending CW](#sending-cw)
   - [Editing macro keys](#editing-macro-keys)
     - [Macro substitutions](#macro-substitutions)
@@ -144,6 +145,9 @@ I wish to thank those who've contributed to the project.
 - ARRL Field Day
 - ARRL Sweepstakes CW
 - ARRL Sweepstakes SSB
+- ARRL VHF January
+- ARRL VHF June
+- ARRL VHF September
 - CQ WPX CW
 - CQ WPX SSB
 - CQ World Wide CW
@@ -159,6 +163,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [23-12-20] Add ARRL VHF Jun and Sep.
+- [23-12-19] Add ARRL VHF contest. Add VHF frequencies. Add Bands TAB to configuration dialog to select active bands you want displayed.
 - [23-12-17] Add ARRL 10M contest. Fixed crash in RAC Canada Day
 - [23-12-5] Removed deprecated datetime.utcnow()
 - [23-12-4] Moved get_points to plugin_common, fixing crash.
@@ -372,6 +378,12 @@ Work has started on N1MM udp packets. So far just RadioInfo, contactinfo, contac
 
 When entering IP and Ports, enter them with a colon ':' between them. You can enter multiple pairs on the same line if separated by a space ' '.
 
+### Bands
+
+You can define which bands appear in the main window. Those with checkmarks will appear. Those without will not.
+
+![Bands Configuration Screen](https://github.com/mbridak/not1mm/raw/master/pic/configure_bands.png)
+
 ## Sending CW
 
 Other than sending CW by hand, you can also send predefined CW text messages by pressing F1 - F12. See next section on Editing macro keys. If you need to send something freeform, you can press CTRL-SHIFT-K, this will expose an entry field at the bottom of the window which you can type directly into. When you're done you can either press CTRL-SHIFT-K again, or press the Enter Key to close the field.

{not1mm-23.12.17 → not1mm-23.12.20}/README.md

@@ -50,6 +50,7 @@ The worlds #1 unfinished contest logger <sup>*According to my daughter Corinna.<
     - [CW Keyer interface](#cw-keyer-interface)
     - [Cluster](#cluster)
     - [N1MM Packets](#n1mm-packets)
+    - [Bands](#bands)
   - [Sending CW](#sending-cw)
   - [Editing macro keys](#editing-macro-keys)
     - [Macro substitutions](#macro-substitutions)
@@ -115,6 +116,9 @@ I wish to thank those who've contributed to the project.
 - ARRL Field Day
 - ARRL Sweepstakes CW
 - ARRL Sweepstakes SSB
+- ARRL VHF January
+- ARRL VHF June
+- ARRL VHF September
 - CQ WPX CW
 - CQ WPX SSB
 - CQ World Wide CW
@@ -130,6 +134,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [23-12-20] Add ARRL VHF Jun and Sep.
+- [23-12-19] Add ARRL VHF contest. Add VHF frequencies. Add Bands TAB to configuration dialog to select active bands you want displayed.
 - [23-12-17] Add ARRL 10M contest. Fixed crash in RAC Canada Day
 - [23-12-5] Removed deprecated datetime.utcnow()
 - [23-12-4] Moved get_points to plugin_common, fixing crash.
@@ -343,6 +349,12 @@ Work has started on N1MM udp packets. So far just RadioInfo, contactinfo, contac
 
 When entering IP and Ports, enter them with a colon ':' between them. You can enter multiple pairs on the same line if separated by a space ' '.
 
+### Bands
+
+You can define which bands appear in the main window. Those with checkmarks will appear. Those without will not.
+
+![Bands Configuration Screen](https://github.com/mbridak/not1mm/raw/master/pic/configure_bands.png)
+
 ## Sending CW
 
 Other than sending CW by hand, you can also send predefined CW text messages by pressing F1 - F12. See next section on Editing macro keys. If you need to send something freeform, you can press CTRL-SHIFT-K, this will expose an entry field at the bottom of the window which you can type directly into. When you're done you can either press CTRL-SHIFT-K again, or press the Enter Key to close the field.

{not1mm-23.12.17 → not1mm-23.12.20}/not1mm/__main__.py

@@ -127,6 +127,7 @@ class MainWindow(QtWidgets.QMainWindow):
         "command_buttons": False,
         "cw_macros": True,
         "bands_modes": True,
+        "bands": ["160m", "80m", "40m", "20m", "15m", "10m"],
         "window_height": 200,
         "window_width": 600,
         "window_x": 120,
@@ -311,6 +312,12 @@ class MainWindow(QtWidgets.QMainWindow):
         self.cw_band_20.mousePressEvent = self.click_20_cw
         self.cw_band_15.mousePressEvent = self.click_15_cw
         self.cw_band_10.mousePressEvent = self.click_10_cw
+        self.cw_band_6.mousePressEvent = self.click_6_cw
+        self.cw_band_2.mousePressEvent = self.click_2_cw
+        self.cw_band_125.mousePressEvent = self.click_125_cw
+        self.cw_band_70cm.mousePressEvent = self.click_70cm_cw
+        self.cw_band_33cm.mousePressEvent = self.click_33cm_cw
+        self.cw_band_23cm.mousePressEvent = self.click_23cm_cw
 
         self.ssb_band_160.mousePressEvent = self.click_160_ssb
         self.ssb_band_80.mousePressEvent = self.click_80_ssb
@@ -318,6 +325,12 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ssb_band_20.mousePressEvent = self.click_20_ssb
         self.ssb_band_15.mousePressEvent = self.click_15_ssb
         self.ssb_band_10.mousePressEvent = self.click_10_ssb
+        self.ssb_band_6.mousePressEvent = self.click_6_ssb
+        self.ssb_band_2.mousePressEvent = self.click_2_ssb
+        self.ssb_band_125.mousePressEvent = self.click_125_ssb
+        self.ssb_band_70cm.mousePressEvent = self.click_70cm_ssb
+        self.ssb_band_33cm.mousePressEvent = self.click_33cm_ssb
+        self.ssb_band_23cm.mousePressEvent = self.click_23cm_ssb
 
         self.rtty_band_160.mousePressEvent = self.click_160_rtty
         self.rtty_band_80.mousePressEvent = self.click_80_rtty
@@ -325,22 +338,12 @@ class MainWindow(QtWidgets.QMainWindow):
         self.rtty_band_20.mousePressEvent = self.click_20_rtty
         self.rtty_band_15.mousePressEvent = self.click_15_rtty
         self.rtty_band_10.mousePressEvent = self.click_10_rtty
-
-        self.readpreferences()
-        self.dbname = DATA_PATH + "/" + self.pref.get("current_database", "ham.db")
-        self.database = DataBase(self.dbname, WORKING_PATH)
-        self.station = self.database.fetch_station()
-        if self.station is None:
-            self.station = {}
-            self.edit_station_settings()
-            self.station = self.database.fetch_station()
-            if self.station is None:
-                self.station = {}
-        self.contact = self.database.empty_contact
-        self.current_op = self.station.get("Call", "")
-        self.make_op_dir()
-        self.read_cw_macros()
-        self.clearinputs()
+        self.rtty_band_6.mousePressEvent = self.click_6_rtty
+        self.rtty_band_2.mousePressEvent = self.click_2_rtty
+        self.rtty_band_125.mousePressEvent = self.click_125_rtty
+        self.rtty_band_70cm.mousePressEvent = self.click_70cm_rtty
+        self.rtty_band_33cm.mousePressEvent = self.click_33cm_rtty
+        self.rtty_band_23cm.mousePressEvent = self.click_23cm_rtty
 
         self.band_indicators_cw = {
             "160": self.cw_band_160,
@@ -349,6 +352,12 @@ class MainWindow(QtWidgets.QMainWindow):
             "20": self.cw_band_20,
             "15": self.cw_band_15,
             "10": self.cw_band_10,
+            "6": self.cw_band_6,
+            "2": self.cw_band_2,
+            "1.25": self.cw_band_125,
+            "70cm": self.cw_band_70cm,
+            "33cm": self.cw_band_33cm,
+            "23cm": self.cw_band_23cm,
         }
 
         self.band_indicators_ssb = {
@@ -358,6 +367,12 @@ class MainWindow(QtWidgets.QMainWindow):
             "20": self.ssb_band_20,
             "15": self.ssb_band_15,
             "10": self.ssb_band_10,
+            "6": self.ssb_band_6,
+            "2": self.ssb_band_2,
+            "1.25": self.ssb_band_125,
+            "70cm": self.ssb_band_70cm,
+            "33cm": self.ssb_band_33cm,
+            "23cm": self.ssb_band_23cm,
         }
 
         self.band_indicators_rtty = {
@@ -367,6 +382,12 @@ class MainWindow(QtWidgets.QMainWindow):
             "20": self.rtty_band_20,
             "15": self.rtty_band_15,
             "10": self.rtty_band_10,
+            "6": self.rtty_band_6,
+            "2": self.rtty_band_2,
+            "1.25": self.rtty_band_125,
+            "70cm": self.rtty_band_70cm,
+            "33cm": self.rtty_band_33cm,
+            "23cm": self.rtty_band_23cm,
         }
 
         self.all_mode_indicators = {
@@ -375,6 +396,22 @@ class MainWindow(QtWidgets.QMainWindow):
             "RTTY": self.band_indicators_rtty,
         }
 
+        self.readpreferences()
+        self.dbname = DATA_PATH + "/" + self.pref.get("current_database", "ham.db")
+        self.database = DataBase(self.dbname, WORKING_PATH)
+        self.station = self.database.fetch_station()
+        if self.station is None:
+            self.station = {}
+            self.edit_station_settings()
+            self.station = self.database.fetch_station()
+            if self.station is None:
+                self.station = {}
+        self.contact = self.database.empty_contact
+        self.current_op = self.station.get("Call", "")
+        self.make_op_dir()
+        self.read_cw_macros()
+        self.clearinputs()
+
         if self.pref.get("contest"):
             self.load_contest()
 
@@ -441,6 +478,30 @@ class MainWindow(QtWidgets.QMainWindow):
         """doc"""
         self.change_to_band_and_mode(10, "CW")
 
+    def click_6_cw(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(6, "CW")
+
+    def click_2_cw(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(2, "CW")
+
+    def click_125_cw(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(222, "CW")
+
+    def click_70cm_cw(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(432, "CW")
+
+    def click_33cm_cw(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(902, "CW")
+
+    def click_23cm_cw(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(1240, "CW")
+
     def click_160_ssb(self, _event) -> None:
         """doc"""
         self.change_to_band_and_mode(160, "SSB")
@@ -465,6 +526,30 @@ class MainWindow(QtWidgets.QMainWindow):
         """doc"""
         self.change_to_band_and_mode(10, "SSB")
 
+    def click_6_ssb(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(6, "SSB")
+
+    def click_2_ssb(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(2, "SSB")
+
+    def click_125_ssb(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(222, "SSB")
+
+    def click_70cm_ssb(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(432, "SSB")
+
+    def click_33cm_ssb(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(902, "SSB")
+
+    def click_23cm_ssb(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(1240, "SSB")
+
     def click_160_rtty(self, _event) -> None:
         """doc"""
         self.change_to_band_and_mode(160, "RTTY")
@@ -489,6 +574,30 @@ class MainWindow(QtWidgets.QMainWindow):
         """doc"""
         self.change_to_band_and_mode(10, "RTTY")
 
+    def click_6_rtty(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(6, "RTTY")
+
+    def click_2_rtty(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(2, "RTTY")
+
+    def click_125_rtty(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(222, "RTTY")
+
+    def click_70cm_rtty(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(432, "RTTY")
+
+    def click_33cm_rtty(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(902, "RTTY")
+
+    def click_23cm_rtty(self, _event) -> None:
+        """doc"""
+        self.change_to_band_and_mode(1240, "RTTY")
+
     def change_to_band_and_mode(self, band, mode) -> None:
         """doc"""
         if mode in ["CW", "SSB", "RTTY"]:
@@ -1932,6 +2041,22 @@ class MainWindow(QtWidgets.QMainWindow):
 
         self.show_command_buttons()
         self.show_CW_macros()
+
+        # If bands list is empty fill it with HF.
+        if self.pref.get("bands", []) == []:
+            self.pref["bands"] = ["160", "80", "40", "20", "15", "10"]
+
+        # Hide all the bands and then show only the wanted bands.
+        for _indicator in [
+            self.band_indicators_cw,
+            self.band_indicators_ssb,
+            self.band_indicators_rtty,
+        ]:
+            for _bandind in _indicator.values():
+                _bandind.hide()
+            for band_to_show in self.pref.get("bands", []):
+                if band_to_show in _indicator:
+                    _indicator[band_to_show].show()
         # self.show_band_mode()
 
     def watch_udp(self) -> None:

{not1mm-23.12.17 → not1mm-23.12.20}/not1mm/data/configuration.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>636</width>
+    <width>703</width>
     <height>395</height>
    </rect>
   </property>
@@ -1494,6 +1494,97 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="bands_tab">
+      <attribute name="title">
+       <string>Bands</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_9">
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="activate_2m">
+         <property name="text">
+          <string>2M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QCheckBox" name="activate_1dot25">
+         <property name="text">
+          <string>1.25M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QCheckBox" name="activate_40m">
+         <property name="text">
+          <string>40M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="activate_80m">
+         <property name="text">
+          <string>80M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QCheckBox" name="activate_160m">
+         <property name="text">
+          <string>160M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QCheckBox" name="activate_6m">
+         <property name="text">
+          <string>6M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QCheckBox" name="activate_20m">
+         <property name="text">
+          <string>20M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QCheckBox" name="activate_15m">
+         <property name="text">
+          <string>15M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QCheckBox" name="activate_10m">
+         <property name="text">
+          <string>10M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QCheckBox" name="activate_70cm">
+         <property name="text">
+          <string>70cm</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QCheckBox" name="activate_33cm">
+         <property name="text">
+          <string>33cm</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QCheckBox" name="activate_23cm">
+         <property name="text">
+          <string>23cm</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
@@ -1581,7 +1672,7 @@
   </property>
  </designerdata>
  <buttongroups>
-  <buttongroup name="buttonGroup_2"/>
   <buttongroup name="buttonGroup"/>
+  <buttongroup name="buttonGroup_2"/>
  </buttongroups>
 </ui>

{not1mm-23.12.17 → not1mm-23.12.20}/not1mm/data/main.ui

@@ -149,6 +149,66 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="cw_band_6">
+             <property name="text">
+              <string>6</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="cw_band_2">
+             <property name="text">
+              <string>2</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="cw_band_125">
+             <property name="text">
+              <string>1.25</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="cw_band_70cm">
+             <property name="text">
+              <string>70cm</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="cw_band_33cm">
+             <property name="text">
+              <string>33cm</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="cw_band_23cm">
+             <property name="text">
+              <string>23cm</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <spacer name="verticalSpacer">
              <property name="orientation">
@@ -169,7 +229,7 @@
          <widget class="QFrame" name="Band_Mode_Frame_SSB">
           <property name="minimumSize">
            <size>
-            <width>35</width>
+            <width>40</width>
             <height>0</height>
            </size>
           </property>
@@ -262,6 +322,66 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="ssb_band_6">
+             <property name="text">
+              <string>6</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="ssb_band_2">
+             <property name="text">
+              <string>2</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="ssb_band_125">
+             <property name="text">
+              <string>1.25</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="ssb_band_70cm">
+             <property name="text">
+              <string>70cm</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="ssb_band_33cm">
+             <property name="text">
+              <string>33cm</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="ssb_band_23cm">
+             <property name="text">
+              <string>23cm</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <spacer name="verticalSpacer_2">
              <property name="orientation">
@@ -282,7 +402,7 @@
          <widget class="QFrame" name="Band_Mode_Frame_RTTY">
           <property name="minimumSize">
            <size>
-            <width>33</width>
+            <width>40</width>
             <height>0</height>
            </size>
           </property>
@@ -375,6 +495,69 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="rtty_band_6">
+             <property name="text">
+              <string>6</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="rtty_band_2">
+             <property name="text">
+              <string>2</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="rtty_band_125">
+             <property name="text">
+              <string>1.25</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="rtty_band_70cm">
+             <property name="text">
+              <string>70cm</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="rtty_band_33cm">
+             <property name="text">
+              <string>33cm</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="rtty_band_23cm">
+             <property name="enabled">
+              <bool>true</bool>
+             </property>
+             <property name="text">
+              <string>23cm</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <spacer name="verticalSpacer_3">
              <property name="orientation">
@@ -636,7 +819,7 @@
             <item>
              <widget class="QSpinBox" name="cw_speed">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>