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

County display for alerts, alert cleanup

Browse source
This commit is contained in:
Dan Paulat 2022-10-27 23:19:08 -05:00
parent 305e5c3698
commit c87a77795d
5 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scwx-qt/source/scwx/qt/manager/resource_manager.cpp
View file

@ -1,4 +1,5 @@
#include <scwx/qt/manager/resource_manager.hpp>
#include <scwx/qt/config/county_database.hpp>
#include <scwx/qt/util/font.hpp>
#include <scwx/qt/util/texture_atlas.hpp>
@ -19,6 +20,8 @@ void PreLoad()
static void LoadFonts()
{
config::CountyDatabase::Initialize();
util::Font::Create(":/res/fonts/din1451alt.ttf");
util::Font::Create(":/res/fonts/din1451alt_g.ttf");

4
scwx-qt/source/scwx/qt/manager/text_event_manager.cpp
View file

@ -31,7 +31,7 @@ public:
TextEventManager* self_;
std::unordered_map<types::TextEventKey,
std::list<std::shared_ptr<awips::TextProductMessage>>,
std::vector<std::shared_ptr<awips::TextProductMessage>>,
types::TextEventHash<types::TextEventKey>>
textEventMap_;
std::shared_mutex textEventMutex_;
@ -131,7 +131,7 @@ void TextEventManager::Impl::HandleMessage(
if (it == textEventMap_.cend())
{
// If there was no matching event, add the message to a new event
textEventMap_.emplace(key, std::list {message});
textEventMap_.emplace(key, std::vector {message});
messageIndex = 0;
updated = true;
}