Diff: main.cpp

Revision:

25:586781d009dd

Parent:

24:0191b2cbe7d9

Child:

26:9f98a43d4098

diff -r 0191b2cbe7d9 -r 586781d009dd main.cpp
--- a/main.cpp	Sun Apr 02 07:05:27 2017 +0000
+++ b/main.cpp	Mon Mar 19 04:21:00 2018 +0000
@@ -3,36 +3,40 @@
 //  Demo program for GuiBase class and its derivertive classes
 //
 //      GuiBase, Button, ButtonGroup, Label, NumericLabel, BlinkLabel,
-//      SeekBar, SeekbarGroup
+//      SeekBar, SeekbarGroup, NumericUpDown
 //
-//  2017/04/02, Copyright (c) 2017 MIKAMI, Naoki
+//      ＜インポートしたライブラリのリビジョン＞
+//          F746_GUI     33
+//          mbed        161
+//
+//  2018/03/12, Copyright (c) 2018 MIKAMI, Naoki
 //-----------------------------------------------------------------------
 
 #include "F746_GUI.hpp"
 
 int main()
 {
-    Label obj10(240, 2, "Dome: GUI parts, 2017/03/17", Label::CENTER, Font16);
+    Label obj10(240, 2, "Demo: GUI parts, 2018/03/12", Label::CENTER, Font16);
     Label obj11(240, 20, "Button, ButtonGroup, Label, NumericLabel, BlinkLabel,",
                 Label::CENTER);
-    Label obj12(240, 32, "SeekBar, SeekbarGroup",
+    Label obj12(240, 32, "SeekBar, SeekbarGroup, NumericUpDown",
                 Label::CENTER);
 
-    Button button1(10, 54, 50, 40, "1");
-    Button button2(62, 54, 50, 40, "2");
+    Button button1(10, 54, 30, 35, "1");
+    Button button2(42, 54, 30, 35, "2");
 
     const int NUMBER_BUTTONS = 4;
     const string STR1[NUMBER_BUTTONS] = {"Button1", "Button2", "Button3", "Activate"};
-    ButtonGroup bGroup1(160, 54, 66, 40,  NUMBER_BUTTONS, STR1, 5, 5, 3, 1,
+    ButtonGroup bGroup1(168, 54, 66, 35,  NUMBER_BUTTONS, STR1, 2, 2, 3, 1,
                         Font12, LCD_COLOR_WHITE, 0xFF003538, 0xFFB70068, 0xFFFF7FFF);
     NumericLabel<int> bTouch(240, 112, "", Label::LEFT, Font12, LCD_COLOR_MAGENTA);
 
-    // Control status of bGroup1
-    ButtonGroup bGroup2(160, 150, 66, 40,  3, (string[]){"0", "1", "2"}, 5, 5, 3);
+    // Control status of bGroup2
+    ButtonGroup bGroup2(168, 150, 66, 40,  3, (string[]){"0", "1", "2"}, 5, 5, 3);
     bGroup2.InactivateAll();
     
     // Switching buttons to control barH active or inactive
-    ButtonGroup bGroup3(10, 150, 66, 40,  2, (string[]){"ON", "OFF"}, 0, 0, 2);
+    ButtonGroup bGroup3(78, 54, 40, 35,  2, (string[]){"ON", "OFF"}, 0, 0, 2);
     bGroup3.TouchedColor(0);
 
     Button doNotTouch(250, 220, 120, 40, "Don't Touch", Font12,
@@ -59,6 +63,9 @@
     Label leftJustified(420, 54, "ABC", Label::LEFT);
     Label centerJustified(420, 64, "ABC", Label::CENTER);
     Label rightJustified1(420, 74, "ABC", Label::RIGHT);
+    
+    // NumericalUpDown
+    NumericUpDown nUd(3, 10, 190, 100, 999, 10);
 
     while (true)
     {
@@ -121,6 +128,8 @@
             barH.Inactivate();
             barV.InactivateAll();
         }
+        
+        if (nUd.Touched()) {}   // Example of NumericalUpDown
 
         wait(0.02f);
     }