not1mm 24.8.20__tar.gz → 24.8.27__tar.gz

{not1mm-24.8.20 → not1mm-24.8.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.8.20
+Version: 24.8.27
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -69,6 +69,7 @@ Requires-Dist: Levenshtein
       - [Fedora 38 \& 39](#fedora-38--39)
       - [Fedora 40](#fedora-40)
       - [Manjaro](#manjaro)
+      - [Mint](#mint)
     - [Python, PyPI, pip and pipx](#python-pypi-pip-and-pipx)
       - [Bootstrapping pipx](#bootstrapping-pipx)
       - [Installing with pipx](#installing-with-pipx)
@@ -209,6 +210,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - CQ World Wide CW
 - CQ World Wide SSB
 - CWOps CWT
+- Helvetia
 - IARU HF
 - ICWC MST
 - Japan International DX CW
@@ -223,6 +225,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-8-27] Added Helvetia contest.
+- [24-8-22] Add loading splash screen.
 - [24-8-20] Added K1USN Slow Speed Test
 - [24-8-17-1] Did an oops. Fixed the oops.
 - [24-8-17] Removed some cruft. Made dockable widgets not floatable since Wayland breaks this.
@@ -240,8 +244,14 @@ clue me into the black magic needed to get it to work.
 
 ### Prerequisites
 
-not1mm requires Python 3.9+, PyQt6 and libportaudio2. You should install these
-through your distribution's package manager before continuing.
+not1mm requires:
+
+- Python 3.9+
+- PyQt6
+- libportaudio2
+- libxcb-cursor0 (maybe... Depends on the distro)
+ 
+You should install these through your distribution's package manager before continuing.
 
 ### Common installation recipes for Ubuntu and Fedora
 
@@ -318,6 +328,22 @@ pip install not1mm
 pamac build not1mm-git 
 ```
 
+</details>
+
+<details>
+
+<summary><b>Mint 22</b></summary>
+
+#### Mint
+
+```bash
+sudo apt install python3-pip
+sudo apt install pipx
+sudo apt install libxcb-cursor0
+pipx install not1mm
+pipx ensurepath
+```
+
 </details>
 <br>
 
@@ -429,7 +455,9 @@ qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it
 This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.
 ```
 
-To avoid this you can export an environment variable and launch the app like this:
+You can use your package manager to load libxcb-cursor0.
+
+If that's not an option, you can export an environment variable and launch the app like this:
 
 `mbridak@vm:~$ export QT_QPA_PLATFORM=wayland; not1mm`
 

{not1mm-24.8.20 → not1mm-24.8.27}/README.md

@@ -38,6 +38,7 @@
       - [Fedora 38 \& 39](#fedora-38--39)
       - [Fedora 40](#fedora-40)
       - [Manjaro](#manjaro)
+      - [Mint](#mint)
     - [Python, PyPI, pip and pipx](#python-pypi-pip-and-pipx)
       - [Bootstrapping pipx](#bootstrapping-pipx)
       - [Installing with pipx](#installing-with-pipx)
@@ -178,6 +179,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - CQ World Wide CW
 - CQ World Wide SSB
 - CWOps CWT
+- Helvetia
 - IARU HF
 - ICWC MST
 - Japan International DX CW
@@ -192,6 +194,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-8-27] Added Helvetia contest.
+- [24-8-22] Add loading splash screen.
 - [24-8-20] Added K1USN Slow Speed Test
 - [24-8-17-1] Did an oops. Fixed the oops.
 - [24-8-17] Removed some cruft. Made dockable widgets not floatable since Wayland breaks this.
@@ -209,8 +213,14 @@ clue me into the black magic needed to get it to work.
 
 ### Prerequisites
 
-not1mm requires Python 3.9+, PyQt6 and libportaudio2. You should install these
-through your distribution's package manager before continuing.
+not1mm requires:
+
+- Python 3.9+
+- PyQt6
+- libportaudio2
+- libxcb-cursor0 (maybe... Depends on the distro)
+ 
+You should install these through your distribution's package manager before continuing.
 
 ### Common installation recipes for Ubuntu and Fedora
 
@@ -287,6 +297,22 @@ pip install not1mm
 pamac build not1mm-git 
 ```
 
+</details>
+
+<details>
+
+<summary><b>Mint 22</b></summary>
+
+#### Mint
+
+```bash
+sudo apt install python3-pip
+sudo apt install pipx
+sudo apt install libxcb-cursor0
+pipx install not1mm
+pipx ensurepath
+```
+
 </details>
 <br>
 
@@ -398,7 +424,9 @@ qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it
 This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.
 ```
 
-To avoid this you can export an environment variable and launch the app like this:
+You can use your package manager to load libxcb-cursor0.
+
+If that's not an option, you can export an environment variable and launch the app like this:
 
 `mbridak@vm:~$ export QT_QPA_PLATFORM=wayland; not1mm`
 

{not1mm-24.8.20 → not1mm-24.8.27}/not1mm/__main__.py

@@ -35,9 +35,9 @@ except OSError as exception:
     print("portaudio is not installed")
     sd = None
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
-from PyQt6.QtCore import QDir, Qt, QThread, QSettings
-from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor
-from PyQt6.QtWidgets import QFileDialog
+from PyQt6.QtCore import QDir, Qt, QThread, QSettings, QCoreApplication
+from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor, QPixmap
+from PyQt6.QtWidgets import QFileDialog, QSplashScreen
 
 from not1mm.lib.about import About
 from not1mm.lib.cwinterface import CW
@@ -3398,12 +3398,24 @@ logging.basicConfig(
 logging.getLogger("PyQt6.uic.uiparser").setLevel("INFO")
 logging.getLogger("PyQt6.uic.properties").setLevel("INFO")
 app = QtWidgets.QApplication(sys.argv)
+
+pixmap = QPixmap(f"{os.fspath(fsutils.APP_DATA_PATH)}/splash.png")
+splash = QSplashScreen(pixmap)
+splash.show()
+app.processEvents()
+splash.showMessage(
+    "Starting Up",
+    alignment=Qt.AlignmentFlag.AlignBottom | Qt.AlignmentFlag.AlignCenter,
+    color=QColor(255, 255, 0),
+)
+QCoreApplication.processEvents()
+
 families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
 logger.info(f"font families {families}")
 window = MainWindow()
 window.callsign.setFocus()
 window.show()
-
+splash.finish(window)
 
 if __name__ == "__main__":
     run()

{not1mm-24.8.20 → not1mm-24.8.27}/not1mm/data/new_contest.ui

@@ -297,6 +297,11 @@
        <string>CWT</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>HELVETIA</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>ICWC MST</string>
@@ -356,7 +361,7 @@
      </property>
      <property name="time">
       <time>
-       <hour>16</hour>
+       <hour>0</hour>
        <minute>0</minute>
        <second>0</second>
       </time>

{not1mm-24.8.20 → not1mm-24.8.27}/not1mm/lib/database.py

@@ -567,7 +567,7 @@ class DataBase:
     def fetch_country_band_count(self) -> dict:
         """
         returns dict with count of unique NR.
-        {nr_count: count}
+        {cb_count: count}
         """
         try:
             with sqlite3.connect(self.database) as conn:
@@ -581,6 +581,23 @@ class DataBase:
             logger.debug("%s", exception)
             return {}
 
+    def fetch_country_count(self) -> dict:
+        """
+        Fetch count of unique countries
+        {dxcc_count: count}
+        """
+        try:
+            with sqlite3.connect(self.database) as conn:
+                conn.row_factory = self.row_factory
+                cursor = conn.cursor()
+                cursor.execute(
+                    f"select count(DISTINCT(CountryPrefix)) as dxcc_count from dxlog where ContestNR = {self.current_contest};"
+                )
+                return cursor.fetchone()
+        except sqlite3.OperationalError as exception:
+            logger.debug("%s", exception)
+            return {}
+
     def fetch_arrldx_country_band_count(self) -> dict:
         """
         returns dict with count of unique NR.
@@ -883,6 +900,20 @@ class DataBase:
             logger.debug("%s", exception)
             return {}
 
+    def fetch_mult2_count(self) -> dict:
+        """return QSO count"""
+        try:
+            with sqlite3.connect(self.database) as conn:
+                conn.row_factory = self.row_factory
+                cursor = conn.cursor()
+                cursor.execute(
+                    f"select count(*) as count from dxlog where IsMultiplier2 = 1 and ContestNR = {self.current_contest};"
+                )
+                return cursor.fetchone()
+        except sqlite3.OperationalError as exception:
+            logger.debug("%s", exception)
+            return {}
+
     def fetch_qso_count(self) -> dict:
         """return QSO count"""
         try:

{not1mm-24.8.20 → not1mm-24.8.27}/not1mm/lib/ham_utility.py

@@ -373,3 +373,29 @@ def distance_with_latlon(grid1: str, lat2: float, lon2: float) -> float:
     logger.debug("lat1:%d lon1:%d lat2:%d lon2:%d", lat1, lon1, lat2, lon2)
     # lat2, lon2 = gridtolatlon(grid2)
     return round(haversine(lon1, lat1, lon2, lat2))
+
+
+def parse_udc(filename: str) -> dict:
+    """
+    simply parses a n1mm style udc file and returns a dict with key value pairs.
+    """
+
+    udc_contest = {}
+    the_good_stuff = False
+
+    try:
+        with open(filename, "r", encoding="utf-8") as file_descriptor:
+            for line in file_descriptor:
+                if "[CONTEST]" in line.upper():
+                    the_good_stuff = True
+                    continue
+                if "=" in line and the_good_stuff is True:
+                    try:
+                        key, value = line.split("=")
+                        udc_contest[key.strip()] = value.strip()
+                    except ValueError:
+                        ...
+    except FileNotFoundError:
+        logger.debug("UDC file not found.")
+        return {}
+    return udc_contest

{not1mm-24.8.20 → not1mm-24.8.27}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.8.20"
+__version__ = "24.8.27"