不韋 呂 / BUTTON_GROUP

Class library: Button class and ButtonGroup class for DISCO-F746NG. クラスライブラリ： DISCO-F746NG 用の，Button クラス，ButtonGroup クラス．

Dependents:   F746_SpectralAnalysis_NoPhoto F746_Fourier_series_of_square_wave_01 F746_ButtonGroup_Demo F746_Mandelbrot ... more

Files at this revision

API Documentation at this revision

Revision 1:57fe493e8db2, committed 2015-11-23

Comitter:
MikamiUitOpen
Date:
Mon Nov 23 01:05:59 2015 +0000
Parent:
0:d3038879fed6
Child:
2:682475aae171
Commit message:
2

Changed in this revision

button.cpp Show annotated file Show diff for this revision Revisions of this file
button.hpp Show annotated file Show diff for this revision Revisions of this file
button_group.cpp Show annotated file Show diff for this revision Revisions of this file
button_group.hpp Show annotated file Show diff for this revision Revisions of this file 
--- a/button.cpp	Sun Nov 22 10:07:55 2015 +0000
+++ b/button.cpp	Mon Nov 23 01:05:59 2015 +0000
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------
 //  Button class
 //
-//  2015/11/22, Copyright (c) 2015 MIKAMI, Naoki
+//  2015/11/23, Copyright (c) 2015 MIKAMI, Naoki
 //-----------------------------------------------------------
 
 #include "button.hpp"
@@ -56,3 +56,4 @@
         return rtn;
     }
 }
+

--- a/button.hpp	Sun Nov 22 10:07:55 2015 +0000
+++ b/button.hpp	Mon Nov 23 01:05:59 2015 +0000
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------
 //  Button class -- Header
 //
-//  2015/11/22, Copyright (c) 2015 MIKAMI, Naoki
+//  2015/11/23, Copyright (c) 2015 MIKAMI, Naoki
 //-----------------------------------------------------------
 
 #ifndef F746_BUTTON_HPP
@@ -63,3 +63,4 @@
     };
 }
 #endif  // F746_BUTTON_HPP
+

--- a/button_group.cpp	Sun Nov 22 10:07:55 2015 +0000
+++ b/button_group.cpp	Mon Nov 23 01:05:59 2015 +0000
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------
 //  Button group class -- Header
 //
-//  2015/11/22, Copyright (c) 2015 MIKAMI, Naoki
+//  2015/11/23, Copyright (c) 2015 MIKAMI, Naoki
 //-----------------------------------------------------------
 
 #include "button_group.hpp"
@@ -51,19 +51,20 @@
     }
 
     // Get touched number and redraw button if touched
-    bool ButtonGroup::GetTouchedNumber(int &num, uint32_t color,
-                                       uint32_t textColor)
+    bool ButtonGroup::GetTouchedNumber(int &num, uint32_t color)
     {
         if (GetTouchedNumber(num))
         {
             for (int n=0; n<numberOfButtons_; n++)
                 if (n == num)
-                    buttons_[n]->Draw(color, textColor);
+                    buttons_[n]->Draw(color);
                 else
-                    buttons_[n]->Draw(buttons_[n]->GetColor(), textColor);
+                    buttons_[n]->Draw(buttons_[n]->GetColor());
             return true;
         }
         else
             return false;
     }
 }
+
+

--- a/button_group.hpp	Sun Nov 22 10:07:55 2015 +0000
+++ b/button_group.hpp	Mon Nov 23 01:05:59 2015 +0000
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------
 //  Button group class -- Header
 //
-//  2015/11/22, Copyright (c) 2015 MIKAMI, Naoki
+//  2015/11/23, Copyright (c) 2015 MIKAMI, Naoki
 //-----------------------------------------------------------
 
 #ifndef F746_BUTTON_GROUP_HPP
@@ -53,7 +53,7 @@
         bool GetTouchedNumber(int &num);
 
         // Get touched number and redraw button if touched
-        bool GetTouchedNumber(int &num, uint32_t color, uint32_t textColor = LCD_COLOR_WHITE);
+        bool GetTouchedNumber(int &num, uint32_t color);
 
     private:
         Button **buttons_;