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

Added Icon column to location marker manager dialog

Browse source
This commit is contained in:
AdenKoperczak 2024-11-28 12:46:26 -05:00
parent d0d9adfd1a
commit cfed61c6ff
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
scwx-qt/source/scwx/qt/model/marker_model.cpp
View file

@ -3,6 +3,7 @@
#include <scwx/qt/manager/marker_manager.hpp> #include <scwx/qt/manager/marker_manager.hpp>
#include <scwx/qt/types/marker_types.hpp> #include <scwx/qt/types/marker_types.hpp>
#include <scwx/qt/types/qt_types.hpp> #include <scwx/qt/types/qt_types.hpp>
#include <scwx/qt/util/q_color_modulate.hpp>
#include <scwx/util/logger.hpp> #include <scwx/util/logger.hpp>
#include <vector> #include <vector>
@ -38,7 +39,6 @@ public:
MarkerModel::MarkerModel(QObject* parent) : MarkerModel::MarkerModel(QObject* parent) :
QAbstractTableModel(parent), p(std::make_unique<Impl>()) QAbstractTableModel(parent), p(std::make_unique<Impl>())
{ {
connect(p->markerManager_.get(), connect(p->markerManager_.get(),
&manager::MarkerManager::MarkersInitialized, &manager::MarkerManager::MarkersInitialized,
this, this,
@ -127,6 +127,23 @@ QVariant MarkerModel::data(const QModelIndex& index, int role) const
} }
break; break;
break; break;
case static_cast<int>(Column::Icon):
if (role == Qt::ItemDataRole::DecorationRole)
{
for (auto& icon : types::getMarkerIcons())
{
if (icon.name == markerInfo->iconName)
{
return util::modulateColors(icon.qIcon,
QSize(30, 30),
QColor(markerInfo->iconColor[0],
markerInfo->iconColor[1],
markerInfo->iconColor[2],
markerInfo->iconColor[3]));
}
}
}
break;
default: default:
break; break;
@ -164,6 +181,9 @@ QVariant MarkerModel::headerData(int section,
case static_cast<int>(Column::Longitude): case static_cast<int>(Column::Longitude):
return tr("Longitude"); return tr("Longitude");
case static_cast<int>(Column::Icon):
return tr("Icon");
default: default:
break; break;
} }

3
scwx-qt/source/scwx/qt/model/marker_model.hpp
View file

@ -17,7 +17,8 @@ public:
{ {
Latitude = 0, Latitude = 0,
Longitude = 1, Longitude = 1,
Name = 2, Icon = 2,
Name = 3,
}; };
explicit MarkerModel(QObject* parent = nullptr); explicit MarkerModel(QObject* parent = nullptr);