From 9c16a88b639c1638f7dfb6ddfd413d7b943599cc Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Fri, 4 Apr 2025 19:46:05 -0400 Subject: [PATCH 1/4] Use data role to get marker id for location marker dialog. --- scwx-qt/source/scwx/qt/model/marker_model.cpp | 5 +++++ .../scwx/qt/ui/marker_settings_widget.cpp | 21 +++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scwx-qt/source/scwx/qt/model/marker_model.cpp b/scwx-qt/source/scwx/qt/model/marker_model.cpp index 77fb7ab7..6c232177 100644 --- a/scwx-qt/source/scwx/qt/model/marker_model.cpp +++ b/scwx-qt/source/scwx/qt/model/marker_model.cpp @@ -100,6 +100,11 @@ QVariant MarkerModel::data(const QModelIndex& index, int role) const return QVariant(); } + if (role == Qt::ItemDataRole::UserRole) + { + return qulonglong(id); + } + switch(index.column()) { case static_cast(Column::Name): diff --git a/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp b/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp index b3ba8440..f3e81098 100644 --- a/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp +++ b/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp @@ -85,13 +85,14 @@ void MarkerSettingsWidgetImpl::ConnectSignals() ->selectedRows(static_cast( model::MarkerModel::Column::Name)) .first(); - std::optional id = markerModel_->getId(selected.row()); - if (!id) + + QVariant id = proxyModel_->data(selected, Qt::ItemDataRole::UserRole); + if (!id.isValid()) { return; } - markerManager_->remove_marker(*id); + markerManager_->remove_marker(id.toULongLong()); }); QObject::connect( self_->ui->markerView->selectionModel(), @@ -116,20 +117,14 @@ void MarkerSettingsWidgetImpl::ConnectSignals() self_, [this](const QModelIndex& index) { - const int row = index.row(); - if (row < 0) + QVariant id = + proxyModel_->data(index, Qt::ItemDataRole::UserRole); + if (!id.isValid()) { return; } - std::optional id = - markerModel_->getId(row); - if (!id) - { - return; - } - - editMarkerDialog_->setup(*id); + editMarkerDialog_->setup(id.toULongLong()); editMarkerDialog_->show(); }); } From c07e2bca53806b86665a0e70239845cb32e0019c Mon Sep 17 00:00:00 2001 From: Aden Koperczak <38887432+AdenKoperczak@users.noreply.github.com> Date: Fri, 4 Apr 2025 19:58:13 -0400 Subject: [PATCH 2/4] Update scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp with clang-tidy suggestions Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp b/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp index f3e81098..ef55b990 100644 --- a/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp +++ b/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp @@ -86,7 +86,7 @@ void MarkerSettingsWidgetImpl::ConnectSignals() model::MarkerModel::Column::Name)) .first(); - QVariant id = proxyModel_->data(selected, Qt::ItemDataRole::UserRole); + QVariant const id = proxyModel_->data(selected, Qt::ItemDataRole::UserRole); if (!id.isValid()) { return; From 2ecc49ddb37ed429a84e8bc2a6ff1c3bff94e3b5 Mon Sep 17 00:00:00 2001 From: Aden Koperczak <38887432+AdenKoperczak@users.noreply.github.com> Date: Fri, 4 Apr 2025 19:58:23 -0400 Subject: [PATCH 3/4] Update scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp with clang-tidy suggestions Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp b/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp index ef55b990..d160e21c 100644 --- a/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp +++ b/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp @@ -117,7 +117,7 @@ void MarkerSettingsWidgetImpl::ConnectSignals() self_, [this](const QModelIndex& index) { - QVariant id = + QVariant const id = proxyModel_->data(index, Qt::ItemDataRole::UserRole); if (!id.isValid()) { From 529291d2a222d6bad933320e1f73f141d82c5c8f Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Fri, 4 Apr 2025 20:01:21 -0400 Subject: [PATCH 4/4] Clang format changes for radar_self_center_setting --- scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp b/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp index d160e21c..51d9e40a 100644 --- a/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp +++ b/scwx-qt/source/scwx/qt/ui/marker_settings_widget.cpp @@ -86,7 +86,8 @@ void MarkerSettingsWidgetImpl::ConnectSignals() model::MarkerModel::Column::Name)) .first(); - QVariant const id = proxyModel_->data(selected, Qt::ItemDataRole::UserRole); + QVariant const id = + proxyModel_->data(selected, Qt::ItemDataRole::UserRole); if (!id.isValid()) { return;