blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 19:50:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Integrate Warnings Provider auto-refresh into Text Event Manager

Browse source
This commit is contained in:
Dan Paulat 2022-11-06 23:39:01 -06:00
parent a2616b0ee0
commit c7a69a76be
7 changed files with 131 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scwx-qt/source/scwx/qt/ui/alert_dialog.cpp
View file

@ -22,6 +22,7 @@ class AlertDialogImpl : public QObject
public:
explicit AlertDialogImpl(AlertDialog* self) :
self_ {self},
textEventManager_ {manager::TextEventManager::Instance()},
goButton_ {nullptr},
key_ {},
centroid_ {},
@ -34,7 +35,10 @@ public:
void SelectIndex(size_t newIndex);
void UpdateAlertInfo();
AlertDialog* self_;
AlertDialog* self_;
std::shared_ptr<manager::TextEventManager> textEventManager_;
QPushButton* goButton_;
types::TextEventKey key_;
common::Coordinate centroid_;
@ -67,7 +71,7 @@ AlertDialog::~AlertDialog()
void AlertDialogImpl::ConnectSignals()
{
connect(
&manager::TextEventManager::Instance(),
textEventManager_.get(),
&manager::TextEventManager::AlertUpdated,
this,
[=](const types::TextEventKey& key)
@ -94,7 +98,7 @@ bool AlertDialog::SelectAlert(const types::TextEventKey& key)
setWindowTitle(QString::fromStdString(key.ToFullString()));
auto messages = manager::TextEventManager::Instance().message_list(key);
auto messages = p->textEventManager_->message_list(key);
if (messages.empty())
{
return false;
@ -107,15 +111,14 @@ bool AlertDialog::SelectAlert(const types::TextEventKey& key)
void AlertDialogImpl::SelectIndex(size_t newIndex)
{
size_t messageCount =
manager::TextEventManager::Instance().message_count(key_);
size_t messageCount = textEventManager_->message_count(key_);
if (newIndex >= messageCount)
{
return;
}
auto messages = manager::TextEventManager::Instance().message_list(key_);
auto messages = textEventManager_->message_list(key_);
currentIndex_ = newIndex;
@ -127,7 +130,7 @@ void AlertDialogImpl::SelectIndex(size_t newIndex)
void AlertDialogImpl::UpdateAlertInfo()
{
auto messages = manager::TextEventManager::Instance().message_list(key_);
auto messages = textEventManager_->message_list(key_);
size_t messageCount = messages.size();
bool firstSelected = (currentIndex_ == 0u);
@ -170,8 +173,7 @@ void AlertDialog::on_nextButton_clicked()
void AlertDialog::on_lastButton_clicked()
{
p->SelectIndex(manager::TextEventManager::Instance().message_count(p->key_) -
1u);
p->SelectIndex(p->textEventManager_->message_count(p->key_) - 1u);
}
#include "alert_dialog.moc"

10
scwx-qt/source/scwx/qt/ui/alert_dock_widget.cpp
View file

@ -25,6 +25,7 @@ class AlertDockWidgetImpl : QObject
public:
explicit AlertDockWidgetImpl(AlertDockWidget* self) :
self_ {self},
textEventManager_ {manager::TextEventManager::Instance()},
alertModel_ {std::make_unique<model::AlertModel>()},
proxyModel_ {std::make_unique<QSortFilterProxyModel>()},
alertDialog_ {new AlertDialog(self)},
@ -42,9 +43,10 @@ public:
void ConnectSignals();
AlertDockWidget* self_;
std::unique_ptr<model::AlertModel> alertModel_;
std::unique_ptr<QSortFilterProxyModel> proxyModel_;
AlertDockWidget* self_;
std::shared_ptr<manager::TextEventManager> textEventManager_;
std::unique_ptr<model::AlertModel> alertModel_;
std::unique_ptr<QSortFilterProxyModel> proxyModel_;
AlertDialog* alertDialog_;
@ -109,7 +111,7 @@ void AlertDockWidgetImpl::ConnectSignals()
&QLineEdit::textChanged,
proxyModel_.get(),
&QSortFilterProxyModel::setFilterWildcard);
connect(&manager::TextEventManager::Instance(),
connect(textEventManager_.get(),
&manager::TextEventManager::AlertUpdated,
alertModel_.get(),
&model::AlertModel::HandleAlert,