not1mm 24.1.15__tar.gz → 24.1.16__tar.gz

{not1mm-24.1.15 → not1mm-24.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.1.15
+Version: 24.1.16
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -160,10 +160,12 @@ I wish to thank those who've contributed to the project.
 - NAQP SSB
 - Phone Weekly Test
 - RAC Canada Day
+- Stew Perry Topband
 - Winter Field Day
 
 ## Recent Changes
 
+- [24-1-16] Added Stew Perry Topband.
 - [24-1-15] Added the Phone Weekly Test.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-24.1.15 → not1mm-24.1.16}/README.md

@@ -131,10 +131,12 @@ I wish to thank those who've contributed to the project.
 - NAQP SSB
 - Phone Weekly Test
 - RAC Canada Day
+- Stew Perry Topband
 - Winter Field Day
 
 ## Recent Changes
 
+- [24-1-16] Added Stew Perry Topband.
 - [24-1-15] Added the Phone Weekly Test.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-24.1.15 → not1mm-24.1.16}/not1mm/data/new_contest.ui

@@ -317,6 +317,11 @@
        <string>PHONE WEEKLY TEST</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>STEW PERRY TOPBAND</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>WINTER FIELD DAY</string>
@@ -331,7 +336,7 @@
      </property>
      <property name="time">
       <time>
-       <hour>16</hour>
+       <hour>0</hour>
        <minute>0</minute>
        <second>0</second>
       </time>

not1mm-24.1.16/not1mm/lib/version.py

@@ -0,0 +1,2 @@
+"""It's the version"""
+__version__ = "24.1.16"

{not1mm-24.1.15 → not1mm-24.1.16}/not1mm/plugins/stew_perry_topband.py

@@ -35,6 +35,7 @@ from pathlib import Path
 from PyQt5 import QtWidgets
 from not1mm.lib.plugin_common import gen_adif, get_points
 from not1mm.lib.version import __version__
+from not1mm.lib.ham_utility import distance
 
 logger = logging.getLogger("__main__")
 
@@ -49,7 +50,6 @@ columns = [
     "Freq",
     "Mode",
     "Exchange1",
-    "Sect",
     "PTS",
 ]
 
@@ -69,16 +69,13 @@ def init_contest(self):
 
 def interface(self):
     """Setup user interface"""
-    self.field1.hide()
-    self.field2.hide()
+    self.field1.show()
+    self.field2.show()
     self.field3.show()
-    self.field4.show()
+    self.field4.hide()
     label = self.field3.findChild(QtWidgets.QLabel)
-    label.setText("Class")
-    self.field3.setAccessibleName("Class")
-    label = self.field4.findChild(QtWidgets.QLabel)
-    label.setText("Section")
-    self.field4.setAccessibleName("Section")
+    label.setText("Grid")
+    self.field3.setAccessibleName("Grid")
 
 
 def reset_label(self):
@@ -95,23 +92,17 @@ def set_tab_next(self):
         self.field2.findChild(QtWidgets.QLineEdit): self.field3.findChild(
             QtWidgets.QLineEdit
         ),
-        self.field3.findChild(QtWidgets.QLineEdit): self.field4.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field4.findChild(QtWidgets.QLineEdit): self.callsign,
+        self.field3.findChild(QtWidgets.QLineEdit): self.callsign,
     }
 
 
 def set_tab_prev(self):
     """Set TAB Advances"""
     self.tab_prev = {
-        self.callsign: self.field4.findChild(QtWidgets.QLineEdit),
+        self.callsign: self.field3.findChild(QtWidgets.QLineEdit),
         self.field1.findChild(QtWidgets.QLineEdit): self.callsign,
         self.field2.findChild(QtWidgets.QLineEdit): self.callsign,
         self.field3.findChild(QtWidgets.QLineEdit): self.callsign,
-        self.field4.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-            QtWidgets.QLineEdit
-        ),
     }
 
 
@@ -120,7 +111,6 @@ def set_contact_vars(self):
     self.contact["SNT"] = self.sent.text()
     self.contact["RCV"] = self.receive.text()
     self.contact["Exchange1"] = self.other_1.text().upper()
-    self.contact["Sect"] = self.other_2.text().upper()
 
 
 def predupe(self):
@@ -133,19 +123,21 @@ def prefill(self):
 
 def points(self):
     """Calc point"""
-    _mode = self.contact.get("Mode", "")
-    if _mode in "SSB, USB, LSB, FM, AM":
-        return 1
-    if _mode in "CW, RTTY":
-        return 2
-    return 0
+    _points = 1
+    _kilometers = 0
+    _their_grid = self.other_1.text().upper()
+    _kilometers = distance(self.station.get("GridSquare", ""), _their_grid)
+    if _kilometers > 500:
+        _points = _points + int(_kilometers / 500)
+    if self.contest_settings.get("PowerCategory", "") == "QRP":
+        _points = _points * 4
+    if self.contest_settings.get("PowerCategory", "") == "LOW":
+        _points = _points * 2
+    return _points
 
 
 def show_mults(self):
     """Return display string for mults"""
-    result = self.database.get_unique_band_and_mode()
-    if result:
-        return int(result.get("mult", 0))
     return 0
 
 
@@ -160,11 +152,7 @@ def show_qso(self):
 def calc_score(self):
     """Return calculated score"""
     _points = get_points(self)
-    _mults = show_mults(self)
-    _power_mult = 1
-    if self.contest_settings.get("PowerCategory", "") == "QRP":
-        _power_mult = 2
-    return _points * _power_mult * _mults
+    return _points
 
 
 def adif(self):

{not1mm-24.1.15 → not1mm-24.1.16}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.1.15
+Version: 24.1.16
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -160,10 +160,12 @@ I wish to thank those who've contributed to the project.
 - NAQP SSB
 - Phone Weekly Test
 - RAC Canada Day
+- Stew Perry Topband
 - Winter Field Day
 
 ## Recent Changes
 
+- [24-1-16] Added Stew Perry Topband.
 - [24-1-15] Added the Phone Weekly Test.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-24.1.15 → not1mm-24.1.16}/pyproject.toml

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

not1mm-24.1.15/not1mm/lib/version.py

@@ -1,2 +0,0 @@
-"""It's the version"""
-__version__ = "24.1.15"