不韋 呂 / 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

Diff: button.hpp

Revision:
10:5ca60e724a76
Parent:
8:479ed9f0ba20
Child:
12:710078d50d9b
--- a/button.hpp	Wed Dec 23 08:00:51 2015 +0000
+++ b/button.hpp	Thu Dec 31 08:32:05 2015 +0000
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------
 //  Button class -- Header
 //
-//  2015/12/08, Copyright (c) 2015 MIKAMI, Naoki
+//  2015/12/31, Copyright (c) 2015 MIKAMI, Naoki
 //-----------------------------------------------------------
 
 #ifndef F746_BUTTON_HPP
@@ -31,26 +31,23 @@
 
         // Draw button
         void Draw(uint32_t color, uint32_t textColor = LCD_COLOR_WHITE);
-        
+
         // Redraw button with original color
         void Redraw(uint32_t textColor = LCD_COLOR_WHITE)
         {   Draw(ORIGINAL_COLOR_, textColor);   }
-        
+
         // Erase button with selected color
         void Erase()
         {   Draw(BACK_COLOR_, BACK_COLOR_);   }
-        
+
         // Check touch detected
         bool Touched();
-        
+
         // Check touch detected and redraw button
         bool Touched(uint32_t color, uint32_t textColor = LCD_COLOR_WHITE);
-        
+
         // Get original color 
         uint32_t GetOriginalColor() { return ORIGINAL_COLOR_; }
-        
-        // Get current color 
-        uint32_t GetCurrentColor() { return currentColor_; }
 
     private:
         LCD_DISCO_F746NG &lcd_;
@@ -62,8 +59,6 @@
         sFONT *const FONTS_;
         const uint16_t FONT_WIDTH_;
         const uint16_t FONT_HEIGHT_;
-        
-        uint32_t currentColor_;
 
         // disallow copy constructor and assignment operator
         Button(const Button&);