From fc16bc7867746b4c8795af688acee6410860639f Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Thu, 14 Jan 2016 09:19:16 -0800 Subject: [PATCH] Rename AISView to AISRecentEntriesView. Coming soon, top-layer AISAppView. --- firmware/application/ais_app.cpp | 16 ++++++++-------- firmware/application/ais_app.hpp | 6 +++--- firmware/application/ui_receiver.cpp | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/firmware/application/ais_app.cpp b/firmware/application/ais_app.cpp index d45004ec..58604311 100644 --- a/firmware/application/ais_app.cpp +++ b/firmware/application/ais_app.cpp @@ -163,7 +163,7 @@ void AISRecentEntries::truncate_entries() { namespace ui { -AISView::AISView() { +AISRecentEntriesView::AISRecentEntriesView() { flags.focusable = true; EventDispatcher::message_map().register_handler(Message::ID::AISPacket, @@ -185,27 +185,27 @@ AISView::AISView() { receiver_model.set_baseband_bandwidth(1750000); } -AISView::~AISView() { +AISRecentEntriesView::~AISRecentEntriesView() { EventDispatcher::message_map().unregister_handler(Message::ID::AISPacket); } -void AISView::on_packet(const ais::Packet& packet) { +void AISRecentEntriesView::on_packet(const ais::Packet& packet) { recent.on_packet(packet); set_dirty(); } -void AISView::on_focus() { +void AISRecentEntriesView::on_focus() { has_focus = true; set_dirty(); } -void AISView::on_blur() { +void AISRecentEntriesView::on_blur() { has_focus = false; set_dirty(); } -bool AISView::on_encoder(const EncoderEvent event) { +bool AISRecentEntriesView::on_encoder(const EncoderEvent event) { advance(event); return true; } @@ -230,7 +230,7 @@ static void ais_list_item_draw( painter.draw_string(target_rect.pos, draw_style, line); } -void AISView::paint(Painter& painter) { +void AISRecentEntriesView::paint(Painter& painter) { const auto r = screen_rect(); const auto& s = style(); @@ -266,7 +266,7 @@ void AISView::paint(Painter& painter) { } } -void AISView::advance(const int32_t amount) { +void AISRecentEntriesView::advance(const int32_t amount) { auto selected = recent.find_by_mmsi(selected_key); if( selected == std::end(recent) ) { if( recent.empty() ) { diff --git a/firmware/application/ais_app.hpp b/firmware/application/ais_app.hpp index 7b272895..43e56771 100644 --- a/firmware/application/ais_app.hpp +++ b/firmware/application/ais_app.hpp @@ -106,10 +106,10 @@ private: namespace ui { -class AISView : public View { +class AISRecentEntriesView : public View { public: - AISView(); - ~AISView(); + AISRecentEntriesView(); + ~AISRecentEntriesView(); void paint(Painter& painter) override; diff --git a/firmware/application/ui_receiver.cpp b/firmware/application/ui_receiver.cpp index 176673ee..2c17edfa 100644 --- a/firmware/application/ui_receiver.cpp +++ b/firmware/application/ui_receiver.cpp @@ -517,7 +517,7 @@ void ReceiverView::on_modulation_changed(ReceiverModel::Mode mode) { break; case ReceiverModel::Mode::AIS: - widget_content = std::make_unique(); + widget_content = std::make_unique(); break; case ReceiverModel::Mode::SpectrumAnalysis: