not1mm 24.4.9.3__py3-none-any.whl → 24.4.15__py3-none-any.whl

not1mm/__main__.py

@@ -28,7 +28,13 @@ from shutil import copyfile
 
 import notctyparser
 import psutil
-import sounddevice as sd
+
+try:
+    import sounddevice as sd
+except OSError as exception:
+    print(exception)
+    print("portaudio is not installed")
+    sd = None
 import soundfile as sf
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
 from PyQt6.QtCore import QDir, Qt
@@ -200,8 +206,6 @@ class MainWindow(QtWidgets.QMainWindow):
         self.setCorner(Qt.Corner.BottomLeftCorner, Qt.DockWidgetArea.LeftDockWidgetArea)
         data_path = fsutils.APP_DATA_PATH / "main.ui"
         uic.loadUi(data_path, self)
-        self.dockwidget = QtWidgets.QDockWidget(self)
-        self.dockwidget.setAllowedAreas(Qt.DockWidgetArea.AllDockWidgetAreas)
         self.cw_entry.hide()
         self.leftdot.hide()
         self.rightdot.hide()
@@ -2269,6 +2273,9 @@ class MainWindow(QtWidgets.QMainWindow):
         """
 
         logger.debug("Voicing: %s", the_string)
+        if sd is None:
+            logger.warning("Sounddevice/portaudio not installed.")
+            return
         op_path = fsutils.USER_DATA_PATH / self.current_op
         if "[" in the_string:
             sub_string = the_string.strip("[]").lower()

not1mm/checkwindow.py

@@ -12,7 +12,7 @@ import queue
 from json import loads
 import Levenshtein
 
-from PyQt6 import QtGui, uic, QtCore
+from PyQt6 import QtGui, uic
 from PyQt6.QtWidgets import QLabel, QVBoxLayout, QWidget, QDockWidget
 from PyQt6.QtGui import QMouseEvent, QColorConstants
 
@@ -258,39 +258,43 @@ class CheckWindow(QDockWidget):
                 filter(lambda x: x, [x.get("callsign", None) for x in spots]),
             )
 
-    def populate_layout(self, layout, call_list):
+    def populate_layout(self, layout, call_list) -> None:
+        """Apply blackmagic to a layout."""
         for i in reversed(range(layout.count())):
             if layout.itemAt(i).widget():
                 layout.itemAt(i).widget().setParent(None)
             else:
                 layout.removeItem(layout.itemAt(i))
-        labels = []
+        call_items = []
         for call in call_list:
             if call:
                 if self.call:
                     label_text = ""
+                    diff_score = 0
                     for tag, i1, i2, j1, j2 in Levenshtein.opcodes(call, self.call):
-                        # logger.debug('{:7}   a[{}:{}] --> b[{}:{}] {!r:>8} --> {!r}'.format(
-                        #    tag, i1, i2, j1, j2, call[i1:i2], self.call[j1:j2]))
                         if tag == "equal":
                             label_text += call[i1:i2]
                             continue
                         elif tag == "replace":
                             label_text += f"<span style='background-color: {self.character_remove_color};'>{call[i1:i2]}</span>"
+                            diff_score += max((i2 - i1), (j2 - j1)) * (
+                                len(call) + 1 - i2
+                            )
                         elif tag == "insert" or tag == "delete":
                             label_text += f"<span style='background-color: {self.character_add_color};'>{call[i1:i2]}</span>"
-                    labels.append(
-                        (
-                            Levenshtein.hamming(call, self.call),
-                            CallLabel(
-                                label_text, call=call, callback=self.item_clicked
-                            ),
-                        )
-                    )
-
-        for _, label in sorted(labels, key=lambda x: x[0]):
+                            diff_score += max((i2 - i1), (j2 - j1)) * (len(call) - i2)
+                    call_items.append((diff_score, label_text, call))
+
+        call_items = sorted(call_items, key=lambda x: x[0])
+        for i in reversed(range(layout.count())):
+            if layout.itemAt(i).widget():
+                layout.itemAt(i).widget().setParent(None)
+            else:
+                layout.removeItem(layout.itemAt(i))
+
+        for _, label_text, call in call_items:
+            label = CallLabel(label_text, call=call, callback=self.item_clicked)
             layout.addWidget(label)
-        # top aligns
         layout.addStretch(0)
 
 
@@ -307,6 +311,6 @@ class CallLabel(QLabel):
         self.call = call
         self.callback = callback
 
-    def mouseDoubleClickEvent(self, e: QMouseEvent) -> None:
+    def mouseReleaseEvent(self, e: QMouseEvent) -> None:
         if self.call and self.callback:
             self.callback(self.call)

not1mm/data/main.ui

@@ -31,6 +31,16 @@
   <property name="windowTitle">
    <string>Not1MM</string>
   </property>
+  <property name="windowIcon">
+   <iconset>
+    <normaloff>k6gte.not1mm-32.png</normaloff>k6gte.not1mm-32.png</iconset>
+  </property>
+  <property name="iconSize">
+   <size>
+    <width>32</width>
+    <height>32</height>
+   </size>
+  </property>
   <widget class="QWidget" name="centralwidget">
    <property name="enabled">
     <bool>true</bool>
@@ -1282,7 +1292,7 @@
      <x>0</x>
      <y>0</y>
      <width>878</width>
-     <height>30</height>
+     <height>25</height>
     </rect>
    </property>
    <property name="nativeMenuBar">

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.4.9.3"
+__version__ = "24.4.15"

{not1mm-24.4.9.3.dist-info → not1mm-24.4.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.9.3
+Version: 24.4.15
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -33,7 +33,7 @@ Requires-Dist: Levenshtein
 # Not1MM
 
  ![logo](https://github.com/mbridak/not1mm/raw/master/not1mm/data/k6gte.not1mm.svg)
- 
+
  The worlds #1 unfinished contest logger <sup>*According to my daughter Corinna.<sup>
 
 [![PyPI](https://img.shields.io/pypi/v/not1mm)](https://pypi.org/project/not1mm/)
@@ -177,6 +177,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-15] checkwindow.py Tighter results. Changed the call selection to use a single click.
+- [24-4-9-4] Check for portaudio instead of crash boom. Removed empty dockwidget. Tested on Plasma 6.
 - [24-4-9-3] Ugh. It's not a real day unless you forget to test.
 - [24-4-9-2] Put back the floatable dock widgets, 'cause Wayland strikes again.
 - [24-4-9-1] Removed DockWidgetFloatable from the dock widgets since my wee brain can't figure out how to add a dragable window frame to them once they are floating. Added a minimum size for the VFO LCD digits. Defaulted bandmap window to the right.

{not1mm-24.4.9.3.dist-info → not1mm-24.4.15.dist-info}/RECORD

@@ -1,7 +1,7 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=kESgRlZ5anG7tkUX44ehb4IJ--607ZeatMFm7EA9QtA,123052
+not1mm/__main__.py,sha256=Lnwp-STJRcTvjH65oYBTIHcjQ-l0tN0pVsRJylkLJds,123143
 not1mm/bandmap.py,sha256=3kmRYItrBqpjudFb2NnkGNJpDWkwOpGPQbKwHmYnQ-o,34021
-not1mm/checkwindow.py,sha256=KCXtUEha4hzC87t7_0bDQtZZ0CHGB75JDLkxhK0ot8c,10168
+not1mm/checkwindow.py,sha256=JiVjJO2RJlFDybeVnBQ8yi-1DnS5aiWs2QTHp_bbn5M,10381
 not1mm/fsutils.py,sha256=Li8Tq9K7c_q7onOHOQ7u1dOOFfhIIz5Aj2LKuQtGOO4,1652
 not1mm/logwindow.py,sha256=UcO8mgs_E7ier2gg_1ESTaRxABEvcpCwKmSibm7hl74,44603
 not1mm/vfo.py,sha256=pRRj0XTbeTU9noo3nC1dbg26VYj6gHEw_srUDbyYqC0,12169
@@ -26,7 +26,7 @@ not1mm/data/k6gte.not1mm-32.png,sha256=XdTsCa3xqwTfn26Ga7RwO_Vlbg_77RKkSc8bMxVcC
 not1mm/data/k6gte.not1mm-64.png,sha256=6ku45Gq1g5ezh04F07osoKRtanb3e4kbx5XdIEh3N90,2925
 not1mm/data/logwindow.ui,sha256=vfkNdzJgFs3tTOBKLDavF2zVMvNHWOZ82fAErRi6pQY,1436
 not1mm/data/logwindowx.ui,sha256=9FzDJtLRpagvAWcDjFdB9NnvNZ4bVxdTNHy1Jit2ido,1610
-not1mm/data/main.ui,sha256=imj6FbVeYxz90Z4MuTy730GFjpeT0OYs7TvzybmcSY8,54341
+not1mm/data/main.ui,sha256=wtfBeYdgv0VYuwlXx6WlKbKkrML_zeiSx79866Wi6cM,54585
 not1mm/data/new_contest.ui,sha256=Xubngdbs_V_-o8huXzKOOaQOfj1NSXu9giIcaL4d0qk,21823
 not1mm/data/not1mm.html,sha256=c9-mfjMwDt4f5pySUruz2gREW33CQ2_rCddM2z5CZQo,23273
 not1mm/data/opon.ui,sha256=mC4OhoVIfR1H9IqHAKXliPMm8VOVmxSEadpsFQ7XnS4,2247
@@ -105,7 +105,7 @@ not1mm/lib/plugin_common.py,sha256=AAKBPCXzTWZJb-h08uPNnHVG7bSCg7kwukc211gFivY,8
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=tlXlJUUZP0IFwIDc9DboM5_1by_tHNtMXvyJ0E7B6RI,8877
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=Gc69ESUhK0ko2hO1rFw8gz_rByjHtndpt2mrkFMoEio,49
+not1mm/lib/version.py,sha256=TGgIZBlA1udqoabl-Uu2ILq7aYZGkkUWLKSGmHeX38c,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=fUjfwjuscDjicXIxsO0JHh7xTR9Vu0iPsrOLb896Qak,10873
 not1mm/plugins/10_10_spring_cw.py,sha256=WNaJP5mBQfaB6SxnFI0Vawt3AKDr94tKVtAK-EVhtUY,10878
@@ -139,9 +139,9 @@ not1mm/plugins/naqp_ssb.py,sha256=IWksulcb2_DxlkeW0h3048t8I-u00G_67KBVKkp-TV4,11
 not1mm/plugins/phone_weekly_test.py,sha256=gCX0ESUoiQzDp9puwibt9-dRembNsiuEeBdawCVvjHA,12316
 not1mm/plugins/stew_perry_topband.py,sha256=DIMI3mGMKokXXb9pPLqdhBI6JVnnIs7ZnAL23nFmshE,10588
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.4.9.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.4.9.3.dist-info/METADATA,sha256=t9B0Fw59uqPBa9VR6tqn7VS6QNfkOTYby9G8llm2RHc,27216
-not1mm-24.4.9.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-not1mm-24.4.9.3.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.4.9.3.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.4.9.3.dist-info/RECORD,,
+not1mm-24.4.15.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.4.15.dist-info/METADATA,sha256=wggnagX-HKqQtkzyr6t0TyX74cpcRmUEKZfCo1IXsHQ,27410
+not1mm-24.4.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+not1mm-24.4.15.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.4.15.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.4.15.dist-info/RECORD,,