NikolajDanger/Roboteksperimentarium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨

Browse Source
This commit is contained in:
NikolajDanger
2022-10-31 15:23:19 +01:00
parent f93a046270
commit 123c8fe350
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
robot/robot.py
View File

@ -85,7 +85,7 @@ class Robot(object):
def _init_camera(self): def _init_camera(self):
def gstreamer_pipeline( def gstreamer_pipeline(
capture_width=1024, capture_height=720, framerate=30): capture_width=1280, capture_height=720, framerate=30):
""" """
Utility function for setting parameters for the gstreamer camera Utility function for setting parameters for the gstreamer camera
pipeline pipeline

5
selflocalization/camera.py
View File

@ -309,10 +309,7 @@ class Camera(object):
if not isinstance(self.ids, type(None)): if not isinstance(self.ids, type(None)):
dists = np.zeros(len(self.tvects), dtype=self.tvecs.dtype) dists = np.linalg.norm(self.tvecs, axis=len(self.tvecs.shape) - 1) * 100
for i, tvec in enumerate(self.tvecs):
dists[i] = np.sqrt(tvec[0][0]**2 + tvec[0][2]**2)
# Make sure we always return properly shaped arrays # Make sure we always return properly shaped arrays
dists = dists.reshape((dists.shape[0],)) dists = dists.reshape((dists.shape[0],))
ids = self.ids.reshape((self.ids.shape[0],)) ids = self.ids.reshape((self.ids.shape[0],))