not1mm 24.11.26.1__py3-none-any.whl → 24.12.3__py3-none-any.whl

not1mm/__main__.py

@@ -2920,6 +2920,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 12345)),
             )
+            self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
             self.rig_control.moveToThread(self.radio_thread)
             self.radio_thread.started.connect(self.rig_control.run)
             self.radio_thread.finished.connect(self.rig_control.deleteLater)
@@ -2936,6 +2937,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 4532)),
             )
+            self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
             self.rig_control.moveToThread(self.radio_thread)
             self.radio_thread.started.connect(self.rig_control.run)
             self.radio_thread.finished.connect(self.rig_control.deleteLater)
@@ -2947,6 +2949,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 0000)),
             )
+            self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
             self.rig_control.moveToThread(self.radio_thread)
             self.radio_thread.started.connect(self.rig_control.run)
             self.radio_thread.finished.connect(self.rig_control.deleteLater)

not1mm/bandmap.py

@@ -311,6 +311,10 @@ class Database:
             (f"-{minutes} minutes",),
         )
 
+    def delete_marks(self) -> None:
+        """Delete marked spots."""
+        self.cursor.execute("delete from spots where ts > datetime('now');")
+
 
 class BandMapWindow(QDockWidget):
     """The BandMapWindow class."""
@@ -345,6 +349,7 @@ class BandMapWindow(QDockWidget):
         self.agetime = self.clear_spot_olderSpinBox.value()
         self.clear_spot_olderSpinBox.valueChanged.connect(self.spot_aging_changed)
         self.clearButton.clicked.connect(self.clear_spots)
+        self.clearmarkedButton.clicked.connect(self.clear_marked)
         self.zoominButton.clicked.connect(self.dec_zoom)
         self.zoomoutButton.clicked.connect(self.inc_zoom)
         self.connectButton.clicked.connect(self.connect)
@@ -873,6 +878,10 @@ class BandMapWindow(QDockWidget):
         """Delete all spots from the database."""
         self.spots.delete_spots(0)
 
+    def clear_marked(self) -> None:
+        """Delete all marked spots."""
+        self.spots.delete_marks()
+
     def spot_aging_changed(self) -> None:
         """Called when spot aging spinbox is changed."""
         self.agetime = self.clear_spot_olderSpinBox.value()

not1mm/data/bandmap.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>383</width>
+    <width>342</width>
     <height>700</height>
    </rect>
   </property>
@@ -97,7 +97,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>359</width>
+         <width>326</width>
          <height>512</height>
         </rect>
        </property>
@@ -148,18 +148,49 @@
          <enum>Qt::NoFocus</enum>
         </property>
         <property name="accessibleName">
-         <string>clear all</string>
+         <string>clear spots</string>
         </property>
         <property name="accessibleDescription">
          <string>clear spots</string>
         </property>
+        <property name="maximumSize">
+         <size>
+         <width>1110</width>
+          <height>27</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>🗑 Spots</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="clearmarkedButton">
+        <property name="minimumSize">
+         <size>
+          <width>110</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+         <width>1110</width>
+          <height>27</height>
+         </size>
+        </property>
         <property name="text">
-         <string>Clear All</string>
+         <string>🗑 Marked</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="zoominButton">
+        <property name="maximumSize">
+         <size>
+          <width>27</width>
+          <height>27</height>
+         </size>
+        </property>
         <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
@@ -170,12 +201,18 @@
          <string>zoom in</string>
         </property>
         <property name="text">
-         <string>Zoom In</string>
+         <string>➕</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="zoomoutButton">
+        <property name="maximumSize">
+         <size>
+          <width>27</width>
+          <height>27</height>
+         </size>
+        </property>
         <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
@@ -186,7 +223,7 @@
          <string>zoom out</string>
         </property>
         <property name="text">
-         <string>Zoom Out</string>
+         <string>➖</string>
         </property>
        </widget>
       </item>
@@ -205,12 +242,6 @@
       </property>
       <item>
        <widget class="QLabel" name="clear_spot_olderLabel">
-        <property name="font">
-         <font>
-          <family>JetBrains Mono ExtraLight</family>
-          <pointsize>11</pointsize>
-         </font>
-        </property>
         <property name="text">
          <string>Clear older than </string>
         </property>

not1mm/data/configuration.ui

@@ -377,6 +377,43 @@
        <string>CAT</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_4">
+       <item row="1" column="3">
+        <widget class="QLineEdit" name="rigcontrolport_field">
+         <property name="font">
+          <font>
+           <family>JetBrains Mono ExtraLight</family>
+           <pointsize>12</pointsize>
+           <bold>false</bold>
+           <strikeout>false</strikeout>
+          </font>
+         </property>
+         <property name="accessibleName">
+          <string>port number</string>
+         </property>
+         <property name="accessibleDescription">
+          <string>port number of rig control d or f l rig.</string>
+         </property>
+         <property name="inputMethodHints">
+          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
+         </property>
+         <property name="text">
+          <string>4532</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="4">
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item row="1" column="1">
         <widget class="QLineEdit" name="rigcontrolip_field">
          <property name="font">
@@ -398,7 +435,38 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0" colspan="4">
+       <item row="3" column="1" colspan="3">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_6">
+         <property name="font">
+          <font>
+           <family>JetBrains Mono ExtraLight</family>
+           <pointsize>12</pointsize>
+           <bold>false</bold>
+           <strikeout>false</strikeout>
+          </font>
+         </property>
+         <property name="text">
+          <string>Rig Control IP:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" colspan="4">
         <layout class="QHBoxLayout" name="horizontalLayout">
          <property name="sizeConstraint">
           <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
@@ -513,50 +581,6 @@
          </item>
         </layout>
        </item>
-       <item row="2" column="1" colspan="3">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_6">
-         <property name="font">
-          <font>
-           <family>JetBrains Mono ExtraLight</family>
-           <pointsize>12</pointsize>
-           <bold>false</bold>
-           <strikeout>false</strikeout>
-          </font>
-         </property>
-         <property name="text">
-          <string>Rig Control IP:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="1" column="2">
         <widget class="QLabel" name="label_7">
          <property name="font">
@@ -575,8 +599,8 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="4">
-        <spacer name="verticalSpacer_3">
+       <item row="0" column="2">
+        <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -588,30 +612,16 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="3">
-        <widget class="QLineEdit" name="rigcontrolport_field">
-         <property name="font">
-          <font>
-           <family>JetBrains Mono ExtraLight</family>
-           <pointsize>12</pointsize>
-           <bold>false</bold>
-           <strikeout>false</strikeout>
-          </font>
-         </property>
-         <property name="accessibleName">
-          <string>port number</string>
-         </property>
-         <property name="accessibleDescription">
-          <string>port number of rig control d or f l rig.</string>
-         </property>
-         <property name="inputMethodHints">
-          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
-         </property>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_27">
          <property name="text">
-          <string>4532</string>
+          <string>CAT Poll Interval (ms):</string>
          </property>
         </widget>
        </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="catpoll_field"/>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="cw_tab">

not1mm/lib/settings.py

@@ -99,6 +99,7 @@ class Settings(QtWidgets.QDialog):
         )
         self.rigcontrolip_field.setText(str(self.preference.get("CAT_ip", "")))
         self.rigcontrolport_field.setText(str(self.preference.get("CAT_port", "")))
+        self.catpoll_field.setText(str(self.preference.get("CAT_polldelta", 500)))
         self.userigctld_radioButton.setChecked(bool(self.preference.get("userigctld")))
         self.useflrig_radioButton.setChecked(bool(self.preference.get("useflrig")))
 
@@ -215,6 +216,10 @@ class Settings(QtWidgets.QDialog):
             self.preference["CAT_port"] = int(self.rigcontrolport_field.text())
         except ValueError:
             ...
+        try:
+            self.preference["CAT_polldelta"] = int(self.catpoll_field.text())
+        except ValueError:
+            ...
         self.preference["userigctld"] = self.userigctld_radioButton.isChecked()
         self.preference["useflrig"] = self.useflrig_radioButton.isChecked()
         self.preference["cwip"] = self.cwip_field.text()

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.11.26.1"
+__version__ = "24.12.3"

not1mm/radio.py

@@ -27,8 +27,8 @@ class Radio(QObject):
     vfoa = "14030000"
     mode = "CW"
     bw = "500"
-    delta = 1
-    poll_time = datetime.datetime.now() + datetime.timedelta(seconds=delta)
+    delta = 500
+    poll_time = datetime.datetime.now() + datetime.timedelta(milliseconds=delta)
     time_to_quit = False
     online = False
     interface = None
@@ -72,7 +72,7 @@ class Radio(QObject):
         while not self.time_to_quit:
             if datetime.datetime.now() > self.poll_time:
                 self.poll_time = datetime.datetime.now() + datetime.timedelta(
-                    seconds=self.delta
+                    milliseconds=self.delta
                 )
                 vfoa = self.cat.get_vfo()
                 self.online = False
@@ -102,7 +102,8 @@ class Radio(QObject):
                     )
                 except QEventLoop:
                     ...
-            QThread.msleep(100)
+            # QThread.msleep(int(self.delta / 2))
+            QThread.msleep(1)
 
     def store_last_data_mode(self, the_mode: str = ""):
         """if the last mode is a data mode, save it."""

{not1mm-24.11.26.1.dist-info → not1mm-24.12.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.11.26.1
+Version: 24.12.3
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -238,24 +238,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
-- [24-11-26-1] Changed ESC to stop CW, CTRL-W to wipe input fields.
-- [24-11-26] Trying something different with rigctld parsing.
-- [24-11-15] Fix CQWW points, fix mode showing as RPRT.
-- [24-11-24-1] Add ESM to CQ160, ARRL VHF, ARRL 10M, 10 10 contests.
-- [24-11-24] Added ESM to IARU HF and FieldDay.
-- [24-11-23] Made macros per contest.
-- [24-11-21] Merged PR from alduhoo setting CW Speed via rigctld, Added ESM and call history support for General Logging.
-- [24-11-19] Added ESM to Stew Perry, Phone Weekly, Medium Speed Test and JIDX.
-- [24-11-18] Accepted PR from dg9vh for the DARC XMAS Contest.
-- [24-11-17] Accepted PR from dg9vh for the LZ DX contest.
-- [24-11-15] Made checkwindow font bigger and match a little more contrasted.
-- [24-11-12] add check for ipv4 address for CAT.
-- [24-11-10] ReJiggered CAT/flrig interface to hopefull make it more workable.
-- [24-11-6] Added Call history to ARRL VHF, CQ160, CQWW, StewPerry, Weekly RTTY
-- [24-11-5] Fix crash with bad qrz credentials.
-- [24-11-3-1] Fixed CWT ESM, Add Call History to CWT, Helvetia, WFD, NAQP, K1USN. Add ESM Helvetia.
-- [24-11-3] Added RAEM contest
-- [24-11-2] Add beginning of call history files. Add command buttons.
+- [24-12-3] Add button to bandmap to delete marked spots.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-24.11.26.1.dist-info → not1mm-24.12.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=4hFDKkXbu_xdtra4VIMtQGVzp7UbD3nZY6C7HXNyUAM,142552
-not1mm/bandmap.py,sha256=X6mMHXS1kXBbUPZCaKgiVJ6Dz6DE6LEQqtEXfT3telg,30811
+not1mm/__main__.py,sha256=SOPb_t3oI7vk8v1MhgTTeU-axyfU464n-pTDciNWp3U,142786
+not1mm/bandmap.py,sha256=zD3aUf36NVQCy0plAcZLNxYhSEM9xZ8J1Cu9vrcFPYA,31136
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=TvpzQTNB92hISlUO3iWBqtlPmlebdhOkAArx0DNGcOs,43966
 not1mm/lookupservice.py,sha256=4c36x_1G3Sy69gQfJ6El7vHLIKTjLGH67ziPPoeYweM,2648
-not1mm/radio.py,sha256=khmyESHaXUDF2hGQ5v3atEOd1YACrOAsuoIA4XgNtlc,5340
+not1mm/radio.py,sha256=c4m7Ci38uKGKxB0JUT5uOKalI_Mm8Vmixu5D_roN5z4,5400
 not1mm/test.py,sha256=RN71m2S9MPIOJMaoCi0wZhwEhpEZunvtosZxaKahRB4,101
 not1mm/vfo.py,sha256=ggPyWtxMbdSE5RwdK0nDRwDNqOxdpb_pvnzZdbzZVQE,11136
 not1mm/voice_keying.py,sha256=sA3gw5_k7kShTg2qhG7HkKDM5M6KheJVRkAc_C7mxDk,3006
@@ -13,10 +13,10 @@ not1mm/data/JetBrainsMono-ExtraLight.ttf,sha256=g5Hn7BPounWMGDj1a8zZcyKMz03HSqW_
 not1mm/data/MASTER.SCP,sha256=FWKs4Xw3w7FNUt2npA6VzsLME7NAbHRugxaL6TnsvzU,364234
 not1mm/data/about.ui,sha256=IzbwKQZ_Ea06qGEjJgsa7g8-oYk549f-MEpLtChiLvw,2078
 not1mm/data/alpha bravo charlie delta.txt,sha256=d5QMmSWEUAe4Rj1XbNjTPLa_5Be4Se6u5LUIqAYidOQ,224
-not1mm/data/bandmap.ui,sha256=hvovf1YKyfUVVbKl6Ib2zU4RdUrFsQwm-255wVeKXZE,7180
+not1mm/data/bandmap.ui,sha256=krmUYxGPRt2EeqSGrEkY2cXG79ujel3T2_2ymrrbgzg,7942
 not1mm/data/check.png,sha256=UvFOLr8V-79qnjW8wUaGItXk_OSP8m8hqPevs8NDlFY,387
 not1mm/data/checkwindow.ui,sha256=PRD98K0julJ9EfWqoE89dT8UPuPKQzGiWBk_efAko3o,5141
-not1mm/data/configuration.ui,sha256=iva5exfJJFBiiITpz6vgCB8e_j0lgsLeVWOltxtUk4g,70006
+not1mm/data/configuration.ui,sha256=nDiLlttOOCnejEMxOFkPNpXHJErD92NdGA1llXUtzL0,70329
 not1mm/data/contests.sql,sha256=4hmJCDvrbxnA_Y5S4T5o52TZieeFk6QUwFerwlFePNA,89307
 not1mm/data/cty.json,sha256=dPG9K1Pm4Rxd4uJom_gQ8y-sbqiZfILpl4kBAFnOveU,4877142
 not1mm/data/cwmacros.txt,sha256=NztufsX6R52gAO7VyJ2AHr7wOh41pJTwHKh5Lcs32ds,468
@@ -112,9 +112,9 @@ not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
 not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
 not1mm/lib/plugin_common.py,sha256=AABdx9DoTT8Znrup7AkfmKGC22hshMsEypiMqV0iKw0,10671
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
-not1mm/lib/settings.py,sha256=Xt0WE2ro_kUYdugQ0Pe1SQX07MHrJ0jyQqDqAKKqxuU,13564
+not1mm/lib/settings.py,sha256=pyCa6EUhDs97g1KTmWS8RLXCSbrB9ruv7LV48_nuEAk,13781
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=BcaX3Cm7q7UabsuJBtuqFJ5FUf6Qn18XbC6PtCOpVnc,51
+not1mm/lib/version.py,sha256=GO-war2hnAKCX5G2VG4VUL4397VZxAsACqOxGXlhe3Q,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=AsvB2VUd6Qb2_FzZkSBkSd1_qeP8Dt-B-exF1Pzb9tk,14469
 not1mm/plugins/10_10_spring_cw.py,sha256=nA4v0oqlp-ivvKqNPakb19I-wE_ElhvH5bCzDRx00JU,14474
@@ -162,9 +162,9 @@ not1mm/plugins/ref_ssb.py,sha256=G2Gz4kApchmOZQVnBexEokSEvdb-mZWJAfyJ1D6JDGY,204
 not1mm/plugins/stew_perry_topband.py,sha256=Gy_vv6tgkR-3vmvsUVO0pVfHMkUJSxpt7G4secn0RH8,15084
 not1mm/plugins/weekly_rtty.py,sha256=PI0_AtEdZZKGAuKnP-b2EYn9xwCN1Ablk38trbNP3Rc,19603
 not1mm/plugins/winter_field_day.py,sha256=9w3tDL9ZWiENSTERc3vzDbBktvI7pnyNvlH6fDjAi08,14841
-not1mm-24.11.26.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.11.26.1.dist-info/METADATA,sha256=5NBRnqJvdS35tJbbSiaIf_7BGkTD5e10HKA4r4Zfxg8,36800
-not1mm-24.11.26.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-not1mm-24.11.26.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.11.26.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.11.26.1.dist-info/RECORD,,
+not1mm-24.12.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.12.3.dist-info/METADATA,sha256=Ij0CAlyXU7wET1KQoq2pLushvUl2JY0iKB0BRfKliVI,35655
+not1mm-24.12.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+not1mm-24.12.3.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.12.3.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.12.3.dist-info/RECORD,,