Diff: main.cpp

Revision:

16:3aed2b59c2c4

Parent:

15:57ef81ebf5bd

Child:

17:075f38d8c54a

--- a/main.cpp	Sat Jul 23 04:33:28 2016 +0000
+++ b/main.cpp	Sun Nov 06 23:44:07 2016 +0000
@@ -5,14 +5,16 @@
 //      GuiBase, Button, ButtonGroup, Label, NumericLabel, BlinkLabel,
 //      SeekBar, SeekbarGroup
 //
-//  2016/07/23, Copyright (c) 2016 MIKAMI, Naoki
+//  mbed ライブラリのリビジョンは 121 またはそれ以前のものを使うこと
+//
+//  2016/11/06, Copyright (c) 2016 MIKAMI, Naoki
 //-----------------------------------------------------------------------
 
 #include "F746_GUI.hpp"
 
 int main()
 {
-    Label obj10(240, 2, "Dome: GUI parts, 2016/07/23, 12:24", Label::CENTER, Font16);
+    Label obj10(240, 2, "Dome: GUI parts, 2016/07/30, 19:43", Label::CENTER, Font16);
     Label obj11(240, 20, "Button, ButtonGroup, Label, NumericLabel, BlinkLabel,",
                 Label::CENTER);
     Label obj12(240, 32, "SeekBar, SeekbarGroup",
@@ -25,7 +27,7 @@
     const string STR1[NUMBER_BUTTONS] = {"Button1", "Button2", "Button3", "Activate"};
     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);
+    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);
@@ -43,7 +45,7 @@
     SeekBar barH(20, 250, 200, -5, 5, 0, "-5", "", "5");
     NumericLabel<float> numLabel1(80, 205, "%5.1f", barH.GetValue());
     NumericLabel<int> numLabel2(130, 205, "%3d", (int)barH.GetValue());
-    NumericLabel<int> numLabel3(160, 205);
+    NumericLabel<int> numLabel3(160, 205, "%3d");
     
     // SeekbarGroup (vertical)
     SeekbarGroup barV(410, 130, 121, 2, 45, -6, 6, 2,
@@ -95,7 +97,7 @@
             int8_t x = (int8_t)barH.GetValue();
             numLabel2.Draw("%3d", x);
 
-            numLabel3.Draw("%3d", barH.GetIntValue());            
+            numLabel3.Draw(barH.GetIntValue());            
         }        
 
         int sbNum;