From 3f20ff26d0c0082d5fe5a90474545eb440c7ddfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Wed, 20 Nov 2019 18:12:39 +0100 Subject: Add scenes for lap_graph and segment_bars --- Kod/bilbana/yc4/display/scenes/draw_segment_bars.m | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Kod/bilbana/yc4/display/scenes/draw_segment_bars.m (limited to 'Kod/bilbana/yc4/display/scenes/draw_segment_bars.m') diff --git a/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m new file mode 100644 index 0000000..fe750a7 --- /dev/null +++ b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m @@ -0,0 +1,54 @@ +function [] = draw_segment_bars(values1, values2) +pause(0.2); +matlabclient(1, get_smallpackage(clear_display())); +pause(0.2); + +matlabclient(1, get_smallpackage(put_text(160, 8, 'C', 'Genomsnittlig tid per segment'))) +pause(0.2); + +% input(''); +matlabclient(1, get_smallpackage([ ... + key(0 , 216, 107, 240, 51, 61, 'C', 'Varv'), ... + key(107, 216, 213, 240, 52, 62, 'C', 'Segment'), ... + key(213, 216, 320, 240, 53, 63, 'C', 'Avsluta') ... +])); +pause(0.2); + +matlabclient(1, get_smallpackage([ ... + draw_line(20, 24, 20, 200), ... % y-axis + continue_line(304, 200), ... % x-axis + draw_line(16, 32, 20, 24), ... % arrow on y, left part + continue_line(24, 32), ... % arrow on y, right part + draw_line(304, 196, 304, 204) ... % line on x +])); +pause(0.2); + +[bars, max_val, min_y, max_height] = get_bars_from_values(values1, values2); + +for bar = bars + matlabclient(1, get_smallpackage(fill_area(bar.x_lo, bar.y_lo, bar.x_hi, bar.y_hi))); + pause(0.2); +end + +for i = 0:8 + x = 16+13 + 10 + 30*i; + matlabclient(1, get_smallpackage(put_text(x, 204, 'C', num2str(i + 1)))); + pause(0.2); +end + +matlabclient(1, get_smallpackage(put_text(9, 25, 'C', 's'))); +pause(0.2); + +% matlabclient(1, get_smallpackage(set_line_pattern(2))) +% pause(0.2); +for i = 1:floor(max_val) + x = 20; + y = min_y - round(max_height * (i/max_val)); + matlabclient(1, get_smallpackage([draw_line(x, y, 320, y), ... + put_text(x-6, y-2, 'C', num2str(i))])); + pause(0.2); +end +% matlabclient(1, get_smallpackage(set_line_pattern(1))) +% pause(0.2); +end + -- cgit v1.2.1 From 81beac81fff0c32924f359e0da84990242dfc678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 22 Nov 2019 12:52:56 +0100 Subject: Add work done on lap-graph (and fixes on bar-graph) --- Kod/bilbana/yc4/display/scenes/draw_segment_bars.m | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Kod/bilbana/yc4/display/scenes/draw_segment_bars.m') diff --git a/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m index fe750a7..d778323 100644 --- a/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m +++ b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m @@ -16,6 +16,7 @@ pause(0.2); matlabclient(1, get_smallpackage([ ... draw_line(20, 24, 20, 200), ... % y-axis + put_text(9, 25, 'C', 's'), ... % label y-axis continue_line(304, 200), ... % x-axis draw_line(16, 32, 20, 24), ... % arrow on y, left part continue_line(24, 32), ... % arrow on y, right part @@ -36,11 +37,6 @@ for i = 0:8 pause(0.2); end -matlabclient(1, get_smallpackage(put_text(9, 25, 'C', 's'))); -pause(0.2); - -% matlabclient(1, get_smallpackage(set_line_pattern(2))) -% pause(0.2); for i = 1:floor(max_val) x = 20; y = min_y - round(max_height * (i/max_val)); @@ -48,7 +44,5 @@ for i = 1:floor(max_val) put_text(x-6, y-2, 'C', num2str(i))])); pause(0.2); end -% matlabclient(1, get_smallpackage(set_line_pattern(1))) -% pause(0.2); end -- cgit v1.2.1 From 49f712d1a24fba77a1f775af2333855849ddd87d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sat, 23 Nov 2019 21:43:32 +0100 Subject: fix indents --- Kod/bilbana/yc4/display/scenes/draw_segment_bars.m | 50 +++++++++++----------- 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'Kod/bilbana/yc4/display/scenes/draw_segment_bars.m') diff --git a/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m index d778323..f2703b2 100644 --- a/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m +++ b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m @@ -1,48 +1,50 @@ function [] = draw_segment_bars(values1, values2) -pause(0.2); +dt = 0.2; + +pause(dt); matlabclient(1, get_smallpackage(clear_display())); -pause(0.2); +pause(dt); matlabclient(1, get_smallpackage(put_text(160, 8, 'C', 'Genomsnittlig tid per segment'))) -pause(0.2); +pause(dt); % input(''); matlabclient(1, get_smallpackage([ ... - key(0 , 216, 107, 240, 51, 61, 'C', 'Varv'), ... - key(107, 216, 213, 240, 52, 62, 'C', 'Segment'), ... - key(213, 216, 320, 240, 53, 63, 'C', 'Avsluta') ... + key(0 , 216, 107, 240, 51, 61, 'C', 'Varv'), ... + key(107, 216, 213, 240, 52, 62, 'C', 'Segment'), ... + key(213, 216, 320, 240, 53, 63, 'C', 'Avsluta') ... ])); -pause(0.2); +pause(dt); matlabclient(1, get_smallpackage([ ... - draw_line(20, 24, 20, 200), ... % y-axis - put_text(9, 25, 'C', 's'), ... % label y-axis - continue_line(304, 200), ... % x-axis - draw_line(16, 32, 20, 24), ... % arrow on y, left part - continue_line(24, 32), ... % arrow on y, right part - draw_line(304, 196, 304, 204) ... % line on x + draw_line(20, 24, 20, 200), ... % y-axis + put_text(9, 25, 'C', 's'), ... % label y-axis + continue_line(304, 200), ... % x-axis + draw_line(16, 32, 20, 24), ... % arrow on y, left part + continue_line(24, 32), ... % arrow on y, right part + draw_line(304, 196, 304, 204) ... % line on x ])); -pause(0.2); +pause(dt); [bars, max_val, min_y, max_height] = get_bars_from_values(values1, values2); for bar = bars - matlabclient(1, get_smallpackage(fill_area(bar.x_lo, bar.y_lo, bar.x_hi, bar.y_hi))); - pause(0.2); + matlabclient(1, get_smallpackage(fill_area(bar.x_lo, bar.y_lo, bar.x_hi, bar.y_hi))); + pause(dt); end for i = 0:8 - x = 16+13 + 10 + 30*i; - matlabclient(1, get_smallpackage(put_text(x, 204, 'C', num2str(i + 1)))); - pause(0.2); + x = 16+13 + 10 + 30*i; + matlabclient(1, get_smallpackage(put_text(x, 204, 'C', num2str(i + 1)))); + pause(dt); end for i = 1:floor(max_val) - x = 20; - y = min_y - round(max_height * (i/max_val)); - matlabclient(1, get_smallpackage([draw_line(x, y, 320, y), ... - put_text(x-6, y-2, 'C', num2str(i))])); - pause(0.2); + x = 20; + y = min_y - round(max_height * (i/max_val)); + matlabclient(1, get_smallpackage([draw_line(x, y, 320, y), ... + put_text(x-6, y-2, 'C', num2str(i))])); + pause(dt); end end -- cgit v1.2.1 From 81cf6bfafcb7b3f09a2627e57bb540b803d55df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sat, 23 Nov 2019 21:47:47 +0100 Subject: Group packages together --- Kod/bilbana/yc4/display/scenes/draw_segment_bars.m | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Kod/bilbana/yc4/display/scenes/draw_segment_bars.m') diff --git a/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m index f2703b2..4aaf42f 100644 --- a/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m +++ b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m @@ -1,5 +1,6 @@ function [] = draw_segment_bars(values1, values2) -dt = 0.2; +dt = 0.2; % delay for display +queue = []; % internal queue for packages to send to display pause(dt); matlabclient(1, get_smallpackage(clear_display())); @@ -35,8 +36,12 @@ end for i = 0:8 x = 16+13 + 10 + 30*i; - matlabclient(1, get_smallpackage(put_text(x, 204, 'C', num2str(i + 1)))); - pause(dt); + queue = [queue put_text(x, 204, 'C', num2str(i + 1))] + if i == 4 or i == 8 + matlabclient(1, get_smallpackage(queue)); + queue = []; + pause(dt); + end end for i = 1:floor(max_val) -- cgit v1.2.1 From 78ce5f87fbc4b538a159f4f7fc4663475a135186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sat, 23 Nov 2019 21:48:10 +0100 Subject: Fix indents --- Kod/bilbana/yc4/display/scenes/draw_segment_bars.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Kod/bilbana/yc4/display/scenes/draw_segment_bars.m') diff --git a/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m index 4aaf42f..f34aa04 100644 --- a/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m +++ b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m @@ -47,8 +47,10 @@ end for i = 1:floor(max_val) x = 20; y = min_y - round(max_height * (i/max_val)); - matlabclient(1, get_smallpackage([draw_line(x, y, 320, y), ... - put_text(x-6, y-2, 'C', num2str(i))])); + matlabclient(1, get_smallpackage([... + draw_line(x, y, 320, y), ... + put_text(x-6, y-2, 'C', num2str(i))... + ])); pause(dt); end end -- cgit v1.2.1 From 2246ff7466c252dff4e22ed894dee3f152f0f4e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Mon, 25 Nov 2019 12:34:32 +0100 Subject: Changes - Add semicolons - Fix clamp - Fix syntax - Make testing (somewhat) modular --- Kod/bilbana/yc4/display/scenes/draw_segment_bars.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Kod/bilbana/yc4/display/scenes/draw_segment_bars.m') diff --git a/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m index f34aa04..6df2dab 100644 --- a/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m +++ b/Kod/bilbana/yc4/display/scenes/draw_segment_bars.m @@ -36,8 +36,8 @@ end for i = 0:8 x = 16+13 + 10 + 30*i; - queue = [queue put_text(x, 204, 'C', num2str(i + 1))] - if i == 4 or i == 8 + queue = [queue put_text(x, 204, 'C', num2str(i + 1))]; + if i == 4 || i == 8 matlabclient(1, get_smallpackage(queue)); queue = []; pause(dt); -- cgit v1.2.1