From 1a2ef10fff3c33e2eda88d298bb37e0e82cd676d Mon Sep 17 00:00:00 2001 From: JF Date: Sat, 17 Mar 2018 17:26:01 +0100 Subject: [PATCH] Code cleaning --- src/Button.h | 1 - src/StatusBar.cpp | 7 ++----- src/StatusBar.h | 1 - src/Widget.cpp | 3 ++- src/WidgetMosaic.cpp | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Button.h b/src/Button.h index b038259..767300e 100644 --- a/src/Button.h +++ b/src/Button.h @@ -12,7 +12,6 @@ namespace Codingfield { void SetTextColor(Color c); virtual void SetSelected(bool s) override; void SetText(const std::string& t); - void Draw() override; private: Color backgroundColor = BLACK; diff --git a/src/StatusBar.cpp b/src/StatusBar.cpp index 2f98039..44b8557 100644 --- a/src/StatusBar.cpp +++ b/src/StatusBar.cpp @@ -8,7 +8,7 @@ extern const uint8_t image_data_wifi2[]; extern const uint8_t image_data_wifi3[]; void StatusBar::SetWifiStatus(const StatusBar::WifiStatuses status) { - if(wifiStatus != status){ + if(wifiStatus != status) { wifiStatus = status; isUpdated = true; } @@ -42,10 +42,7 @@ void StatusBar::Draw() { M5.Lcd.setTextDatum(TC_DATUM); M5.Lcd.drawString(dateTime.c_str(), 160, 5); -/* - M5.Lcd.setTextDatum(TR_DATUM); - M5.Lcd.drawString("21C", 319, 5); - */ + const uint8_t* wifibmp = image_data_wifi0; switch(wifiStatus) { case WifiStatuses::Weak: wifibmp = image_data_wifi1; break; diff --git a/src/StatusBar.h b/src/StatusBar.h index 5bd486c..f489d28 100644 --- a/src/StatusBar.h +++ b/src/StatusBar.h @@ -9,7 +9,6 @@ namespace Codingfield { enum class WifiStatuses {No_signal, Weak, Medium, Full}; StatusBar(Widget* parent, Point position, int32_t height) : Bar(parent, position, height) {} void Draw() override; - void SetWifiStatus(const WifiStatuses status); void SetUptime(const uint32_t t); void SetDateTime(const std::string& t); diff --git a/src/Widget.cpp b/src/Widget.cpp index eb6c262..c94f49b 100644 --- a/src/Widget.cpp +++ b/src/Widget.cpp @@ -3,7 +3,8 @@ using namespace Codingfield::UI; Widget::Widget(Widget* parent) : Widget(parent, Point(0,0), Size(0,0)) { - } + +} Widget::Widget(Widget* parent, Point position, Size size) : parent{parent}, position{position}, size {size} { if(parent != nullptr) diff --git a/src/WidgetMosaic.cpp b/src/WidgetMosaic.cpp index da34a6c..8a99a26 100644 --- a/src/WidgetMosaic.cpp +++ b/src/WidgetMosaic.cpp @@ -7,9 +7,8 @@ WidgetMosaic::WidgetMosaic(Widget* parent, Point position, Size size) : Widget(p } void WidgetMosaic::Draw() { - for(Widget* w : children) { + for(Widget* w : children) w->Draw(); - } } void WidgetMosaic::AddChild(Widget* widget) {