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

Revision:
7:6913aebb3905
Parent:
6:d268555e2f50
Child:
8:479ed9f0ba20
--- a/button_group.cpp	Wed Dec 09 01:55:25 2015 +0000
+++ b/button_group.cpp	Fri Dec 11 14:23:01 2015 +0000
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------
 //  Button group class
 //
-//  2015/12/09, Copyright (c) 2015 MIKAMI, Naoki
+//  2015/12/11, Copyright (c) 2015 MIKAMI, Naoki
 //-----------------------------------------------------------
 
 #include "button_group.hpp"
@@ -37,18 +37,6 @@
         for (int n=0; n<numberOfButtons_; n++) delete buttons_[n];
         delete[] *buttons_;   
     }
-    
-    // Get touched number
-    bool ButtonGroup::GetTouchedNumber(int &num)
-    {
-        for (int n=0; n<numberOfButtons_; n++)
-            if (buttons_[n]->Touched())
-            {
-                num = n;
-                return true;
-            }
-        return false;
-    }
 
     // Check touch detected for specified button and redraw
     bool ButtonGroup::Touched(int num, uint32_t color,
@@ -64,6 +52,18 @@
             return false;
     }
 
+    // Get touched number
+    bool ButtonGroup::GetTouchedNumber(int &num)
+    {
+        for (int n=0; n<numberOfButtons_; n++)
+            if (buttons_[n]->Touched())
+            {
+                num = n;
+                return true;
+            }
+        return false;
+    }
+
     // Get touched number and redraw button if touched
     bool ButtonGroup::GetTouchedNumber(int &num, uint32_t color)
     {