finished presentation materials

This commit is contained in:
2018-07-11 16:48:49 +02:00
parent 4b926bed19
commit d4a7e4c4a2
7 changed files with 25 additions and 11 deletions

4
.gitignore vendored
View File

@@ -3,6 +3,10 @@
*.jpg
*.avi
*.mpg
*.pptx
*.mov
*.mp4
*.mkv
*~
~*
exp_*

View File

@@ -1 +1 @@
<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/8.8.0 Chrome/61.0.3163.100 Electron/2.0.2 Safari/537.36" version="8.8.7" editor="www.draw.io" type="device"><diagram id="207926da-88cc-0e72-5287-a78652d5e9bd" name="Page-1">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</diagram></mxfile>
<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/8.8.0 Chrome/61.0.3163.100 Electron/2.0.2 Safari/537.36" version="8.9.2" editor="www.draw.io" type="device"><diagram id="207926da-88cc-0e72-5287-a78652d5e9bd" name="Page-1">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</diagram></mxfile>

View File

@@ -0,0 +1 @@
<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/8.8.0 Chrome/61.0.3163.100 Electron/2.0.2 Safari/537.36" version="8.9.2" editor="www.draw.io" type="device"><diagram id="f737c97b-c123-5f16-73ca-9d33b97722f5" name="Page-1">7Zpdb9owFIZ/DbdVPkgIlwXaTtoqVeqkrZcmOSRenThynAL79bOJHZIaNqQGwtRwgeLj44+c18/hEGXkztPNA0N58kgjICPHijYjdzFynKlniW9p2FYGPwgqQ8xwVJnsveEZ/wZlVOPiEkdQtBw5pYTjvG0MaZZByFs2xBhdt91WlLRXzVEMhuE5RMS0/sART5TV9qf7ji+A40QtHTiTqmOJwteY0TJT640cd7X7VN0p0nOpGy0SFNF1w+Tejdw5o5RXV+lmDkSGVoetGnd/pLfeN4OMnzJgXA14Q6QEvePdvvhWxwIiERrVpIwnNKYZInd762x3vyBntEQr4SkRl7a4JGgJZFaHZE4JZaIro5kc9gs43yrtUcmpMO3n/0ZprmYpOKOvtQ4iRLMVzfg9SjGRx+uWYUSUUc3maCe9opDB2n3kdDkKcRYL61h6YUIaXqsghDCsF230LANv7MnxZohV1AtaslAFTYWRIxaD8nIrkwxnY5iS5QFoCpxthQMDgjh+a59EpA50XPvtRRUXStfDGjuGxjO0c1gAF/Bgmhmat0Nut1UVZzaXfukmlvDfrAhdhwli/CZnNIRCbHW2TjCHZxFp6bgWbv88DceE+JjWR1Vsn4Kjmr4B47D5q16qVxOtMp7OgOtG+tC2pJE5JtbHBfYHiM8CsWtC7PUFsWto/EDRAHHXEPdIcTBQ3D48K/APUxxNpkvrZIo9k+JJXxR7hsb3GERtOmDcKcbjHjGuj2An2MIG85/SfOOp1kuj5wkYFhsEpgaKiLFtw102X5p97wd83qwwMbOC3VuFPjHSwveSZTIG8n+v+KoK9utLDFqMbhNDrWTnicHvMTHYQ5l+HpTtA3W63VuhbpuV+gIXHGViu471CKgoGaTyfgaeO+fZsS4J9FCxvz8+K+cI0P7S9/yTgT5Qstu91ey2WbTf5gI6FCbC+kRQVv1SDzR3XbZflGa99kBz1zQfKrWnvdFs1trqafge6iskWUnRMclax7M/R7ssyWYFNpDcCclTk2Qd2x5Inhoyq0fitwTH2dWW2P8byn2SbJZen5vkyIMgGh86AIGzdP2TSdZxbJE87otkvZsDv8kDyWcj2b3oU3HzRZOvOHy9QllrxLqVtebz7LXWOXUVzf27Sbu+xvtf7t0f</diagram></mxfile>

View File

@@ -1 +1 @@
<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/8.8.0 Chrome/61.0.3163.100 Electron/2.0.2 Safari/537.36" version="8.8.7" editor="www.draw.io" type="device"><diagram id="20b248c3-da19-9561-3d67-480d61d4ec6f" name="Page-1">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</diagram></mxfile>
<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/8.8.0 Chrome/61.0.3163.100 Electron/2.0.2 Safari/537.36" version="8.9.2" editor="www.draw.io" type="device"><diagram id="20b248c3-da19-9561-3d67-480d61d4ec6f" name="Page-1">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</diagram></mxfile>

View File

@@ -101,6 +101,7 @@ class Colorpicker(object):
)
thr = cv2.cvtColor(thr, cv2.COLOR_GRAY2BGR)
thr = self.marker.draw_last_contours(thr)
resulting = np.concatenate((frame, thr), axis=1)
cv2.imshow(self.WINDOW_CAPTURE_NAME, resulting)

View File

@@ -56,6 +56,7 @@ class GoalFinder(object):
self.hsv_upper = tuple(hsv_upper)
self.goal_thr = goal_thr
self.last_detection = []
self.last_contours = []
def primary_mask(self, frame):
hsv = cv2.cvtColor(frame, cv2.COLOR_BGR2HSV)
@@ -92,6 +93,7 @@ class GoalFinder(object):
thr = self.primary_mask(frame)
cnts, _ = cv2.findContours(thr, cv2.RETR_EXTERNAL,
cv2.CHAIN_APPROX_SIMPLE)
self.last_contours = cnts
cnts.sort(key=cv2.contourArea, reverse=True)
top_x = 6
cnts = cnts[:top_x]
@@ -121,6 +123,12 @@ class GoalFinder(object):
goal = good_cnts[similarities.index(best)]
return goal
def draw_last_contours(self, frame):
frame = frame.copy()
for cnt in self.last_contours:
cv2.drawContours(frame, (cnt,), -1, (255, 0, 0), 2)
return frame
def left_right_post(self, contour):
return contour[...,0].min(), contour[...,0].max()
@@ -205,11 +213,11 @@ class BallFinder(object):
if ball is not None:
center, radius = ball
cv2.circle(frame, center, radius, (255, 255, 0), 2)
for i in range(1, len(self.history)):
if self.history[i - 1] is None or self.history[i] is None:
continue
center_now = self.history[i - 1][0]
center_prev = self.history[i][0]
thickness = int((64 / (i + 1))**0.5 * 1.25)
cv2.line(frame, center_now, center_prev, (0, 0, 255), thickness)
# for i in range(1, len(self.history)):
# if self.history[i - 1] is None or self.history[i] is None:
# continue
# center_now = self.history[i - 1][0]
# center_prev = self.history[i][0]
# thickness = int((64 / (i + 1))**0.5 * 1.25)
# cv2.line(frame, center_now, center_prev, (0, 0, 255), thickness)
return frame

View File

@@ -11,7 +11,6 @@
255
]
],
"cam": 1,
"goal": [
[
0,
@@ -24,6 +23,7 @@
255
]
],
"fps": 10,
"res": 2,
"ball_min_radius": 0.01,
"field": [
@@ -38,7 +38,7 @@
255
]
],
"fps": 10,
"cam": 1,
"ip": "192.168.0.11",
"port": 9559
}