Skip to content

Feature module implementation #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicovanbentum wants to merge 5 commits into
base: release
Choose a base branch
from
Open

Feature module implementation #16

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b56de4
removed temp frame class
nicovanbentum Jun 28, 2019
0cd4bbf
fixed import error for tests and fixed byte strings
nicovanbentum Jun 30, 2019
c99a041
finished module impl
nicovanbentum Jul 7, 2019
41d2aa0
Merge branch 'release' into feature-module_implementation
nicovanbentum Jul 7, 2019
d66c460
removed todo and formatted
nicovanbentum Jul 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 23 additions & 39 deletions module/mod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
""" Python module for the Vision module. """
from client.comm import BaseComm
from common.frame_enum import FrameType

# TODO: make a PR for this frame type


class FRAMETYPE:
def __init__(self):
self.msg = ""
self.width = 0
self.height = 0
self.distance = 0
self.x_offset = 0
self.y_offset = 0
from common.frames import FrameQrcodeData


class Vision:
Expand Down Expand Up @@ -45,34 +34,29 @@ def reset_reader(self, new_reader):
def process(self):
""" The process function that's provided by the template. This generates QR
codes from a video frame and puts them on the bus by request. """
# self.comm.send(FrameType.BUTTON_STATE, (1,2,3))

video_frame = self.video_feed.get_frame()
self.qr_reader.read_qr_codes(video_frame, self.cp)

frames = list()
codes = self.qr_reader.get_qr_codes()
if codes:
for code in codes:
frame = FRAMETYPE()
frame.msg = code.get_value("Data")
frame.width = code.get_value("Width")
frame.height = code.get_value("Height")
frame.distance = code.get_distance()
center = code.get_center_offset()
if center:
frame.x_offset = center[0]
frame.y_offset = center[1]
frames.append(frame)

if 1: # TODO: this 'if' should trigger on data request
for frame in frames:
print(" width {} height {} distance {} offsetx {} offsety {}".format(
frame.width, frame.height, frame.distance, frame.x_offset, frame.y_offset))
# self.comm.send(frame)

while self.comm.has_data():
print(self.comm.get_data())
frame = self.comm.get_data()

# if its a request we process the current video feed frame
if frame.request:
video_frame = self.video_feed.get_frame()
self.qr_reader.read_qr_codes(video_frame, self.cp)
frames = list()
codes = self.qr_reader.get_qr_codes()

# if we found codes we make a frame based on the code and add it to the list to send off
if codes:
for code in codes:
center = code.get_center_offset()
frame = FrameQrcodeData()
byte_string = bytes(code.get_value("Data"), 'utf-8')
frame.set_data(byte_string, int(code.get_value("Width")), int(code.get_value(
"Height")), int(center[0]), int(center[1]), int(code.get_distance()))
self.comm.send(frame)

# send off the frames
for frame in frames:
self.comm.send(frame)

def stop(self):
""" Stop function provided by the template. """
Expand Down