不韋 呂 / BUTTON_GROUP

Class library: Button class and ButtonGroup class for DISCO-F746NG. クラスライブラリ： DISCO-F746NG 用の，Button クラス，ButtonGroup クラス．

Dependents:   F746_SpectralAnalysis_NoPhoto F746_Fourier_series_of_square_wave_01 F746_ButtonGroup_Demo F746_Mandelbrot ... more

Files at this revision

API Documentation at this revision

Revision 3:d99d9c0324b7, committed 2015-11-23

Comitter:
MikamiUitOpen
Date:
Mon Nov 23 09:47:50 2015 +0000
Parent:
2:682475aae171
Child:
4:543ec60c2814
Commit message:
4

Changed in this revision

button.hpp Show annotated file Show diff for this revision Revisions of this file
button_group.cpp Show annotated file Show diff for this revision Revisions of this file
button_group.hpp Show annotated file Show diff for this revision Revisions of this file 
--- a/button.hpp	Mon Nov 23 01:26:27 2015 +0000
+++ b/button.hpp	Mon Nov 23 09:47:50 2015 +0000
@@ -21,7 +21,7 @@
         Button(LCD_DISCO_F746NG &lcd, TS_DISCO_F746NG &ts,
                uint16_t x, uint16_t y, uint16_t width, uint16_t height,
                uint32_t color, uint32_t backColor,
-               string str = "", sFONT &fonts = Font12,
+               const string str = "", sFONT &fonts = Font12,
                uint32_t textColor = LCD_COLOR_WHITE)
               : lcd_(lcd), ts_(ts), X_(x), Y_(y), W_(width), H_(height),
                      COLOR_(color), BACK_COLOR_(backColor),

--- a/button_group.cpp	Mon Nov 23 01:26:27 2015 +0000
+++ b/button_group.cpp	Mon Nov 23 09:47:50 2015 +0000
@@ -13,7 +13,7 @@
                              uint16_t x0, uint16_t y0,
                              uint16_t width, uint16_t height,
                              uint32_t color, uint32_t backColor,
-                             uint16_t number, string str[],
+                             uint16_t number, const string str[],
                              uint16_t spaceX, uint16_t spaceY,
                              uint16_t column,
                              sFONT &fonts, uint32_t textColor)

--- a/button_group.hpp	Mon Nov 23 01:26:27 2015 +0000
+++ b/button_group.hpp	Mon Nov 23 09:47:50 2015 +0000
@@ -20,7 +20,7 @@
                     uint16_t x0, uint16_t y0,
                     uint16_t width, uint16_t height,
                     uint32_t color, uint32_t backColor,
-                    uint16_t number, string str[],
+                    uint16_t number, const string str[],
                     uint16_t spaceX = 0, uint16_t spaceY = 0,
                     uint16_t column = 1,
                     sFONT &fonts = Font12,