Revision 2:5fa6c61211a1, committed 2019-06-06

Comitter:

Adasqo

Date:

Thu Jun 06 09:07:37 2019 +0000

Parent:

1:222362fa4bea

Commit message:

aaaaa

Changed in this revision

diff -r 222362fa4bea -r 5fa6c61211a1 main.cpp
--- a/main.cpp	Wed Feb 20 09:24:35 2019 +0000
+++ b/main.cpp	Thu Jun 06 09:07:37 2019 +0000
@@ -8,35 +8,35 @@
 {
     BSP_LED_Init(DISCO_LED_BLUE);
     
-    Label obj10(400, 2, "Dome: GUI parts, 2016/07/23, 12:24", Label::CENTER, Font16);
-    Label obj11(400, 20, "Button, ButtonGroup, Label, NumericLabel, BlinkLabel,",
-                Label::CENTER);
-    Label obj12(400, 32, "SeekBar, SeekbarGroup",
-                Label::CENTER);
+//    Label obj10(400, 2, "Dome: GUI parts, 2016/07/23, 12:24", Label::CENTER, Font16);
+//    Label obj11(400, 20, "Button, ButtonGroup, Label, NumericLabel, BlinkLabel,",
+//                Label::CENTER);
+//    Label obj12(400, 32, "SeekBar, SeekbarGroup",
+//                Label::CENTER);
 
-    Button button1(10, 300, 80, 60, "1");
-    Button button2(95, 300, 80, 60, "2");
+    Button button1(10, 350, 80, 60, "1");
+    Button button2(95, 350, 80, 60, "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,
+    const string STR1[NUMBER_BUTTONS] = {"Pomiar jednorazowy", "Pomiar okresowy", "Pomiar testowy", "Activate"};
+    ButtonGroup bGroup1(20, 20, 200, 70,  NUMBER_BUTTONS, STR1, 5, 4, 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);
+    ButtonGroup bGroup2(160, 200, 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(10, 200, 66, 40,  2, (string[]){"ON", "OFF"}, 0, 0, 2);
     bGroup3.TouchedColor(0);
 
-    Button doNotTouch(250, 220, 120, 40, "Don't Touch", Font12,
+    Button doNotTouch(250, 250, 120, 40, "Don't Touch", Font12,
                       GuiBase::ENUM_TEXT, GuiBase::ENUM_BACK,
                       LCD_COLOR_DARKGREEN, LCD_COLOR_RED);
 
     // Using default value for argument (Horizontal)
-    SeekBar barH(20, 250, 200, -5, 5, 0, "-5", "0", "5");
+    SeekBar barH(20, 290, 200, -5, 5, 0, "-5", "0", "5");
     NumericLabel<float> numLabel1(80, 205, "%5.1f", barH.GetValue());
     NumericLabel<int> numLabel2(130, 205, "%3d", (int)barH.GetValue());
     NumericLabel<int> numLabel3(160, 205);