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

Updating radar site display fields to be more human-friendly

Browse source 
- Latitude/longitude in degrees N/S/E/W
- Radar types with hyphens
- Sort by raw decimal values
This commit is contained in:
Dan Paulat 2022-10-07 22:29:30 -05:00
parent 1bc6e714f5
commit 6e7a13494a
11 changed files with 186 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
scwx-qt/source/scwx/qt/model/radar_site_model.cpp
View file

@ -1,5 +1,7 @@
#include <scwx/qt/model/radar_site_model.hpp>
#include <scwx/qt/common/types.hpp>
#include <scwx/qt/config/radar_site.hpp>
#include <scwx/common/geographic.hpp>
#include <scwx/util/logger.hpp>
namespace scwx
@ -42,7 +44,8 @@ int RadarSiteModel::columnCount(const QModelIndex& parent) const
QVariant RadarSiteModel::data(const QModelIndex& index, int role) const
{
if (index.isValid() && index.row() >= 0 &&
index.row() < p->radarSites_.size() && role == Qt::DisplayRole)
index.row() < p->radarSites_.size() &&
(role == Qt::DisplayRole || role == common::SortRole))
{
const auto& site = p->radarSites_.at(index.row());
@ -57,11 +60,27 @@ QVariant RadarSiteModel::data(const QModelIndex& index, int role) const
case 3:
return QString::fromStdString(site->country());
case 4:
return QString("%1").arg(site->latitude());
if (role == Qt::DisplayRole)
{
return QString::fromStdString(
scwx::common::GetLatitudeString(site->latitude()));
}
else
{
return site->latitude();
}
case 5:
return QString("%1").arg(site->longitude());
if (role == Qt::DisplayRole)
{
return QString::fromStdString(
scwx::common::GetLongitudeString(site->longitude()));
}
else
{
return site->longitude();
}
case 6:
return QString::fromStdString(site->type());
return QString::fromStdString(site->type_name());
default:
break;
}