Add work done on lap-graph (and fixes on bar-graph)

2 files changed, 37 insertions, 26 deletions

diff --git a/Kod/bilbana/yc4/display/scenes/draw_lap_graph.m b/Kod/bilbana/yc4/display/scenes/draw_lap_graph.m
index 67f2d75..3c33ffb 100644
--- a/Kod/bilbana/yc4/display/scenes/draw_lap_graph.m
+++ b/Kod/bilbana/yc4/display/scenes/draw_lap_graph.m
@@ -10,7 +10,7 @@ pause(0.2);
 matlabclient(1, get_smallpackage(clear_display()));
 pause(0.2);
 
-matlabclient(1, get_smallpackage(put_text(105, 8, 'C', 'Varvtider')))
+matlabclient(1, get_smallpackage(put_text(160, 8, 'C', 'Varvtider')))
 pause(0.2);
 
 matlabclient(1, get_smallpackage([ ...
@@ -21,33 +21,50 @@ matlabclient(1, get_smallpackage([ ...
 pause(0.2);
 
 matlabclient(1, get_smallpackage([ ...
-	draw_line(20, 24, 20, 200), ...   % y-axis
-	continue_line(304, 200), ... % x-axis
+	draw_line(20, 24, 20, 144), ...   % y-axis
+    put_text(9, 25, 'C', 's'), ...  % label y-axis
+	continue_line(304, 144), ... % 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(304, 140, 304, 148) ... % line on x
 ]));
 pause(0.2);
 
+y = 166;
+margin_top = 6;
 matlabclient(1, get_smallpackage([ ...
-	draw_line(190, 0, 190, 70), ...
-	continue_line(320, 70) ...
+    draw_line(0, y, 320, y), ...
+    put_text(53 , y + margin_top, 'C', 'target'), ...
+    put_text(160, y + margin_top, 'C', 'mean'), ...
+    put_text(266, y + margin_top, 'C', 'std') ...
 ]));
 pause(0.2);
 
-matlabclient(1, get_smallpackage(save_display_to_clipboard()));
-
-%%
-matlabclient(1, get_smallpackage(draw_line(20, 103, 320, 103)));
-matlabclient(1, get_smallpackage(draw_line(20, 135, 320, 135)));
-matlabclient(1, get_smallpackage(draw_line(20, 167, 320, 167)));
-pause(0.2);
-
-%%
-matlabclient(1, get_smallpackage([
-	put_text(304, 10, 'R', 'std: x.xxs'), ...
-	put_text(304, 30, 'R', 'mean: xx.xs'), ...
-	put_text(304, 50, 'R', 'target: xx.xs') ...
+line = 12;
+matlabclient(1, get_smallpackage([ ...
+    put_text(6  , y + 3 + margin_top + line*1, 'L', '1'), ...
+    put_text(6  , y + 3 + margin_top + line*2, 'L', '2'), ...
+    put_text(53 , y + 2 + margin_top + line*1, 'C', 'xx.x'), ...
+    put_text(53 , y + 2 + margin_top + line*2, 'C', 'xx.x'), ...
+    put_text(160, y + 2 + margin_top + line*1, 'C', 'xx.x'), ...
+    put_text(160, y + 2 + margin_top + line*2, 'C', 'xx.x'), ...
+    put_text(266, y + 2 + margin_top + line*1, 'C', 'x.xx'), ...
+    put_text(266, y + 2 + margin_top + line*2, 'C', 'x.xx'), ...
 ]));
 pause(0.2);
+
+times = [1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16];
+for i = 0:(length(times)-1)
+    x = 28 + i*10;
+    y = 144 - round(100 * (times(i+1) / max(times)));
+    matlabclient(1, get_smallpackage([ ...
+        set_point_size(3, 3), ...
+        point(x, y), ...
+        set_point_size(1, 1), ...
+        draw_line(x, 144-2,  x, 144+2) ...
+    ]));
+    pause(0.15);
+end
+
+% matlabclient(1, get_smallpackage(save_display_to_clipboard()));
 end
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