GUI parts for DISCO-F746NG. GuiBase, Button, ButtonGroup, ResetButton, Label, BlinkLabel, NumericLabel, SeekBar, SeekbarGroup, NumericUpDown
Dependencies: Array_Matrix TS_DISCO_F746NG LCD_DISCO_F746NG BSP_DISCO_F746NG
Diff: SeekbarGroup.cpp
- Revision:
- 28:e2b7ea78b7a0
- Parent:
- 12:687ec6183385
--- a/SeekbarGroup.cpp Mon Jan 16 00:23:53 2017 +0000 +++ b/SeekbarGroup.cpp Wed Jan 25 13:56:02 2017 +0000 @@ -1,7 +1,7 @@ //----------------------------------------------------------- // SeekbarGroup class // -// 2016/04/30, Copyright (c) 2016 MIKAMI, Naoki +// 2017/01/25, Copyright (c) 2017 MIKAMI, Naoki //----------------------------------------------------------- #include "SeekbarGroup.hpp" @@ -13,14 +13,11 @@ uint16_t number, uint16_t space, float min, float max, float initialValue, SeekBar::Orientation hv, - uint32_t thumbColor, - uint16_t thumbSize, uint16_t width, - uint32_t colorL, uint32_t colorH, - uint32_t backColor) - : GuiBase(x0, y0, Font12, GuiBase::ENUM_TEXT, backColor, thumbColor), - numberOfSeekBar_(number) + uint32_t thumbColor, uint16_t thumbSize, uint16_t width, + uint32_t colorL, uint32_t colorH, uint32_t backColor) + : NUMBER_(number) { - seekBars_ = new SeekBar *[number]; + seekBars_.SetSize(number); for (int n=0; n<number; n++) { uint16_t x = x0; @@ -34,24 +31,17 @@ } } - // Destructor - SeekbarGroup::~SeekbarGroup() - { - for (int n=0; n<numberOfSeekBar_; n++) delete seekBars_[n]; - delete[] seekBars_; - } - // Get slided number bool SeekbarGroup::GetSlidedNumber(int &num) { bool active = false; - for (int n=0; n<numberOfSeekBar_; n++) + for (int n=0; n<NUMBER_; n++) if (seekBars_[n]->IsActive()) active = true; if (!active) return false; - if (!PanelTouched()) + if (!GuiBase::PanelTouched()) { - for (int n=0; n<numberOfSeekBar_; n++) + for (int n=0; n<NUMBER_; n++) { if (seekBars_[n]->GetSlided()) seekBars_[n]->Draw(seekBars_[n]->GetValue()); @@ -62,7 +52,7 @@ bool rtn = false; uint16_t x, y; - for (int n=0; n<numberOfSeekBar_; n++) + for (int n=0; n<NUMBER_; n++) { if (seekBars_[n]->IsOnThumb(x, y)) { @@ -79,3 +69,4 @@ return rtn; } } +