Fabien MOULINNEUF
/
Projet
fini
Diff: main.cpp
- Revision:
- 11:0195d802ab3d
- Parent:
- 10:f23cca92f446
- Child:
- 12:262492b42b04
diff -r f23cca92f446 -r 0195d802ab3d main.cpp --- a/main.cpp Wed Apr 27 07:28:31 2016 +0000 +++ b/main.cpp Sat Apr 30 06:34:22 2016 +0000 @@ -5,7 +5,7 @@ // GuiBase, Button, ButtonGroup, Label, NumericLabel, BlinkLabel, // SeekBar, SeekbarGroup // -// 2016/04/27, Copyright (c) 2016 MIKAMI, Naoki +// 2016/04/30, Copyright (c) 2016 MIKAMI, Naoki //-------------------------------------------------------------------------------- #include "NumericLabel.hpp" @@ -26,18 +26,20 @@ int main() { - Label obj10(240, 4, "Dome: GUI parts, 2016/04/27, 08:24", Label::CENTER, Font16); - Label obj11(240, 24, "Label, NumericLabel, BlinkLabel, Button, ButtonGroup, SeekBar", + Label obj10(240, 2, "Dome: GUI parts, 2016/04/30, 15:31", 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, 50, 50, 40, "1"); - Button button2(62, 50, 50, 40, "2"); + Button button1(10, 52, 50, 40, "1"); + Button button2(62, 52, 50, 40, "2"); const int NUMBER_BUTTONS = 4; const string STR1[NUMBER_BUTTONS] = {"Button1", "Button2", "Button3", "Activate"}; - ButtonGroup bGroup1(160, 50, 66, 40, NUMBER_BUTTONS, STR1, 5, 5, 3, 1, + ButtonGroup bGroup1(160, 52, 66, 40, NUMBER_BUTTONS, STR1, 5, 5, 3, 1, Font12, LCD_COLOR_WHITE, 0xFF003538, 0xFFB70068, 0xFFFF7FFF); - NumericLabel<int> bTouch(240, 108, Label::LEFT, Font12, LCD_COLOR_MAGENTA); + NumericLabel<int> bTouch(240, 112, Label::LEFT, Font12, LCD_COLOR_MAGENTA); // Control status of bGroup1 const string STR2[3] = {"0", "1", "2"}; @@ -61,16 +63,16 @@ // SeekbarGroup (vertical) SeekbarGroup barV(400, 120, 130, 2, 50, -5, 5, 2, - SeekBar::Vertical, LCD_COLOR_GREEN); + SeekBar::Vertical, 0xFFA0FFC0); NumericLabel<float> **numLabel4; numLabel4 = new NumericLabel<float> *[2]; for (int n=0; n<2; n++) numLabel4[n] = - new NumericLabel<float>(400+n*50, 90, "%4.1f", barV.GetValue(n), Label::CENTER); + new NumericLabel<float>(400+n*50, 94, "%4.1f", barV.GetValue(n), Label::CENTER); // Test of left-, cenrer-, right-justified - Label leftJustified(420, 50, "ABC", Label::LEFT); - Label centerJustified(420, 60, "ABC", Label::CENTER); - Label rightJustified1(420, 70, "ABC", Label::RIGHT); + Label leftJustified(420, 52, "ABC", Label::LEFT); + Label centerJustified(420, 62, "ABC", Label::CENTER); + Label rightJustified1(420, 72, "ABC", Label::RIGHT); timer.attach(&TimerIsr, 0.1f); @@ -136,6 +138,3 @@ wait(0.02f); } } - - -