Mladen Adamovic / F746_GUI

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   Array_Matrix BSP_DISCO_F746NG LCD_DISCO_F746NG TS_DISCO_F746NG

Dependents:   Spectrogram

Fork of F746_GUI by 不韋 呂

Files at this revision

API Documentation at this revision

Revision 2:d2f882d98f0a, committed 2016-04-05

Comitter:
MikamiUitOpen
Date:
Tue Apr 05 13:23:17 2016 +0000
Parent:
1:d1655f3c8717
Child:
3:fe6ff954824a
Commit message:
3

Changed in this revision

ButtonGroup.cpp Show annotated file Show diff for this revision Revisions of this file
ButtonGroup.hpp Show annotated file Show diff for this revision Revisions of this file
Label.hpp Show annotated file Show diff for this revision Revisions of this file 
--- a/ButtonGroup.cpp	Sun Apr 03 10:36:27 2016 +0000
+++ b/ButtonGroup.cpp	Tue Apr 05 13:23:17 2016 +0000
@@ -55,7 +55,7 @@
         return true;
     }
 
-    // Erase button with selected color
+    // Erase button
     bool ButtonGroup::Erase(int num)
     {
         if (!Range(num)) return false;
@@ -114,3 +114,4 @@
         return true;
     }
 }
+

--- a/ButtonGroup.hpp	Sun Apr 03 10:36:27 2016 +0000
+++ b/ButtonGroup.hpp	Tue Apr 05 13:23:17 2016 +0000
@@ -47,7 +47,7 @@
         }
         void DrawAll() { DrawAll(CREATED_COLOR_, TEXT_COLOR_); }
 
-        // Erase button with selected color
+        // Erase button
         bool Erase(int num);
 
         // Check touch detected for specified button

--- a/Label.hpp	Sun Apr 03 10:36:27 2016 +0000
+++ b/Label.hpp	Tue Apr 05 13:23:17 2016 +0000
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------
 //  Label class -- Header
 //
-//  2016/04/03, Copyright (c) 2016 MIKAMI, Naoki
+//  2016/04/05, Copyright (c) 2016 MIKAMI, Naoki
 //-----------------------------------------------------------
 
 #ifndef F746_LABEL_HPP
@@ -23,13 +23,16 @@
               uint32_t backColor = GuiBase::ENUM_BACK);
 
         void Draw()
-        {   Draw(STR_, GuiBase::ENUM_TEXT); }
+        {   Draw(STR_, TEXT_COLOR_); }
+
+        void Draw(const string str)
+        {   Draw(str, TEXT_COLOR_); }
 
         void Draw(uint32_t textColor)
         {   Draw(STR_, textColor); }
 
         void Draw(const string str,
-                  uint32_t textColor = GuiBase::ENUM_TEXT);
+                  uint32_t textColor);
 
     private:
         const TextAlignMode MODE_;