not1mm 25.3.23__py3-none-any.whl → 25.3.25__py3-none-any.whl

not1mm/data/statistics.ui

@@ -10,34 +10,18 @@
     <height>192</height>
    </rect>
   </property>
+  <property name="font">
+   <font>
+    <family>JetBrains Mono ExtraLight</family>
+   </font>
+  </property>
   <property name="windowTitle">
    <string>Stats</string>
   </property>
   <widget class="QWidget" name="dockWidgetContents">
    <layout class="QGridLayout" name="gridLayout">
     <item row="1" column="2">
-     <widget class="QTableWidget" name="tableWidget">
-      <column>
-       <property name="text">
-        <string>Band</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>QSO's</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Calls</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Points</string>
-       </property>
-      </column>
-     </widget>
+     <widget class="QTableWidget" name="tableWidget"/>
     </item>
    </layout>
   </widget>

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.3.23"
+__version__ = "25.3.25"

not1mm/logwindow.py

@@ -4,7 +4,7 @@ not1mm Contest logger
 Email: michael.bridak@gmail.com
 GPL V3
 Class: LogWindow
-Purpose: Onscreen widget to show and edit logged contacts. 
+Purpose: Onscreen widget to show and edit logged contacts.
 """
 # pylint: disable=no-name-in-module, unused-import, no-member, c-extension-no-member
 # pylint: disable=logging-fstring-interpolation, too-many-lines
@@ -164,6 +164,11 @@ class LogWindow(QDockWidget):
             log.verticalHeader().setVisible(False)
 
         self.get_log()
+        self.generalLog.resizeColumnsToContents()
+        self.generalLog.resizeRowsToContents()
+        self.focusedLog.resizeColumnsToContents()
+        self.focusedLog.resizeRowsToContents()
+
         cmd = {}
         cmd["cmd"] = "GETCOLUMNS"
         self.message.emit(cmd)
@@ -927,6 +932,10 @@ class LogWindow(QDockWidget):
             )
         self.generalLog.blockSignals(False)
         self.focusedLog.blockSignals(False)
+        self.generalLog.resizeColumnsToContents()
+        self.generalLog.resizeRowsToContents()
+        self.focusedLog.resizeColumnsToContents()
+        self.focusedLog.resizeRowsToContents()
 
     def show_like_calls(self, call: str) -> None:
         """

not1mm/statistics.py

@@ -6,9 +6,9 @@ import os
 
 from PyQt6 import uic, QtWidgets
 from PyQt6.QtWidgets import QDockWidget
+from PyQt6.QtCore import pyqtSignal, QTimer
 
-# from PyQt6.QtGui import QColorConstants, QPalette, QColor
-from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtGui import QColorConstants, QPalette, QColor
 
 import not1mm.fsutils as fsutils
 from not1mm.lib.database import DataBase
@@ -43,6 +43,9 @@ class StatsWindow(QDockWidget):
         self.database = DataBase(self.dbname, fsutils.APP_DATA_PATH)
         self.database.current_contest = self.pref.get("contest", 0)
         uic.loadUi(fsutils.APP_DATA_PATH / "statistics.ui", self)
+        self.timer = QTimer()
+        self.timer.timeout.connect(self.get_run_and_total_qs)
+        self.timer.start(5000)
 
     def msg_from_main(self, packet):
         """"""
@@ -72,6 +75,46 @@ class StatsWindow(QDockWidget):
     def setDarkMode(self, dark: bool) -> None:
         """Forces a darkmode palette."""
 
+        if dark:
+            darkPalette = QPalette()
+            darkColor = QColor(56, 56, 56)
+            disabledColor = QColor(127, 127, 127)
+            darkPalette.setColor(QPalette.ColorRole.Window, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.WindowText, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.Base, QColor(45, 45, 45))
+            darkPalette.setColor(QPalette.ColorRole.AlternateBase, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.Text, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.Button, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.ButtonText, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.BrightText, QColorConstants.Red)
+            darkPalette.setColor(QPalette.ColorRole.Link, QColor(42, 130, 218))
+            darkPalette.setColor(QPalette.ColorRole.Highlight, QColor(42, 130, 218))
+            darkPalette.setColor(
+                QPalette.ColorRole.HighlightedText, QColorConstants.Black
+            )
+            darkPalette.setColor(
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.ButtonText,
+                disabledColor,
+            )
+            darkPalette.setColor(
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.HighlightedText,
+                disabledColor,
+            )
+            darkPalette.setColor(
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.Text,
+                disabledColor,
+            )
+
+            self.setPalette(darkPalette)
+            self.current_palette = darkPalette
+        else:
+            palette = self.style().standardPalette()
+            self.setPalette(palette)
+            self.current_palette = palette
+
     def load_pref(self) -> None:
         """
         Load preference file to get current db filename and sets the initial darkmode state.
@@ -100,9 +143,13 @@ class StatsWindow(QDockWidget):
 
     def get_run_and_total_qs(self):
         """get numbers"""
+        if self.active is False:
+            return
         self.tableWidget.clear()
-        self.tableWidget.setColumnCount(4)
-        self.tableWidget.setHorizontalHeaderLabels(["BAND", "QSO", "CALLS", "POINTS"])
+        self.tableWidget.setColumnCount(7)
+        self.tableWidget.setHorizontalHeaderLabels(
+            ["BAND", "QSO", "CALLS", "CW", "PH", "DI", "PTS"]
+        )
         self.tableWidget.verticalHeader().setVisible(False)
         self.tableWidget.setEditTriggers(
             QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers
@@ -117,33 +164,57 @@ class StatsWindow(QDockWidget):
         for band in result:
             query = f"select count(*) as qs, count(DISTINCT(Call)) as calls, sum(Points) as points from DXLOG where ContestNR = {self.database.current_contest} and Band = '{band['band']}';"
             result = self.database.exec_sql(query)
-            item = QtWidgets.QTableWidgetItem(str(band["band"]))
+            item = QtWidgets.QTableWidgetItem(str(band.get("band", "")))
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 0, item)
-            item = QtWidgets.QTableWidgetItem(str(result["qs"]))
+            item = QtWidgets.QTableWidgetItem(str(result.get("qs", "0")))
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 1, item)
-            item = QtWidgets.QTableWidgetItem(str(result["calls"]))
+            item = QtWidgets.QTableWidgetItem(str(result.get("calls", "0")))
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 2, item)
-            item = QtWidgets.QTableWidgetItem(str(result["points"]))
+            item = QtWidgets.QTableWidgetItem(str(result.get("points", "0")))
+            item.setTextAlignment(0x0002)
+            self.tableWidget.setItem(row, 6, item)
+            query = f"select sum(sortedmode.mode == 'CW') as CW, sum(sortedmode.mode == 'PH') as PH, sum(sortedmode.mode == 'DI') as DI from (select CASE Mode WHEN 'LSB' THEN 'PH' WHEN 'USB' THEN 'PH' WHEN 'CW' THEN 'CW' WHEN 'RTTY' THEN 'DI' ELSE 'OTHER' END mode from DXLOG where ContestNR = {self.database.current_contest} and Band = '{band['band']}') as sortedmode;"
+            result = self.database.exec_sql(query)
+            item = QtWidgets.QTableWidgetItem(str(result.get("CW", "0")))
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 3, item)
+            item = QtWidgets.QTableWidgetItem(str(result.get("PH", "0")))
+            item.setTextAlignment(0x0002)
+            self.tableWidget.setItem(row, 4, item)
+            item = QtWidgets.QTableWidgetItem(str(result.get("DI", "0")))
+            item.setTextAlignment(0x0002)
+            self.tableWidget.setItem(row, 5, item)
+
             row += 1
         query = f"select count(*) as qs, count(DISTINCT(Call)) as calls, sum(Points) as points from DXLOG where ContestNR = {self.database.current_contest};"
         result = self.database.exec_sql(query)
         item = QtWidgets.QTableWidgetItem("TOTAL")
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 0, item)
-        item = QtWidgets.QTableWidgetItem(str(result["qs"]))
+        item = QtWidgets.QTableWidgetItem(str(result.get("qs", "0")))
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 1, item)
-        item = QtWidgets.QTableWidgetItem(str(result["calls"]))
+        item = QtWidgets.QTableWidgetItem(str(result.get("calls", "0")))
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 2, item)
-        item = QtWidgets.QTableWidgetItem(str(result["points"]))
+        item = QtWidgets.QTableWidgetItem(str(result.get("points", "0")))
+        item.setTextAlignment(0x0002)
+        self.tableWidget.setItem(row, 6, item)
+
+        query = f"select sum(sortedmode.mode == 'CW') as CW, sum(sortedmode.mode == 'PH') as PH, sum(sortedmode.mode == 'DI') as DI from (select CASE Mode WHEN 'LSB' THEN 'PH' WHEN 'USB' THEN 'PH' WHEN 'CW' THEN 'CW' WHEN 'RTTY' THEN 'DI' ELSE 'OTHER' END mode from DXLOG where ContestNR = {self.database.current_contest}) as sortedmode;"
+        result = self.database.exec_sql(query)
+        item = QtWidgets.QTableWidgetItem(str(result.get("CW", "0")))
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 3, item)
+        item = QtWidgets.QTableWidgetItem(str(result.get("PH", "0")))
+        item.setTextAlignment(0x0002)
+        self.tableWidget.setItem(row, 4, item)
+        item = QtWidgets.QTableWidgetItem(str(result.get("DI", "0")))
+        item.setTextAlignment(0x0002)
+        self.tableWidget.setItem(row, 5, item)
         self.tableWidget.resizeColumnsToContents()
         self.tableWidget.resizeRowsToContents()
 

{not1mm-25.3.23.dist-info → not1mm-25.3.25.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.3.23
+Version: 25.3.25
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
-License-Expression: GPL-3.0-or-later
+License: GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/mbridak/not1mm
 Project-URL: Bug Tracker, https://github.com/mbridak/not1mm/issues
 Classifier: Programming Language :: Python :: 3
@@ -247,6 +247,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-3-25] Use safer dict key access in the stats window.
+- [25-3-24] Add CW, PH, DI counts to the statistics window.
 - [25-3-23] Add a statistics window.
 - [25-3-19-1] Add EA His Maj King of Spain SSB.
 - [25-3-19] Merged PR from @DD5ML Adding DARC VHF.

{not1mm-25.3.23.dist-info → not1mm-25.3.25.dist-info}/RECORD

@@ -3,12 +3,12 @@ not1mm/__main__.py,sha256=TKA6hSE2A2SZpXvMySGXNVgfE3UKhvzSC8tSzzVZTBs,151537
 not1mm/bandmap.py,sha256=mdSK6oj8plEmr6WVYkzPTCfsHWKl9lea3R14cmRsAI4,31531
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
-not1mm/logwindow.py,sha256=TvpzQTNB92hISlUO3iWBqtlPmlebdhOkAArx0DNGcOs,43966
+not1mm/logwindow.py,sha256=QNKmWDw-k4G6Qugvb-y8dlz9LoO0c-u-XlTowH7h8vA,44354
 not1mm/lookupservice.py,sha256=GkY_qHZfrW6XHf8upIoaG4hCFqm0fg6Ganu9ConGrIc,2628
 not1mm/radio.py,sha256=_b-tSFuDLoBKnABxrsafGQu2p33U-KOubY7-qgLV2yg,5408
 not1mm/ratewindow.py,sha256=UVkQt0nSB2COQlJQV6tFtsz4mP7d-Wj9jcjqvZw934Q,9891
 not1mm/rtc_service.py,sha256=axAwnCBuTr-QL0YwXtWvg9tjwhcFsiiEZFgFjOofX6k,2816
-not1mm/statistics.py,sha256=UW9FKFkJArqSnkrfMKnSi0eL-Nj5iUcIYBffeUtz8NU,5717
+not1mm/statistics.py,sha256=QbzHck56doO2Bi7b_UHWeHtOANBzRlotAG0sp5VaBU4,9597
 not1mm/test.py,sha256=RN71m2S9MPIOJMaoCi0wZhwEhpEZunvtosZxaKahRB4,101
 not1mm/vfo.py,sha256=ggPyWtxMbdSE5RwdK0nDRwDNqOxdpb_pvnzZdbzZVQE,11136
 not1mm/voice_keying.py,sha256=HZImqC5NgnyW2nknNYQ3b7I8-6S_hxpq5G4RcIRXn_k,3005
@@ -47,7 +47,7 @@ not1mm/data/rttymacros.txt,sha256=FQ2BnAChXF5w-tzmMnBOE8IgvviAEsd3cmmz4b8GOPk,46
 not1mm/data/settings.ui,sha256=rZmhUjFAyCA8B-cd4Ljrvz5qC3NKy6S3feYVh5WX-tw,40084
 not1mm/data/splash.png,sha256=85_BQotR1q24uCthrKm4SB_6ZOMwRjR-Jdp1XBHSTyg,5368
 not1mm/data/ssbmacros.txt,sha256=Q7MrkaBntbeg4yQSoMv3NLoM24V4y_RVati3_wmb0mY,464
-not1mm/data/statistics.ui,sha256=8hW3SxJzB4nsxo1DcJTF9oH4dPjvxo27qutAQsgl0dY,1073
+not1mm/data/statistics.ui,sha256=JRpf-On3FsW-halZsfo0QOaiSi1m4tW9HWD3dAgLp0c,722
 not1mm/data/vfo.ui,sha256=-fmFMJLPDz0jmsOdCljL7vfmlAQgwyHkGZjomlIN3gc,2076
 not1mm/data/phonetics/0.wav,sha256=0OpYiR-3MK6fVHE6MB-HeOxSAPiDNMjqvx5JcIZtsQk,42590
 not1mm/data/phonetics/1.wav,sha256=OEAavA8cfVxFZwaT0HY9Wg9NAGEPKBhwhEdzGXkQs_U,30248
@@ -118,7 +118,7 @@ not1mm/lib/plugin_common.py,sha256=D1OBjyLmX7zuSPqgTCmHwXzAKA12J_zTQItvyIem-4Y,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=mXffn8Xaj5KATPQinNBR0V5DbHWQPsRfh24_axWGYuk,15254
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=vU3m0t16VI6NkKZdHZ_j-a-BN1_FKkNq--xKAoyB-bM,48
+not1mm/lib/version.py,sha256=iGX9cXipuh8cDIlxf45x_-fcEbFJuZ-zyOC--oh47QM,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=P63dEhRmvsEV7ixHYg-qhs5zzj0_DJXjjPHQBQr8Wwg,14731
 not1mm/plugins/10_10_spring_cw.py,sha256=S_z-KbExH4_kfRbKo07zM-iVlJUKxFwzbm6LRnXYyNU,14734
@@ -173,9 +173,9 @@ not1mm/plugins/ref_ssb.py,sha256=tGK5XeFrc3z7l8OViG9DM3rc4HLUBF9S3SUkaAPrjQk,215
 not1mm/plugins/stew_perry_topband.py,sha256=LHt0WnWMRS_m5nO9BOIQs0kO38M6x-k4eaA4nbEqDVA,15353
 not1mm/plugins/weekly_rtty.py,sha256=4gfFg25KGkU9tKmwslHLc38qPAXuRGWNX48n582NC7w,20078
 not1mm/plugins/winter_field_day.py,sha256=jLgEr95hJCZoc3Fi95PiNeB06thPQHFI3zOHmR6NprE,15234
-not1mm-25.3.23.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-25.3.23.dist-info/METADATA,sha256=O3nl8WeblJtv9jbNlPSOSg8o6eiVleC_h6pxrDWRB_8,37243
-not1mm-25.3.23.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-not1mm-25.3.23.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-25.3.23.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-25.3.23.dist-info/RECORD,,
+not1mm-25.3.25.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.3.25.dist-info/METADATA,sha256=ZetHWRshGEySfM-MlL4O3l4R_Z9EXlE2X2UxVELhr2s,37351
+not1mm-25.3.25.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+not1mm-25.3.25.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.3.25.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.3.25.dist-info/RECORD,,

{not1mm-25.3.23.dist-info → not1mm-25.3.25.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any