Diff: main.cpp

Revision:

14:36859ef194d1

Parent:

13:270545d8d62e

Child:

15:57ef81ebf5bd

--- a/main.cpp	Sun Jul 03 02:07:47 2016 +0000
+++ b/main.cpp	Tue Jul 12 02:23:58 2016 +0000
@@ -1,12 +1,12 @@
-//--------------------------------------------------------------------------------
+//-----------------------------------------------------------------------
 //  GuiBase とその派生クラスのデモプログラム
 //  Demo program for GuiBase class and its derivertive classes
 //
 //      GuiBase, Button, ButtonGroup, Label, NumericLabel, BlinkLabel,
 //      SeekBar, SeekbarGroup
 //
-//  2016/07/03, Copyright (c) 2016 MIKAMI, Naoki
-//--------------------------------------------------------------------------------
+//  2016/07/12, Copyright (c) 2016 MIKAMI, Naoki
+//-----------------------------------------------------------------------
 
 #include "NumericLabel.hpp"
 #include "BlinkLabel.hpp"
@@ -17,18 +17,18 @@
 
 int main()
 {
-    Label obj10(240, 2, "Dome: GUI parts, 2016/07/03, 11:05", Label::CENTER, Font16);
+    Label obj10(240, 2, "Dome: GUI parts, 2016/07/12, 11:24", Label::CENTER, Font16);
     Label obj11(240, 20, "Button, ButtonGroup, Label, NumericLabel, BlinkLabel,",
                 Label::CENTER);
     Label obj12(240, 32, "SeekBar, SeekbarGroup",
                 Label::CENTER);
 
-    Button button1(10, 52, 50, 40, "1");
-    Button button2(62, 52, 50, 40, "2");
+    Button button1(10, 54, 50, 40, "1");
+    Button button2(62, 54, 50, 40, "2");
 
     const int NUMBER_BUTTONS = 4;
     const string STR1[NUMBER_BUTTONS] = {"Button1", "Button2", "Button3", "Activate"};
-    ButtonGroup bGroup1(160, 52, 66, 40,  NUMBER_BUTTONS, STR1, 5, 5, 3, 1,
+    ButtonGroup bGroup1(160, 54, 66, 40,  NUMBER_BUTTONS, STR1, 5, 5, 3, 1,
                         Font12, LCD_COLOR_WHITE, 0xFF003538, 0xFFB70068, 0xFFFF7FFF);
     NumericLabel<int> bTouch(240, 112, Label::LEFT, Font12, LCD_COLOR_MAGENTA);
 
@@ -62,9 +62,9 @@
     NumericLabel<int> numLabel5(455, 92, "%1d", barV.GetIntValue(0), Label::CENTER);
 
     // Test of left-, cenrer-, and right-justified
-    Label leftJustified(420, 52, "ABC", Label::LEFT);
-    Label centerJustified(420, 62, "ABC", Label::CENTER);
-    Label rightJustified1(420, 72, "ABC", Label::RIGHT);
+    Label leftJustified(420, 54, "ABC", Label::LEFT);
+    Label centerJustified(420, 64, "ABC", Label::CENTER);
+    Label rightJustified1(420, 74, "ABC", Label::RIGHT);
 
     while (true)
     {