Diff: main.cpp

Revision:

15:57ef81ebf5bd

Parent:

14:36859ef194d1

Child:

16:3aed2b59c2c4

--- a/main.cpp	Tue Jul 12 02:23:58 2016 +0000
+++ b/main.cpp	Sat Jul 23 04:33:28 2016 +0000
@@ -5,19 +5,14 @@
 //      GuiBase, Button, ButtonGroup, Label, NumericLabel, BlinkLabel,
 //      SeekBar, SeekbarGroup
 //
-//  2016/07/12, Copyright (c) 2016 MIKAMI, Naoki
+//  2016/07/23, Copyright (c) 2016 MIKAMI, Naoki
 //-----------------------------------------------------------------------
 
-#include "NumericLabel.hpp"
-#include "BlinkLabel.hpp"
-#include "ButtonGroup.hpp"
-#include "SeekbarGroup.hpp"
-
-using namespace Mikami;
+#include "F746_GUI.hpp"
 
 int main()
 {
-    Label obj10(240, 2, "Dome: GUI parts, 2016/07/12, 11:24", Label::CENTER, Font16);
+    Label obj10(240, 2, "Dome: GUI parts, 2016/07/23, 12:24", Label::CENTER, Font16);
     Label obj11(240, 20, "Button, ButtonGroup, Label, NumericLabel, BlinkLabel,",
                 Label::CENTER);
     Label obj12(240, 32, "SeekBar, SeekbarGroup",
@@ -33,13 +28,11 @@
     NumericLabel<int> bTouch(240, 112, Label::LEFT, Font12, LCD_COLOR_MAGENTA);
 
     // Control status of bGroup1
-    const string STR2[3] = {"0", "1", "2"};
-    ButtonGroup bGroup2(160, 150, 66, 40,  3, STR2, 5, 5, 3);
+    ButtonGroup bGroup2(160, 150, 66, 40,  3, (string[]){"0", "1", "2"}, 5, 5, 3);
     bGroup2.InactivateAll();
     
     // Switching buttons to control barH active or inactive
-    const string STR3[3] = {"ON", "OFF"};
-    ButtonGroup bGroup3(10, 150, 66, 40,  2, STR3, 0, 0, 2);
+    ButtonGroup bGroup3(10, 150, 66, 40,  2, (string[]){"ON", "OFF"}, 0, 0, 2);
     bGroup3.TouchedColor(0);
 
     Button doNotTouch(250, 220, 120, 40, "Don't Touch", Font12,