New IHM
Dependencies: Array_Matrix TS_DISCO_F746NG LCD_DISCO_F746NG BSP_DISCO_F746NG
Diff: Label.cpp
- Revision:
- 1:d1655f3c8717
- Parent:
- 0:a2686ef737c2
- Child:
- 4:cbf7ed9092a3
diff -r a2686ef737c2 -r d1655f3c8717 Label.cpp --- a/Label.cpp Thu Mar 31 07:28:42 2016 +0000 +++ b/Label.cpp Sun Apr 03 10:36:27 2016 +0000 @@ -1,7 +1,7 @@ //----------------------------------------------------------- // Label class // -// 2016/03/29, Copyright (c) 2016 MIKAMI, Naoki +// 2016/04/03, Copyright (c) 2016 MIKAMI, Naoki //----------------------------------------------------------- #include "Label.hpp" @@ -13,7 +13,7 @@ const string str, TextAlignMode mode, sFONT &fonts, uint32_t textColor, uint32_t backColor) : GuiBase(x, y, fonts, textColor, backColor), - MODE_(mode) + MODE_(mode), STR_(str) { length_ = str.length(); lcd_.SetBackColor(backColor); @@ -22,17 +22,17 @@ DrawString(PosX(x), y, str); } - void Label::Draw(const string str) + void Label::Draw(const string str, uint32_t textColor) { // Erase previously-drawn string lcd_.SetTextColor(BACK_COLOR_); length_ = (length_ > str.length()) ? length_ : str.length(); lcd_.FillRect(PosX(X_), Y_, FONTS_->Width*length_+1, FONTS_->Height); - lcd_.SetTextColor(TEXT_COLOR_); // Draw new string length_ = str.length(); lcd_.SetFont(FONTS_); + lcd_.SetTextColor(textColor); DrawString(PosX(X_), Y_, str); } }