Merge pull request #234 from mbridak/delete_marked_spots

@mbridak Add button to delete marked spots.
mbridak · Dec 3, 2024 · 676071c · 676071c
2 parents 14d9533 + b2b696f
commit 676071c
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+- [24-12-3] Add button to bandmap to delete marked spots.
 - [24-11-27] Added CAT poll interval.
 - [24-11-26-1] Changed ESC to stop CW, CTRL-W to wipe input fields.
 - [24-11-26] Trying something different with rigctld parsing.

diff --git a/README.md b/README.md
@@ -207,25 +207,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
-- [24-11-27] Added CAT poll interval.
-- [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.
 

diff --git a/not1mm/bandmap.py b/not1mm/bandmap.py
@@ -311,6 +311,10 @@ def delete_spots(self, minutes: int) -> None:
             (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 @@ def __init__(self):
         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 @@ def clear_spots(self) -> None:
         """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()

diff --git a/not1mm/data/bandmap.ui b/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>

diff --git a/not1mm/lib/version.py b/not1mm/lib/version.py
@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.11.27"
+__version__ = "24.12.3"
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "24.11.27"
+version = "24.12.3"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"