Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-29 02:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

supposedly fixed bug

Browse Source
This commit is contained in:
Sagi Frimer
2019-05-05 22:43:37 +03:00
parent 4208b23c60
commit f92b2f609a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
backend/app/classes/SettingsManager.py
View File

@@ -44,12 +44,15 @@ class SettingsManager(metaclass=Singleton):
self._init_cameras_info()
self._init_usb_cameras()
self._init_cameras()
self._init_usb_cameras_settings()
if self.general_settings["curr_camera"] not in self.cams and len(self.cams) > 0:
cam_name = list(self.cams.keys())[0]
self.general_settings["curr_camera"] = cam_name
self.general_settings["curr_pipeline"] = list(self.cams[cam_name]["pipelines"].keys())[0]
else:
self.general_settings["curr_camera"] = ""
self.general_settings["curr_pipeline"] = ""
def _init_general_settings(self):
try:
@@ -103,15 +106,15 @@ class SettingsManager(metaclass=Singleton):
device_name = "pipeline" + f"({str(suffix)})"
camera = cscore.UsbCamera(name=device_name, dev=device.dev)
camera.setPixelFormat(pixelFormat=
getattr(VideoMode.PixelFormat,
self.get_curr_cam()["video_mode"]["pixel_format"]))
camera.setFPS(self.get_curr_cam()["video_mode"]["fps"])
camera.setResolution(width=self.get_curr_cam()["video_mode"]["width"],
height=self.get_curr_cam()["video_mode"]["height"])
self.usb_cameras[device_name] = camera
def _init_usb_cameras_settings(self):
for cam_name in self.usb_cameras:
self.usb_cameras[cam_name].setPixelFormat(pixelFormat=getattr(VideoMode.PixelFormat, self.cams[cam_name]["video_mode"]["pixel_format"]))
self.usb_cameras[cam_name].setFPS(self.cams[cam_name]["video_mode"]["fps"])
self.usb_cameras[cam_name].setResolution(width=self.cams[cam_name]["video_mode"]["width"], height=self.cams[cam_name]["video_mode"]["height"])
# Change usb camera settings
def set_camera_settings(self, camera_name, dic):