Reverted WFM mode to working state

TXView in ADSB TX
Lockable TXView
POCSAG TX bugfix with Alphanum and Numeric only
Testing Labels widget
This commit is contained in:
furrtek 2017-02-12 04:05:21 +00:00
parent 884d0c4f58
commit 0102a34286
17 changed files with 202 additions and 133 deletions

View file

@ -110,7 +110,7 @@ void pocsag_encode(
size_t b, c, address_slot;
size_t bit_idx, char_idx = 0;
uint32_t codeword, digit_code;
char ascii_char;
char ascii_char = 0;
size_t message_size = message.size();
@ -140,6 +140,7 @@ void pocsag_encode(
if (type == MessageType::ADDRESS_ONLY) return; // Done.
c++;
codeword = 0;
bit_idx = 20 + 11;

View file

@ -349,6 +349,32 @@ void Text::paint(Painter& painter) {
);
}
/* Labels ****************************************************************/
Labels::Labels(
std::vector<Label> * labels
) : labels_ { labels }
{
}
void Labels::set_labels(std::vector<Label> * const labels) {
labels_ = labels;
set_dirty();
}
void Labels::paint(Painter& painter) {
/*const auto rect = screen_rect();
const auto s = style();
painter.fill_rectangle(rect, s.background);
painter.draw_string(
rect.location(),
s,
text
);*/
}
/* BigFrequency **********************************************************/
const uint8_t big_segment_font[11] = {

View file

@ -211,6 +211,29 @@ private:
std::string text;
};
class Labels : public Widget {
public:
struct Label {
Point pos;
std::string text;
ui::Color color;
};
Labels(const Labels&) = delete;
Labels(Labels&&) = delete;
Labels& operator=(const Labels&) = delete;
Labels& operator=(Labels&&) = delete;
Labels(std::vector<Label> * labels);
void set_labels(std::vector<Label> * const labels);
void paint(Painter& painter) override;
private:
std::vector<Label> * labels_;
};
class BigFrequency : public Widget {
public:
BigFrequency(Rect parent_rect, rf::Frequency frequency);
@ -294,7 +317,7 @@ private:
std::string text_;
bool small_ { false };
bool value_ { false };
const Style* style_ { nullptr };
const Style * style_ { nullptr };
};
class Button : public Widget {