diff options
| -rw-r--r-- | drawing.lua | 10 | ||||
| -rw-r--r-- | drawing_tests.lua | 181 |
2 files changed, 180 insertions, 11 deletions
diff --git a/drawing.lua b/drawing.lua index 204a93e..45d93dd 100644 --- a/drawing.lua +++ b/drawing.lua @@ -408,11 +408,19 @@ function Drawing.keychord_pressed(chord) end end drawing.pending.mode = 'square' - elseif App.mouse_down(1) and chord == 'p' and (Current_drawing_mode == 'polygon' or Current_drawing_mode == 'rectangle' or Current_drawing_mode == 'square') then + elseif App.mouse_down(1) and chord == 'p' and Current_drawing_mode == 'polygon' then local _,drawing = Drawing.current_drawing() local mx,my = Drawing.coord(App.mouse_x()-Margin_left), Drawing.coord(App.mouse_y()-drawing.y) local j = Drawing.insert_point(drawing.points, mx,my) table.insert(drawing.pending.vertices, j) + elseif App.mouse_down(1) and chord == 'p' and (Current_drawing_mode == 'rectangle' or Current_drawing_mode == 'square') then + local _,drawing = Drawing.current_drawing() + local mx,my = Drawing.coord(App.mouse_x()-Margin_left), Drawing.coord(App.mouse_y()-drawing.y) + local j = Drawing.insert_point(drawing.points, mx,my) + while #drawing.pending.vertices >= 2 do + table.remove(drawing.pending.vertices) + end + table.insert(drawing.pending.vertices, j) elseif chord == 'C-o' and not App.mouse_down(1) then Current_drawing_mode = 'circle' elseif App.mouse_down(1) and chord == 'a' and Current_drawing_mode == 'circle' then diff --git a/drawing_tests.lua b/drawing_tests.lua index 9870d7b..6b87c0b 100644 --- a/drawing_tests.lua +++ b/drawing_tests.lua @@ -18,9 +18,9 @@ function test_draw_line() -- draw a line App.run_after_mouse_press(Margin_left+5, Margin_top+Drawing_padding_top+6, 1) App.run_after_mouse_release(Margin_left+35, Margin_top+Drawing_padding_top+36, 1) - check_eq(#Lines[1].shapes, 1, 'F - test_draw_line/#shapes') - check_eq(#Lines[1].points, 2, 'F - test_draw_line/#points') local drawing = Lines[1] + check_eq(#drawing.shapes, 1, 'F - test_draw_line/#shapes') + check_eq(#drawing.points, 2, 'F - test_draw_line/#points') check_eq(drawing.shapes[1].mode, 'line', 'F - test_draw_line/shape:1') local p1 = drawing.points[drawing.shapes[1].p1] local p2 = drawing.points[drawing.shapes[1].p2] @@ -46,9 +46,9 @@ function test_draw_horizontal_line() -- draw a line that is more horizontal than vertical App.run_after_mouse_press(Margin_left+5, Margin_top+Drawing_padding_top+6, 1) App.run_after_mouse_release(Margin_left+35, Margin_top+Drawing_padding_top+26, 1) - check_eq(#Lines[1].shapes, 1, 'F - test_draw_horizontal_line/#shapes') - check_eq(#Lines[1].points, 2, 'F - test_draw_horizontal_line/#points') local drawing = Lines[1] + check_eq(#drawing.shapes, 1, 'F - test_draw_horizontal_line/#shapes') + check_eq(#drawing.points, 2, 'F - test_draw_horizontal_line/#points') check_eq(drawing.shapes[1].mode, 'manhattan', 'F - test_draw_horizontal_line/shape_mode') local p1 = drawing.points[drawing.shapes[1].p1] local p2 = drawing.points[drawing.shapes[1].p2] @@ -76,9 +76,9 @@ function test_draw_circle() App.run_after_keychord('C-o') App.run_after_mouse_press(Margin_left+35, Margin_top+Drawing_padding_top+36, 1) App.run_after_mouse_release(Margin_left+35+30, Margin_top+Drawing_padding_top+36, 1) - check_eq(#Lines[1].shapes, 1, 'F - test_draw_circle/#shapes') - check_eq(#Lines[1].points, 1, 'F - test_draw_circle/#points') local drawing = Lines[1] + check_eq(#drawing.shapes, 1, 'F - test_draw_circle/#shapes') + check_eq(#drawing.points, 1, 'F - test_draw_circle/#points') check_eq(drawing.shapes[1].mode, 'circle', 'F - test_draw_horizontal_line/shape_mode') check_eq(drawing.shapes[1].radius, 30, 'F - test_draw_circle/radius') local center = drawing.points[drawing.shapes[1].center] @@ -120,9 +120,9 @@ function test_draw_circle_mid_stroke() App.run_after_mouse_press(Margin_left+35, Margin_top+Drawing_padding_top+36, 1) App.run_after_keychord('o') App.run_after_mouse_release(Margin_left+35+30, Margin_top+Drawing_padding_top+36, 1) - check_eq(#Lines[1].shapes, 1, 'F - test_draw_circle_mid_stroke/#shapes') - check_eq(#Lines[1].points, 1, 'F - test_draw_circle_mid_stroke/#points') local drawing = Lines[1] + check_eq(#drawing.shapes, 1, 'F - test_draw_circle_mid_stroke/#shapes') + check_eq(#drawing.points, 1, 'F - test_draw_circle_mid_stroke/#points') check_eq(drawing.shapes[1].mode, 'circle', 'F - test_draw_horizontal_line/shape_mode') check_eq(drawing.shapes[1].radius, 30, 'F - test_draw_circle_mid_stroke/radius') local center = drawing.points[drawing.shapes[1].center] @@ -148,9 +148,9 @@ function test_draw_arc() App.mouse_move(Margin_left+35+30, Margin_top+Drawing_padding_top+36) App.run_after_keychord('a') -- arc mode App.run_after_mouse_release(Margin_left+35+50, Margin_top+Drawing_padding_top+36+50, 1) -- 45° - check_eq(#Lines[1].shapes, 1, 'F - test_draw_arc/#shapes') - check_eq(#Lines[1].points, 2, 'F - test_draw_arc/#points') local drawing = Lines[1] + check_eq(#drawing.shapes, 1, 'F - test_draw_arc/#shapes') + check_eq(#drawing.points, 2, 'F - test_draw_arc/#points') check_eq(drawing.shapes[1].mode, 'arc', 'F - test_draw_horizontal_line/shape_mode') local arc = drawing.shapes[1] check_eq(arc.radius, 30, 'F - test_draw_arc/radius') @@ -160,3 +160,164 @@ function test_draw_arc() check_eq(arc.start_angle, 0, 'F - test_draw_arc/start:angle') check_eq(arc.end_angle, math.pi/4, 'F - test_draw_arc/end:angle') end + +function test_draw_polygon() + io.write('\ntest_draw_polygon') + -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end) + App.screen.init{width=Margin_left+300, height=300} + Lines = load_array{'```lines', '```', ''} + Line_width = 256 -- drawing coordinates 1:1 with pixels + App.draw() + check_eq(Current_drawing_mode, 'line', 'F - test_draw_polygon/baseline/drawing_mode') + check_eq(#Lines, 2, 'F - test_draw_polygon/baseline/#lines') + check_eq(Lines[1].mode, 'drawing', 'F - test_draw_polygon/baseline/mode') + check_eq(Lines[1].y, Margin_top+Drawing_padding_top, 'F - test_draw_polygon/baseline/y') + check_eq(Lines[1].h, 128, 'F - test_draw_polygon/baseline/y') + check_eq(#Lines[1].shapes, 0, 'F - test_draw_polygon/baseline/#shapes') + -- first point + App.run_after_mouse_press(Margin_left+5, Margin_top+Drawing_padding_top+6, 1) + App.run_after_keychord('g') -- polygon mode + -- second point + App.mouse_move(Margin_left+65, Margin_top+Drawing_padding_top+36) + App.run_after_keychord('p') -- add point + -- final point + App.run_after_mouse_release(Margin_left+35, Margin_top+Drawing_padding_top+26, 1) + local drawing = Lines[1] + check_eq(#drawing.shapes, 1, 'F - test_draw_polygon/#shapes') + check_eq(#drawing.points, 3, 'F - test_draw_polygon/vertices') + local shape = drawing.shapes[1] + check_eq(shape.mode, 'polygon', 'F - test_draw_polygon/shape_mode') + check_eq(#shape.vertices, 3, 'F - test_draw_polygon/vertices') + local p = drawing.points[shape.vertices[1]] + check_eq(p.x, 5, 'F - test_draw_polygon/p1:x') + check_eq(p.y, 6, 'F - test_draw_polygon/p1:y') + local p = drawing.points[shape.vertices[2]] + check_eq(p.x, 65, 'F - test_draw_polygon/p2:x') + check_eq(p.y, 36, 'F - test_draw_polygon/p2:y') + local p = drawing.points[shape.vertices[3]] + check_eq(p.x, 35, 'F - test_draw_polygon/p3:x') + check_eq(p.y, 26, 'F - test_draw_polygon/p3:y') +end + +function test_draw_rectangle() + io.write('\ntest_draw_rectangle') + -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end) + App.screen.init{width=Margin_left+300, height=300} + Lines = load_array{'```lines', '```', ''} + Line_width = 256 -- drawing coordinates 1:1 with pixels + App.draw() + check_eq(Current_drawing_mode, 'line', 'F - test_draw_rectangle/baseline/drawing_mode') + check_eq(#Lines, 2, 'F - test_draw_rectangle/baseline/#lines') + check_eq(Lines[1].mode, 'drawing', 'F - test_draw_rectangle/baseline/mode') + check_eq(Lines[1].y, Margin_top+Drawing_padding_top, 'F - test_draw_rectangle/baseline/y') + check_eq(Lines[1].h, 128, 'F - test_draw_rectangle/baseline/y') + check_eq(#Lines[1].shapes, 0, 'F - test_draw_rectangle/baseline/#shapes') + -- first point + App.run_after_mouse_press(Margin_left+35, Margin_top+Drawing_padding_top+36, 1) + App.run_after_keychord('r') -- rectangle mode + -- second point/first edge + App.mouse_move(Margin_left+42, Margin_top+Drawing_padding_top+45) + App.run_after_keychord('p') + -- override second point/first edge + App.mouse_move(Margin_left+75, Margin_top+Drawing_padding_top+76) + App.run_after_keychord('p') + -- release (decides 'thickness' of rectangle perpendicular to first edge) + App.run_after_mouse_release(Margin_left+15, Margin_top+Drawing_padding_top+26, 1) + local drawing = Lines[1] + check_eq(#drawing.shapes, 1, 'F - test_draw_rectangle/#shapes') + check_eq(#drawing.points, 5, 'F - test_draw_rectangle/#points') -- currently includes every point added + local shape = drawing.shapes[1] + check_eq(shape.mode, 'rectangle', 'F - test_draw_rectangle/shape_mode') + check_eq(#shape.vertices, 4, 'F - test_draw_rectangle/vertices') + local p = drawing.points[shape.vertices[1]] + check_eq(p.x, 35, 'F - test_draw_rectangle/p1:x') + check_eq(p.y, 36, 'F - test_draw_rectangle/p1:y') + local p = drawing.points[shape.vertices[2]] + check_eq(p.x, 75, 'F - test_draw_rectangle/p2:x') + check_eq(p.y, 76, 'F - test_draw_rectangle/p2:y') + local p = drawing.points[shape.vertices[3]] + check_eq(p.x, 70, 'F - test_draw_rectangle/p3:x') + check_eq(p.y, 81, 'F - test_draw_rectangle/p3:y') + local p = drawing.points[shape.vertices[4]] + check_eq(p.x, 30, 'F - test_draw_rectangle/p4:x') + check_eq(p.y, 41, 'F - test_draw_rectangle/p4:y') +end + +function test_draw_rectangle_intermediate() + io.write('\ntest_draw_rectangle_intermediate') + -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end) + App.screen.init{width=Margin_left+300, height=300} + Lines = load_array{'```lines', '```', ''} + Line_width = 256 -- drawing coordinates 1:1 with pixels + App.draw() + check_eq(Current_drawing_mode, 'line', 'F - test_draw_rectangle_intermediate/baseline/drawing_mode') + check_eq(#Lines, 2, 'F - test_draw_rectangle_intermediate/baseline/#lines') + check_eq(Lines[1].mode, 'drawing', 'F - test_draw_rectangle_intermediate/baseline/mode') + check_eq(Lines[1].y, Margin_top+Drawing_padding_top, 'F - test_draw_rectangle_intermediate/baseline/y') + check_eq(Lines[1].h, 128, 'F - test_draw_rectangle_intermediate/baseline/y') + check_eq(#Lines[1].shapes, 0, 'F - test_draw_rectangle_intermediate/baseline/#shapes') + -- first point + App.run_after_mouse_press(Margin_left+35, Margin_top+Drawing_padding_top+36, 1) + App.run_after_keychord('r') -- rectangle mode + -- second point/first edge + App.mouse_move(Margin_left+42, Margin_top+Drawing_padding_top+45) + App.run_after_keychord('p') + -- override second point/first edge + App.mouse_move(Margin_left+75, Margin_top+Drawing_padding_top+76) + App.run_after_keychord('p') + local drawing = Lines[1] + check_eq(#drawing.points, 3, 'F - test_draw_rectangle_intermediate/#points') -- currently includes every point added + local pending = drawing.pending + check_eq(pending.mode, 'rectangle', 'F - test_draw_rectangle_intermediate/shape_mode') + check_eq(#pending.vertices, 2, 'F - test_draw_rectangle_intermediate/vertices') + local p = drawing.points[pending.vertices[1]] + check_eq(p.x, 35, 'F - test_draw_rectangle_intermediate/p1:x') + check_eq(p.y, 36, 'F - test_draw_rectangle_intermediate/p1:y') + local p = drawing.points[pending.vertices[2]] + check_eq(p.x, 75, 'F - test_draw_rectangle_intermediate/p2:x') + check_eq(p.y, 76, 'F - test_draw_rectangle_intermediate/p2:y') + -- outline of rectangle is drawn based on where the mouse is, but we can't check that so far +end + +function test_draw_square() + io.write('\ntest_draw_square') + -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end) + App.screen.init{width=Margin_left+300, height=300} + Lines = load_array{'```lines', '```', ''} + Line_width = 256 -- drawing coordinates 1:1 with pixels + App.draw() + check_eq(Current_drawing_mode, 'line', 'F - test_draw_square/baseline/drawing_mode') + check_eq(#Lines, 2, 'F - test_draw_square/baseline/#lines') + check_eq(Lines[1].mode, 'drawing', 'F - test_draw_square/baseline/mode') + check_eq(Lines[1].y, Margin_top+Drawing_padding_top, 'F - test_draw_square/baseline/y') + check_eq(Lines[1].h, 128, 'F - test_draw_square/baseline/y') + check_eq(#Lines[1].shapes, 0, 'F - test_draw_square/baseline/#shapes') + -- first point + App.run_after_mouse_press(Margin_left+35, Margin_top+Drawing_padding_top+36, 1) + App.run_after_keychord('s') -- square mode + -- second point/first edge + App.mouse_move(Margin_left+42, Margin_top+Drawing_padding_top+45) + App.run_after_keychord('p') + -- override second point/first edge + App.mouse_move(Margin_left+65, Margin_top+Drawing_padding_top+66) + App.run_after_keychord('p') + -- release (decides which side of first edge to draw square on) + App.run_after_mouse_release(Margin_left+15, Margin_top+Drawing_padding_top+26, 1) + local drawing = Lines[1] + check_eq(#drawing.shapes, 1, 'F - test_draw_square/#shapes') + check_eq(#drawing.points, 5, 'F - test_draw_square/#points') -- currently includes every point added + check_eq(drawing.shapes[1].mode, 'square', 'F - test_draw_square/shape_mode') + check_eq(#drawing.shapes[1].vertices, 4, 'F - test_draw_square/vertices') + local p = drawing.points[drawing.shapes[1].vertices[1]] + check_eq(p.x, 35, 'F - test_draw_square/p1:x') + check_eq(p.y, 36, 'F - test_draw_square/p1:y') + local p = drawing.points[drawing.shapes[1].vertices[2]] + check_eq(p.x, 65, 'F - test_draw_square/p2:x') + check_eq(p.y, 66, 'F - test_draw_square/p2:y') + local p = drawing.points[drawing.shapes[1].vertices[3]] + check_eq(p.x, 35, 'F - test_draw_square/p3:x') + check_eq(p.y, 96, 'F - test_draw_square/p3:y') + local p = drawing.points[drawing.shapes[1].vertices[4]] + check_eq(p.x, 5, 'F - test_draw_square/p4:x') + check_eq(p.y, 66, 'F - test_draw_square/p4:y') +end |