projekty
/
imago.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gridf bruteforce
[imago.git]
/
intrsc.py
diff --git
a/intrsc.py
b/intrsc.py
index
564faaa
..
cead665
100644
(file)
--- a/
intrsc.py
+++ b/
intrsc.py
@@
-21,7
+21,7
@@
def board(image, lines, show_all, do_something):
line])
return board
line])
return board
-def intersections_from_angl_dist(lines, size):
+def intersections_from_angl_dist(lines, size
, get_all=False
):
intersections = []
for (angl1, dist1) in sorted(lines[1], key=itemgetter(1)):
line = []
intersections = []
for (angl1, dist1) in sorted(lines[1], key=itemgetter(1)):
line = []
@@
-29,7
+29,7
@@
def intersections_from_angl_dist(lines, size):
if abs(angl1 - angl2) > 0.4:
x = - ((dist2 / cos(angl2)) - (dist1 / cos(angl1))) / (tan(angl1) - tan(angl2))
y = (tan(angl1) * x) - (dist1 / cos(angl1))
if abs(angl1 - angl2) > 0.4:
x = - ((dist2 / cos(angl2)) - (dist1 / cos(angl1))) / (tan(angl1) - tan(angl2))
y = (tan(angl1) * x) - (dist1 / cos(angl1))
- if (-size[0] / 2 < x < size[0] / 2 and
+ if
get_all or
(-size[0] / 2 < x < size[0] / 2 and
-size[1] / 2 < y < size[1] / 2):
line.append((int(x + size[0] / 2), int(y + size[1] / 2)))
intersections.append(line)
-size[1] / 2 < y < size[1] / 2):
line.append((int(x + size[0] / 2), int(y + size[1] / 2)))
intersections.append(line)