diff options
| -rw-r--r-- | drawing.lua | 5 | ||||
| -rw-r--r-- | file.lua | 16 |
2 files changed, 8 insertions, 13 deletions
diff --git a/drawing.lua b/drawing.lua index 26683b2..0343f85 100644 --- a/drawing.lua +++ b/drawing.lua @@ -712,11 +712,6 @@ function round(num) return math.floor(num+.5) end -function Drawing.insert_point(points, x,y) - table.insert(points, {x=x, y=y}) - return #points -end - function Drawing.find_or_insert_point(points, x,y, width) -- check if UI would snap the two points together for i,point in ipairs(points) do diff --git a/file.lua b/file.lua index 4e268a7..53ef047 100644 --- a/file.lua +++ b/file.lua @@ -61,20 +61,20 @@ function load_drawing(infile_next_line) -- no changes needed elseif shape.mode == 'line' or shape.mode == 'manhattan' then local name = shape.p1.name - shape.p1 = Drawing.insert_point(drawing.points, shape.p1.x, shape.p1.y) + shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600) drawing.points[shape.p1].name = name name = shape.p2.name - shape.p2 = Drawing.insert_point(drawing.points, shape.p2.x, shape.p2.y) + shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600) drawing.points[shape.p2].name = name elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then for i,p in ipairs(shape.vertices) do local name = p.name - shape.vertices[i] = Drawing.insert_point(drawing.points, p.x,p.y) + shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600) drawing.points[shape.vertices[i]].name = name end elseif shape.mode == 'circle' or shape.mode == 'arc' then local name = shape.center.name - shape.center = Drawing.insert_point(drawing.points, shape.center.x,shape.center.y) + shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600) drawing.points[shape.center].name = name elseif shape.mode == 'deleted' then -- ignore @@ -154,20 +154,20 @@ function load_drawing_from_array(iter, a, i) -- no changes needed elseif shape.mode == 'line' or shape.mode == 'manhattan' then local name = shape.p1.name - shape.p1 = Drawing.insert_point(drawing.points, shape.p1.x, shape.p1.y) + shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600) drawing.points[shape.p1].name = name name = shape.p2.name - shape.p2 = Drawing.insert_point(drawing.points, shape.p2.x, shape.p2.y) + shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600) drawing.points[shape.p2].name = name elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then for i,p in ipairs(shape.vertices) do local name = p.name - shape.vertices[i] = Drawing.insert_point(drawing.points, p.x,p.y) + shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600) drawing.points[shape.vertices[i]].name = name end elseif shape.mode == 'circle' or shape.mode == 'arc' then local name = shape.center.name - shape.center = Drawing.insert_point(drawing.points, shape.center.x,shape.center.y) + shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600) drawing.points[shape.center].name = name elseif shape.mode == 'deleted' then -- ignore |