mirror of
https://github.com/eried/portapack-mayhem.git
synced 2025-06-23 06:14:13 -04:00
Added cursor to audio spectrum view
This commit is contained in:
furrtek
parent
63c4a60cf7
commit
5c1ba9b90d
6 changed files with 183 additions and 140 deletions
|
|
@ -36,6 +36,50 @@ using namespace portapack;
|
|||
namespace ui {
|
||||
namespace spectrum {
|
||||
|
||||
/* AudioSpectrumView******************************************************/
|
||||
|
||||
AudioSpectrumView::AudioSpectrumView(
|
||||
const Rect parent_rect
|
||||
) : View { parent_rect }
|
||||
{
|
||||
set_focusable(true);
|
||||
|
||||
add_children({
|
||||
&labels,
|
||||
&field_frequency,
|
||||
&waveform
|
||||
});
|
||||
|
||||
field_frequency.on_change = [this](int32_t) {
|
||||
set_dirty();
|
||||
};
|
||||
field_frequency.set_value(0);
|
||||
}
|
||||
|
||||
void AudioSpectrumView::paint(Painter& painter) {
|
||||
const auto r = screen_rect();
|
||||
|
||||
painter.fill_rectangle(r, Color::black());
|
||||
|
||||
//if( !spectrum_sampling_rate ) return;
|
||||
|
||||
// Cursor
|
||||
const Rect r_cursor {
|
||||
field_frequency.value() / (48000 / 240), r.bottom() - 32 - cursor_band_height,
|
||||
1, cursor_band_height
|
||||
};
|
||||
painter.fill_rectangle(
|
||||
r_cursor,
|
||||
Color::red()
|
||||
);
|
||||
}
|
||||
|
||||
void AudioSpectrumView::on_audio_spectrum(const AudioSpectrum& spectrum) {
|
||||
for (size_t i = 0; i < spectrum.db.size(); i++)
|
||||
audio_spectrum[i] = ((int16_t)spectrum.db[i] - 127) * 256;
|
||||
waveform.set_dirty();
|
||||
}
|
||||
|
||||
/* FrequencyScale ********************************************************/
|
||||
|
||||
void FrequencyScale::on_show() {
|
||||
|
|
@ -61,19 +105,6 @@ void FrequencyScale::set_channel_filter(
|
|||
}
|
||||
}
|
||||
|
||||
void FrequencyScale::show_cursor(const bool v) {
|
||||
if (v != _show_cursor) {
|
||||
_show_cursor = v;
|
||||
set_dirty();
|
||||
}
|
||||
}
|
||||
|
||||
void FrequencyScale::set_cursor_position(const int32_t value) {
|
||||
_show_cursor = true;
|
||||
cursor_position = value;
|
||||
set_dirty();
|
||||
}
|
||||
|
||||
void FrequencyScale::paint(Painter& painter) {
|
||||
const auto r = screen_rect();
|
||||
|
||||
|
|
@ -87,7 +118,7 @@ void FrequencyScale::paint(Painter& painter) {
|
|||
draw_filter_ranges(painter, r);
|
||||
draw_frequency_ticks(painter, r);
|
||||
|
||||
if (_show_cursor) {
|
||||
if (_blink) {
|
||||
const Rect r_cursor {
|
||||
120 + cursor_position, r.bottom() - filter_band_height,
|
||||
2, filter_band_height
|
||||
|
|
@ -196,6 +227,48 @@ void FrequencyScale::draw_filter_ranges(Painter& painter, const Rect r) {
|
|||
}
|
||||
}
|
||||
|
||||
void FrequencyScale::on_focus() {
|
||||
_blink = true;
|
||||
on_tick_second();
|
||||
signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
|
||||
this->on_tick_second();
|
||||
};
|
||||
}
|
||||
|
||||
void FrequencyScale::on_blur() {
|
||||
rtc_time::signal_tick_second -= signal_token_tick_second;
|
||||
_blink = false;
|
||||
set_dirty();
|
||||
}
|
||||
|
||||
bool FrequencyScale::on_encoder(const EncoderEvent delta) {
|
||||
cursor_position += delta;
|
||||
|
||||
cursor_position = std::min<int32_t>(cursor_position, 119);
|
||||
cursor_position = std::max<int32_t>(cursor_position, -120);
|
||||
|
||||
set_dirty();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool FrequencyScale::on_key(const KeyEvent key) {
|
||||
if( key == KeyEvent::Select ) {
|
||||
if( on_select ) {
|
||||
on_select((cursor_position * spectrum_sampling_rate) / 240);
|
||||
cursor_position = 0;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void FrequencyScale::on_tick_second() {
|
||||
set_dirty();
|
||||
_blink = !_blink;
|
||||
}
|
||||
|
||||
/* WaterfallView *********************************************************/
|
||||
|
||||
void WaterfallView::on_show() {
|
||||
|
|
@ -251,21 +324,17 @@ void WaterfallView::clear() {
|
|||
/* WaterfallWidget *******************************************************/
|
||||
|
||||
WaterfallWidget::WaterfallWidget(const bool cursor) {
|
||||
set_focusable(cursor);
|
||||
|
||||
add_children({
|
||||
&waterfall_view,
|
||||
&frequency_scale
|
||||
});
|
||||
}
|
||||
|
||||
WaterfallWidget::~WaterfallWidget() {
|
||||
rtc_time::signal_tick_second -= signal_token_tick_second;
|
||||
}
|
||||
|
||||
void WaterfallWidget::on_tick_second() {
|
||||
frequency_scale.show_cursor(_blink);
|
||||
_blink = !_blink;
|
||||
|
||||
frequency_scale.set_focusable(cursor);
|
||||
|
||||
// Making the event climb up all the way up to here kinda sucks
|
||||
frequency_scale.on_select = [this](int32_t offset) {
|
||||
if (on_select) on_select(offset);
|
||||
};
|
||||
}
|
||||
|
||||
void WaterfallWidget::on_show() {
|
||||
|
|
@ -276,89 +345,39 @@ void WaterfallWidget::on_hide() {
|
|||
baseband::spectrum_streaming_stop();
|
||||
}
|
||||
|
||||
void WaterfallWidget::on_focus() {
|
||||
_blink = true;
|
||||
signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
|
||||
this->on_tick_second();
|
||||
};
|
||||
}
|
||||
|
||||
void WaterfallWidget::on_blur() {
|
||||
frequency_scale.show_cursor(false);
|
||||
rtc_time::signal_tick_second -= signal_token_tick_second;
|
||||
}
|
||||
|
||||
bool WaterfallWidget::on_encoder(const EncoderEvent delta) {
|
||||
cursor_position += delta;
|
||||
|
||||
cursor_position = std::min<int32_t>(cursor_position, 119);
|
||||
cursor_position = std::max<int32_t>(cursor_position, -120);
|
||||
|
||||
frequency_scale.set_cursor_position(cursor_position);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool WaterfallWidget::on_key(const KeyEvent key) {
|
||||
if( key == KeyEvent::Select ) {
|
||||
if( on_select ) {
|
||||
on_select((cursor_position * sampling_rate) / 240);
|
||||
cursor_position = 0;
|
||||
frequency_scale.set_cursor_position(cursor_position);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void WaterfallWidget::on_audio_spectrum(const AudioSpectrum& spectrum) {
|
||||
if (fft_widget) {
|
||||
for (size_t i = 0; i < spectrum.db.size(); i++)
|
||||
audio_spectrum[i] = ((int16_t)spectrum.db[i] - 127) * 256;
|
||||
fft_widget->set_dirty();
|
||||
}
|
||||
}
|
||||
|
||||
void WaterfallWidget::set_fft_widget(const bool show) {
|
||||
if (fft_widget) {
|
||||
audio_fifo = nullptr;
|
||||
remove_child(fft_widget.get());
|
||||
fft_widget.reset();
|
||||
}
|
||||
void WaterfallWidget::show_audio_spectrum_view(const bool show) {
|
||||
if ((audio_spectrum_view && show) || (!audio_spectrum_view && !show)) return;
|
||||
|
||||
if (show) {
|
||||
waterfall_view.set_parent_rect(waterfall_reduced_rect);
|
||||
waterfall_view.on_show();
|
||||
fft_widget = std::make_unique<Waveform>(
|
||||
fft_widget_rect,
|
||||
audio_spectrum,
|
||||
128,
|
||||
0,
|
||||
false,
|
||||
Color::white());
|
||||
add_child(fft_widget.get());
|
||||
audio_spectrum_view = std::make_unique<AudioSpectrumView>(audio_spectrum_view_rect);
|
||||
add_child(audio_spectrum_view.get());
|
||||
update_widgets_rect();
|
||||
} else {
|
||||
waterfall_view.set_parent_rect(waterfall_normal_rect);
|
||||
waterfall_view.on_show();
|
||||
audio_fifo = nullptr;
|
||||
remove_child(audio_spectrum_view.get());
|
||||
audio_spectrum_view.reset();
|
||||
update_widgets_rect();
|
||||
}
|
||||
}
|
||||
|
||||
void WaterfallWidget::update_widgets_rect() {
|
||||
if (audio_spectrum_view) {
|
||||
frequency_scale.set_parent_rect({ 0, audio_spectrum_height, screen_rect().width(), scale_height });
|
||||
waterfall_view.set_parent_rect(waterfall_reduced_rect);
|
||||
} else {
|
||||
frequency_scale.set_parent_rect({ 0, 0, screen_rect().width(), scale_height });
|
||||
waterfall_view.set_parent_rect(waterfall_normal_rect);
|
||||
}
|
||||
waterfall_view.on_show();
|
||||
}
|
||||
|
||||
void WaterfallWidget::set_parent_rect(const Rect new_parent_rect) {
|
||||
constexpr Dim scale_height = 20;
|
||||
|
||||
View::set_parent_rect(new_parent_rect);
|
||||
|
||||
waterfall_normal_rect = { 0, scale_height, new_parent_rect.width(), new_parent_rect.height() - scale_height};
|
||||
waterfall_reduced_rect = { 0, scale_height, new_parent_rect.width(), new_parent_rect.height() - scale_height - audio_spectrum_height };
|
||||
waterfall_reduced_rect = { 0, audio_spectrum_height + scale_height, new_parent_rect.width(), new_parent_rect.height() - scale_height - audio_spectrum_height };
|
||||
|
||||
frequency_scale.set_parent_rect({ 0, 0, new_parent_rect.width(), scale_height });
|
||||
if (fft_widget)
|
||||
waterfall_view.set_parent_rect(waterfall_reduced_rect);
|
||||
else
|
||||
waterfall_view.set_parent_rect(waterfall_normal_rect);
|
||||
waterfall_view.on_show();
|
||||
|
||||
fft_widget_rect = { 0, new_parent_rect.height() - audio_spectrum_height, new_parent_rect.width(), audio_spectrum_height };
|
||||
update_widgets_rect();
|
||||
}
|
||||
|
||||
void WaterfallWidget::paint(Painter& painter) {
|
||||
|
|
@ -376,5 +395,9 @@ void WaterfallWidget::on_channel_spectrum(const ChannelSpectrum& spectrum) {
|
|||
);
|
||||
}
|
||||
|
||||
void WaterfallWidget::on_audio_spectrum(const AudioSpectrum& spectrum) {
|
||||
audio_spectrum_view->on_audio_spectrum(spectrum);
|
||||
}
|
||||
|
||||
} /* namespace spectrum */
|
||||
} /* namespace ui */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue