Add ability to clear selected alerts

models/AlertTableModel.cpp

@@ -1,5 +1,7 @@
 #include <QColor>
 #include <QSqlRecord>
+#include <algorithm>
+#include <functional>
 
 #include "AlertTableModel.h"
 #include "data/Data.h"
@@ -127,6 +129,25 @@ void AlertTableModel::clear()
     endResetModel();
 }
 
+void AlertTableModel::clearRows(const QList<int> &rows)
+{
+    QList<int> selectedRows = rows;
+
+    std::sort(selectedRows.begin(), selectedRows.end(), std::greater<int>());
+    selectedRows.erase(std::unique(selectedRows.begin(), selectedRows.end()), selectedRows.end());
+
+    QMutexLocker locker(&alertListMutex);
+    for ( const int row : selectedRows )
+    {
+        if ( row < 0 || row >= alertList.count() )
+            continue;
+
+        beginRemoveRows(QModelIndex(), row, row);
+        alertList.removeAt(row);
+        endRemoveRows();
+    }
+}
+
 const AlertTableModel::AlertTableRecord AlertTableModel::getTableRecord(const QModelIndex &index)
 {
     QMutexLocker locker(&alertListMutex);

models/AlertTableModel.h

@@ -44,6 +44,7 @@ class AlertTableModel : public QAbstractTableModel
     QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
     void addAlert(const SpotAlert &entry);
     void clear();
+    void clearRows(const QList<int> &rows);
     const AlertTableRecord getTableRecord(const QModelIndex& index);
     void aging(const int clear_interval_sec);
     void resetDupe();

ui/AlertWidget.cpp

@@ -29,6 +29,7 @@ AlertWidget::AlertWidget(QWidget *parent) :
 
     ui->alertTableView->addAction(ui->actionEditRules);
     ui->alertTableView->addAction(ui->actionColumnVisibility);
+    ui->alertTableView->addAction(ui->actionClearSelected);
     ui->alertTableView->addAction(ui->actionClear);
 
     restoreTableHeaderState();
@@ -69,6 +70,23 @@ void AlertWidget::clearAllAlerts()
     emit alertsCleared();
 }
 
+void AlertWidget::clearSelectedAlerts()
+{
+    FCT_IDENTIFICATION;
+
+    const QModelIndexList selectedRows = ui->alertTableView->selectionModel()->selectedRows();
+    QList<int> sourceRows;
+
+    for ( const QModelIndex &index : selectedRows )
+        sourceRows << proxyModel->mapToSource(index).row();
+
+    if ( sourceRows.isEmpty() )
+        return;
+
+    alertTableModel->clearRows(sourceRows);
+    emit alertsCleared();
+}
+
 void AlertWidget::entryDoubleClicked(QModelIndex index)
 {
     FCT_IDENTIFICATION;

ui/AlertWidget.h

@@ -25,6 +25,7 @@ class AlertWidget : public QWidget, public ShutdownAwareWidget
 public slots:
     void addAlert(const SpotAlert &alert);
     void clearAllAlerts();
+    void clearSelectedAlerts();
     void entryDoubleClicked(QModelIndex index);
     void alertAgingChanged(int);
     void showEditRules();

ui/AlertWidget.ui

@@ -50,7 +50,7 @@
       <bool>true</bool>
      </property>
      <property name="selectionMode">
-      <enum>QAbstractItemView::SingleSelection</enum>
+      <enum>QAbstractItemView::ExtendedSelection</enum>
      </property>
      <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectRows</enum>
@@ -129,9 +129,14 @@
     <string>Column Visibility...</string>
    </property>
   </action>
+  <action name="actionClearSelected">
+   <property name="text">
+    <string>Clear Selected</string>
+   </property>
+  </action>
   <action name="actionClear">
    <property name="text">
-    <string>Clear</string>
+    <string>Clear All</string>
    </property>
   </action>
  </widget>
@@ -201,6 +206,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionClearSelected</sender>
+   <signal>triggered()</signal>
+   <receiver>AlertWidget</receiver>
+   <slot>clearSelectedAlerts()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>386</x>
+     <y>162</y>
+    </hint>
+   </hints>
+  </connection>
   <connection>
    <sender>actionClear</sender>
    <signal>triggered()</signal>
@@ -220,6 +241,7 @@
  </connections>
  <slots>
   <slot>clearAllAlerts()</slot>
+  <slot>clearSelectedAlerts()</slot>
   <slot>entryDoubleClicked(QModelIndex)</slot>
   <slot>alertAgingChanged(int)</slot>
   <slot>showEditRules()</slot>

ui/MainWindow.ui

@@ -928,7 +928,7 @@
   </action>
   <action name="actionClearAlerts">
    <property name="text">
-    <string>Clear</string>
+    <string>Clear All</string>
    </property>
    <property name="menuRole">
     <enum>QAction::NoRole</enum>