not1mm 24.5.25__tar.gz → 24.6.1__tar.gz

{not1mm-24.5.25 → not1mm-24.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.5.25
+Version: 24.6.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -182,10 +182,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
-- [24-5-25] Fixed points calculation for CQ WW WPX.
-- [24-5-10] Add sanity check for VFO freq.
-- [24-5-9] Add ICWC MST.
-- [24-5-1] Moved the voice keying into it's own thread.
+- [24-6-1] Added leading zeros to S/N's less than 100.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-24.5.25 → not1mm-24.6.1}/README.md

@@ -150,10 +150,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
-- [24-5-25] Fixed points calculation for CQ WW WPX.
-- [24-5-10] Add sanity check for VFO freq.
-- [24-5-9] Add ICWC MST.
-- [24-5-1] Moved the voice keying into it's own thread.
+- [24-6-1] Added leading zeros to S/N's less than 100.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/data/main.ui

@@ -1741,6 +1741,11 @@
    <property name="text">
     <string>HotKeys</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
   <action name="actionUpdate_MASTER_SCP">
    <property name="text">
@@ -1751,6 +1756,11 @@
    <property name="text">
     <string>Help</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
   <action name="actionUpdate_CTY">
    <property name="text">
@@ -1764,6 +1774,11 @@
    <property name="text">
     <string>Check Partial</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
   <action name="actionVFO">
    <property name="checkable">
@@ -1772,6 +1787,11 @@
    <property name="text">
     <string>VFO</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
   <action name="actionDark_Mode_2">
    <property name="checkable">
@@ -1780,6 +1800,11 @@
    <property name="text">
     <string>Dark Mode</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
  </widget>
  <resources/>

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.5.25"
+__version__ = "24.6.1"

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/arrl_10m.py

@@ -167,9 +167,9 @@ def predupe(self):
 def prefill(self):
     """Fill sentnr"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
 
     exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
     field = self.field3.findChild(QtWidgets.QLineEdit)

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/arrl_ss_cw.py

@@ -126,9 +126,9 @@ def predupe(self):
 def prefill(self):
     """Fill SentNR"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
     field = self.field3.findChild(QtWidgets.QLineEdit)
     if len(field.text()) == 0:
         field.setText(serial_nr)

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/arrl_ss_phone.py

@@ -126,9 +126,9 @@ def predupe(self):
 def prefill(self):
     """Fill SentNR"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
     field = self.field3.findChild(QtWidgets.QLineEdit)
     if len(field.text()) == 0:
         field.setText(serial_nr)

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/arrl_vhf_jan.py

@@ -156,9 +156,9 @@ def predupe(self):
 def prefill(self):
     """Fill sentnr"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
 
     exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
     field = self.field3.findChild(QtWidgets.QLineEdit)

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/arrl_vhf_jun.py

@@ -124,9 +124,9 @@ def predupe(self):
 def prefill(self):
     """Fill sentnr"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
 
     exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
     field = self.field3.findChild(QtWidgets.QLineEdit)

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/arrl_vhf_sep.py

@@ -124,9 +124,9 @@ def predupe(self):
 def prefill(self):
     """Fill sentnr"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
 
     exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
     field = self.field3.findChild(QtWidgets.QLineEdit)

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/canada_day.py

@@ -155,9 +155,9 @@ def prefill(self):
     #     self.other_2.setText(str(self.contact.get("ZN", "")))
 
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
 
     exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
     field = self.field3.findChild(QtWidgets.QLineEdit)

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/cq_wpx_cw.py

@@ -157,9 +157,9 @@ def predupe(self):  # pylint: disable=unused-argument
 def prefill(self):
     """Fill SentNR"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
     field = self.field3.findChild(QtWidgets.QLineEdit)
     if len(field.text()) == 0:
         field.setText(serial_nr)

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/cq_wpx_ssb.py

@@ -122,9 +122,9 @@ def predupe(self):  # pylint: disable=unused-argument
 def prefill(self):
     """Fill SentNR"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
     field = self.field3.findChild(QtWidgets.QLineEdit)
     if len(field.text()) == 0:
         field.setText(serial_nr)
@@ -135,35 +135,39 @@ def points(self):
     result = self.cty_lookup(self.station.get("Call", ""))
     if result:
         for item in result.items():
-            mycountry = item[1].get("entity", "")
-            mycontinent = item[1].get("continent", "")
+            my_country = item[1].get("entity", "")
+            my_continent = item[1].get("continent", "")
     result = self.cty_lookup(self.contact.get("Call", ""))
     band = int(int(float(self.contact.get("Freq", 0))) / 1000)
     if result:
         for item in result.items():
-            entity = item[1].get("entity", "")
-            continent = item[1].get("continent", "")
+            their_country = item[1].get("entity", "")
+            their_continent = item[1].get("continent", "")
 
-            # If both are in North America
-            if mycontinent == "NA" and continent == "NA":
+            # Different Continent
+            if my_continent != their_continent:
                 if band in [28, 21, 14]:
-                    return 2
-                return 4
+                    return 3
+                return 6
 
-            # Not NA, Both in same country
-            if mycountry.upper() == entity.upper():
+            # Both in same country
+            if my_country.upper() == their_country.upper():
                 return 1
 
-            # Same Continent
-            if mycontinent == continent:
+            # Below Same Continent Different Country
+
+            # If in North America
+            if my_continent == "NA":
+                if band in [28, 21, 14]:
+                    return 2
+                return 4
+
+            # Non NA
+            if my_continent != "NA":
                 if band in [28, 21, 14]:
                     return 1
                 return 2
-
-            # Different Continent
-            if band in [28, 21, 14]:
-                return 3
-            return 6
+    # Something wrong
     return 0
 
 

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/icwc_mst.py

@@ -138,9 +138,9 @@ def predupe(self):  # pylint: disable=unused-argument
 def prefill(self):
     """Fill SentNR"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
     field = self.sent
     if len(field.text()) == 0:
         field.setText(serial_nr)

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/jidx_cw.py

@@ -152,9 +152,9 @@ def prefill(self):
     SentExchange = self.contest_settings.get("SentExchange", "")
     if "#" in SentExchange:
         result = self.database.get_serial()
-        serial_nr = str(result.get("serial_nr", "1"))
+        serial_nr = str(result.get("serial_nr", "1")).zfill(3)
         if serial_nr == "None":
-            serial_nr = "1"
+            serial_nr = "001"
         SentExchange.replace("#", str(serial_nr))
 
     field = self.field3.findChild(QtWidgets.QLineEdit)

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/plugins/jidx_ph.py

@@ -123,9 +123,9 @@ def prefill(self):
     SentExchange = self.contest_settings.get("SentExchange", "")
     if "#" in SentExchange:
         result = self.database.get_serial()
-        serial_nr = str(result.get("serial_nr", "1"))
+        serial_nr = str(result.get("serial_nr", "1")).zfill(3)
         if serial_nr == "None":
-            serial_nr = "1"
+            serial_nr = "001"
         SentExchange.replace("#", str(serial_nr))
 
     field = self.field3.findChild(QtWidgets.QLineEdit)

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.5.25
+Version: 24.6.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -182,10 +182,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
-- [24-5-25] Fixed points calculation for CQ WW WPX.
-- [24-5-10] Add sanity check for VFO freq.
-- [24-5-9] Add ICWC MST.
-- [24-5-1] Moved the voice keying into it's own thread.
+- [24-6-1] Added leading zeros to S/N's less than 100.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-24.5.25 → not1mm-24.6.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "24.5.25"
+version = "24.6.1"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"

{not1mm-24.5.25 → not1mm-24.6.1}/not1mm/__main__.py

@@ -510,12 +510,12 @@ class MainWindow(QtWidgets.QMainWindow):
         self.current_op = self.station.get("Call", "")
         self.voice_process.current_op = self.current_op
         self.make_op_dir()
-        self.read_cw_macros()
+
         self.clearinputs()
 
         if self.pref.get("contest"):
             self.load_contest()
-
+        self.read_cw_macros()
         self.actionLog_Window.setChecked(self.pref.get("logwindow", False))
         if self.log_window:
             self.log_window.close()