TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-25 15:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added cursor to audio spectrum view

Browse Source
This commit is contained in:
furrtek
2018-05-22 04:43:04 +01:00
parent 63c4a60cf7
commit 5c1ba9b90d
6 changed files with 183 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/common/ui_widget.cpp
View File

@@ -1523,7 +1523,7 @@ void Waveform::set_length(const uint32_t new_length) {
void Waveform::paint(Painter& painter) {
size_t n;
Coord y, y_offset = screen_rect().location().y();
Coord prev_x, prev_y;
Coord prev_x = screen_rect().location().x(), prev_y;
float x, x_inc;
Dim h = screen_rect().size().height();
const float y_scale = (float)(h - 1) / 65536.0;
@@ -1535,18 +1535,6 @@ void Waveform::paint(Painter& painter) {
// Clear
painter.fill_rectangle_unrolled8(screen_rect(), Color::black());
/*prev_x = screen_rect().location().x();
prev_y = previous_data[0];
x = prev_x + x_inc;
for (n = 1; n < length_; n++) {
y = previous_data[n];
display.draw_line( {prev_x, prev_y}, {(Coord)x, y}, Color::black());
prev_x = x;
prev_y = y;
x += x_inc;
}*/
prev_x = screen_rect().location().x();
if (digital_) {
// Digital waveform: each value is an horizontal line
@@ -1570,10 +1558,8 @@ void Waveform::paint(Painter& painter) {
x = prev_x + x_inc;
h /= 2;
prev_y = y_offset + h - (*(data_start++) * y_scale);
//previous_data[0] = prev_y;
for (n = 1; n < length_; n++) {
y = y_offset + h - (*(data_start++) * y_scale);
//previous_data[n] = y;
display.draw_line( {prev_x, prev_y}, {(Coord)x, y}, color_);
prev_x = x;

1
firmware/common/ui_widget.hpp
View File

@@ -617,7 +617,6 @@ private:
const Color cursor_colors[2] = { Color::cyan(), Color::magenta() };
int16_t * data_;
//std::vector<int16_t> previous_data { };
uint32_t length_;
uint32_t offset_;
bool digital_ { false };