From d4fad7432a13cc4fefe1e782899b8ad38d6ba160 Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Sun, 20 Jun 2021 16:49:32 +0200 Subject: Add labels to sq1 params --- src/sequencer.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) (limited to 'src/sequencer.c') diff --git a/src/sequencer.c b/src/sequencer.c index 2978e9b..60b70df 100644 --- a/src/sequencer.c +++ b/src/sequencer.c @@ -806,21 +806,12 @@ draw_parameters_wave(void) { void draw_parameters_square(ChannelSquareParams *params, bool sweep) { - // DEBUG: Bounding box. - // { - // size_t x0 = PARAMS_START_X; - // size_t y0 = PARAMS_START_Y; - // size_t x1 = PARAMS_START_X + PARAMS_W; - // size_t y1 = PARAMS_START_Y + PARAMS_H - 5; - // draw_rect(x0, y0, x1, y1, COL_FG); - // } - // Duty cycle. { // Shape drawing. { size_t x = PARAMS_START_X; - size_t y = PARAMS_START_Y + PARAMS_H - 42; + size_t y = PARAMS_START_Y + PARAMS_H - 43; size_t x0 = x + 2; size_t x1 = x0; @@ -871,8 +862,8 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep) { draw_line(x4, y1, x4, y0, COL_RED); draw_line(x4, y0, x5, y0, COL_RED); - // DEBUG: Bounding box. - // draw_rect(x, y - 1, x + 24, y + 17, COL_RED); + // Bounding box. + draw_rect(x, y - 3, x + 24, y + 18, COL_RED); } // Param box. @@ -907,19 +898,24 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep) { { // Env. drawing. { - size_t x = PARAMS_START_X + 43; - size_t y = PARAMS_START_Y + PARAMS_H - 41; + // Bounding box. + { + size_t x0 = PARAMS_START_X + 31; + size_t y0 = PARAMS_START_Y + PARAMS_H - 46; + size_t x1 = x0 + 79; + size_t y1 = y0 + 21; + draw_rect(x0, y0, x1, y1, COL_CYAN); + } + + size_t x = PARAMS_START_X + 42; + size_t y = PARAMS_START_Y + PARAMS_H - 43; size_t x0 = x; size_t y0 = y + 15 - params->env_volume; size_t x1 = x + 8 * params->env_time; size_t y1 = params->env_direction == 0 ? y + 15 : y; - size_t x2 = x + 8 * 7; + size_t x2 = x + 8 * 7 + 1; size_t y2 = y1; - // Axis. - draw_line(x, y - 2, x, y + 16, COL_CYAN); - draw_line(x, y + 16, x + 8 * 7 + 2, y + 16, COL_CYAN); - // Env. if (params->env_time == 0) { draw_line(x1, y0, x2, y0, COL_CYAN); @@ -1131,6 +1127,15 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep) { } break; } } + + // Labels. + { + size_t x = PARAMS_START_X; + size_t y = PARAMS_START_Y + PARAMS_H - 43; + txt_drawf_small("shape", x + 1, y - 12, 4, COL_FG); + txt_drawf_small("envelope", x + 54, y - 12, 4, COL_FG); + txt_drawf_small("sweep", x + 133, y - 12, 4, COL_FG); + } } void -- cgit v1.2.1