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

Fix alert sorting by using new TimePointRole for active filtering

Browse source
This commit is contained in:
Dan Paulat 2022-11-12 00:03:05 -06:00
parent 43409b128a
commit d19656f0f1
3 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

40
scwx-qt/source/scwx/qt/model/alert_model.cpp
View file

@ -34,6 +34,8 @@ public:
static std::string GetCounties(const types::TextEventKey& key);
static std::string GetState(const types::TextEventKey& key);
static std::chrono::system_clock::time_point
GetStartTime(const types::TextEventKey& key);
static std::string GetStartTimeString(const types::TextEventKey& key);
static std::chrono::system_clock::time_point
GetEndTime(const types::TextEventKey& key);
@ -96,7 +98,10 @@ QVariant AlertModel::data(const QModelIndex& index, int role) const
{
if (index.isValid() && index.row() >= 0 &&
index.row() < p->textEventKeys_.size() &&
(role == Qt::DisplayRole || role == types::SortRole))
(role == Qt::DisplayRole || role == types::SortRole ||
(role == types::TimePointRole &&
(index.column() == static_cast<int>(Column::StartTime) ||
index.column() == static_cast<int>(Column::EndTime)))))
{
const auto& textEventKey = p->textEventKeys_.at(index.row());
@ -124,20 +129,28 @@ QVariant AlertModel::data(const QModelIndex& index, int role) const
AlertModelImpl::GetCounties(textEventKey));
case static_cast<int>(Column::StartTime):
return QString::fromStdString(
AlertModelImpl::GetStartTimeString(textEventKey));
case static_cast<int>(Column::EndTime):
if (role == Qt::DisplayRole)
if (role == types::TimePointRole)
{
return QString::fromStdString(
AlertModelImpl::GetEndTimeString(textEventKey));
return QVariant::fromValue(
AlertModelImpl::GetStartTime(textEventKey));
}
else
{
return QString::fromStdString(
AlertModelImpl::GetStartTimeString(textEventKey));
}
case static_cast<int>(Column::EndTime):
if (role == types::TimePointRole)
{
return QVariant::fromValue(
AlertModelImpl::GetEndTime(textEventKey));
}
else
{
return QString::fromStdString(
AlertModelImpl::GetEndTimeString(textEventKey));
}
case static_cast<int>(Column::Distance):
if (role == Qt::DisplayRole)
@ -333,13 +346,18 @@ std::string AlertModelImpl::GetState(const types::TextEventKey& key)
return util::ToString(lastSegment->header_->ugc_.states());
}
std::string AlertModelImpl::GetStartTimeString(const types::TextEventKey& key)
std::chrono::system_clock::time_point
AlertModelImpl::GetStartTime(const types::TextEventKey& key)
{
auto messageList = manager::TextEventManager::Instance()->message_list(key);
auto& firstMessage = messageList.front();
auto firstSegment = firstMessage->segment(0);
return util::TimeString(
firstSegment->header_->vtecString_[0].pVtec_.event_begin());
return firstSegment->header_->vtecString_[0].pVtec_.event_begin();
}
std::string AlertModelImpl::GetStartTimeString(const types::TextEventKey& key)
{
return util::TimeString(GetStartTime(key));
}
std::chrono::system_clock::time_point

2
scwx-qt/source/scwx/qt/model/alert_proxy_model.cpp
View file

@ -49,7 +49,7 @@ bool AlertProxyModel::filterAcceptsRow(int sourceRow,
// Get source end time
auto endTime = sourceModel()
->data(endTimeIndex, qt::types::SortRole)
->data(endTimeIndex, types::TimePointRole)
.value<std::chrono::system_clock::time_point>();
// Compare end time to current

3
scwx-qt/source/scwx/qt/types/qt_types.hpp
View file

@ -11,7 +11,8 @@ namespace types
enum ItemDataRole
{
SortRole = Qt::UserRole
SortRole = Qt::UserRole,
TimePointRole
};
} // namespace types