Diff: main.cpp

Revision:

4:4f73a3054a67

Parent:

3:e92615be71c7

Child:

6:ea30227e7db0

--- a/main.cpp	Sun Apr 10 09:26:28 2016 +0000
+++ b/main.cpp	Tue Apr 12 04:16:13 2016 +0000
@@ -2,9 +2,9 @@
 //  GuiBase とその派生クラスのデモプログラム
 //  Demo program for GuiBase class and its derivertive classes
 //
-//      GuiBase, Button, ButtonGroup, Label, NumericLabel, BlimkButton, SeekBar
+//      GuiBase, Button, ButtonGroup, Label, NumericLabel, BlinkLabel, SeekBar
 //
-//  2016/04/10, Copyright (c) 2016 MIKAMI, Naoki
+//  2016/04/12, Copyright (c) 2016 MIKAMI, Naoki
 //--------------------------------------------------------------------------------
 
 #include "NumericLabel.hpp"
@@ -25,7 +25,7 @@
 
 int main()
 {
-    Label obj10(240, 4, "Dome: GUI parts", Label::CENTER, Font16);
+    Label obj10(240, 4, "Dome: GUI parts, 2016/04/12", Label::CENTER, Font16);
     Label obj11(240, 24, "Label, NumericLabel, BlinkLabel, Button, ButtonGroup, SeekBar",
                 Label::CENTER);
 
@@ -52,10 +52,10 @@
                       LCD_COLOR_DARKGREEN, LCD_COLOR_RED);
 
     // Using default value for argument (Horisontal)
-    SeekBar barH(20, 240, 200, -5, 5, 0);
-    NumericLabel<float> numLabel1(20, 200, "%5.1f", barH.GetValue());
-    NumericLabel<int> numLabel2(90, 200, "%3d", (int)barH.GetValue());
-    NumericLabel<int> numLabel3(120, 200);
+    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);
     
     // SeekBar (vertical)
     SeekBar barV(440, 100, 150, -5, 5, 2, SeekBar::Vertical, LCD_COLOR_GREEN);
@@ -102,8 +102,16 @@
             BlinkLabel warning(250, 200, "You must reset", Label::LEFT, Font16);
             
         // SeekBar active inactive switching
-        if (bGroup3.Touched(0)) barH.Activate();
-        if (bGroup3.Touched(1)) barH.Inactivate();
+        if (bGroup3.Touched(0))
+        {
+            barH.Activate();
+            barV.Activate();
+        }
+        if (bGroup3.Touched(1))
+        {
+            barH.Inactivate();
+            barV.Inactivate();
+        }
 
         wait(0.02f);
     }