diff options
| -rw-r--r-- | Manual_tests.md | 3 | ||||
| -rw-r--r-- | drawing.lua | 17 | ||||
| -rw-r--r-- | drawing_tests.lua | 40 |
3 files changed, 44 insertions, 16 deletions
diff --git a/Manual_tests.md b/Manual_tests.md index b701718..c4701a3 100644 --- a/Manual_tests.md +++ b/Manual_tests.md @@ -12,9 +12,6 @@ Lua is dynamically typed. Tests can't patch over lack of type-checking. ### Todo list -drawing - select a point and move it - persistence: draw a line, circle, rectangle, square, polygon, quit, restart. All the shapes you drew should still be visible. select a point and name it, quit, restart. Name is still visible. diff --git a/drawing.lua b/drawing.lua index 45d93dd..6ed50ce 100644 --- a/drawing.lua +++ b/drawing.lua @@ -260,6 +260,10 @@ function Drawing.mouse_released(x,y, button) if Current_drawing_mode == 'move' then Current_drawing_mode = Previous_drawing_mode Previous_drawing_mode = nil + if Lines.current_drawing then + Lines.current_drawing.pending = {} + Lines.current_drawing = nil + end elseif Lines.current_drawing then local drawing = Lines.current_drawing if drawing.pending then @@ -336,8 +340,6 @@ function Drawing.mouse_released(x,y, button) drawing.pending.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, drawing.pending.end_angle) table.insert(drawing.shapes, drawing.pending) end - elseif drawing.pending.mode == 'move' then - -- drop it elseif drawing.pending.mode == 'name' then -- drop it else @@ -486,17 +488,6 @@ function Drawing.keychord_pressed(chord) Lines.current_drawing_index = drawing_index Lines.current_drawing = drawing end - elseif App.mouse_down(1) and chord == 'v' then - local drawing_index,drawing,_,p = Drawing.select_point_at_mouse() - if drawing then - if Previous_drawing_mode == nil then - Previous_drawing_mode = Current_drawing_mode - end - Current_drawing_mode = 'move' - drawing.pending = {mode=Current_drawing_mode, target_point=p} - Lines.current_drawing_index = drawing_index - Lines.current_drawing = drawing - end elseif chord == 'C-n' and not App.mouse_down(1) then local drawing_index,drawing,point_index,p = Drawing.select_point_at_mouse() if drawing then diff --git a/drawing_tests.lua b/drawing_tests.lua index 545f182..4505002 100644 --- a/drawing_tests.lua +++ b/drawing_tests.lua @@ -356,3 +356,43 @@ function test_name_point() check_eq(Current_drawing_mode, 'line', 'F - test_name_point/mode:3') check_eq(p2.name, 'A', 'F - test_name_point') end + +function test_move_point() + io.write('\ntest_move_point') + -- create a drawing with a line + App.screen.init{width=Margin_left+300, height=300} + Lines = load_array{'```lines', '```', ''} + Line_width = 256 -- drawing coordinates 1:1 with pixels + Current_drawing_mode = 'line' + App.draw() + -- 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) + local drawing = Lines[1] + check_eq(#drawing.shapes, 1, 'F - test_move_point/baseline/#shapes') + check_eq(#drawing.points, 2, 'F - test_move_point/baseline/#points') + check_eq(drawing.shapes[1].mode, 'line', 'F - test_move_point/baseline/shape:1') + local p1 = drawing.points[drawing.shapes[1].p1] + local p2 = drawing.points[drawing.shapes[1].p2] + check_eq(p1.x, 5, 'F - test_move_point/baseline/p1:x') + check_eq(p1.y, 6, 'F - test_move_point/baseline/p1:y') + check_eq(p2.x, 35, 'F - test_move_point/baseline/p2:x') + check_eq(p2.y, 36, 'F - test_move_point/baseline/p2:y') + check_nil(p2.name, 'F - test_move_point/baseline/p2:name') + -- enter 'move' mode without moving the mouse + App.run_after_keychord('C-u') + check_eq(Current_drawing_mode, 'move', 'F - test_move_point/mode:1') + -- point is lifted + check_eq(drawing.pending.mode, 'move', 'F - test_move_point/mode:2') + check_eq(drawing.pending.target_point, p2, 'F - test_move_point/target') + -- move point + App.mouse_move(Margin_left+26, Margin_top+Drawing_padding_top+44) + App.update(0.05) + local p2 = drawing.points[drawing.shapes[1].p2] + check_eq(p2.x, 26, 'F - test_move_point/x') + check_eq(p2.y, 44, 'F - test_move_point/y') + -- exit 'move' mode + App.run_after_mouse_click(Margin_left+26, Margin_top+Drawing_padding_top+44, 1) + check_eq(Current_drawing_mode, 'line', 'F - test_move_point/mode:3') + check_eq(drawing.pending, {}, 'F - test_move_point/pending') +end |