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

Fully merged CmerasHandler to SettingManger

Browse Source 
hadn't the time to check, also refractord every use of cameras handler to settings manager, might have missed
This commit is contained in:
Sagi Frimer
2019-05-05 01:07:38 +03:00
parent 7ca1bbde1e
commit f4bf51ebb2
5 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,9 +59,7 @@ class SettingsManager(metaclass=Singleton):
# Initiate our camera's settings
def _init_cameras(self):
cameras = self._get_cameras_info()
for cam in cameras:
for cam in self.usb_cameras_info:
if os.path.exists(os.path.join(self.cams_path, cam.name + '.json')):
with open(os.path.join(self.cams_path, cam.name + '.json'), 'r') as camera:
@@ -72,17 +70,6 @@ class SettingsManager(metaclass=Singleton):
else:
self.create_new_cam(cam.name)
if "path" not in self.cams[cam.name]:
self.cams[cam.name]["path"] = cam.otherPaths[0] if len(cam.otherPaths) == 1 else cam.otherPaths[1]
if "video_mode" not in self.cams[cam.name]:
video_mode: VideoMode = self.cams(cam.name).enumerateVideoModes()[0]
self.cams[cam.name]["video_mode"] = {
"fps": video_mode.fps,
"width": video_mode.width,
"height": video_mode.height,
"pixel_format": str(video_mode.pixelFormat).split('.')[1]
}
# Initiate true usb cameras(filters microphones and double cameras)
def _init_cameras_info(self):
true_cameras = []
@@ -198,6 +185,17 @@ class SettingsManager(metaclass=Singleton):
self.cams[cam_name]["pipelines"] = {}
self.create_new_pipeline(cam_name=cam_name)
self.cams[cam_name]["path"] = self.usb_cameras[cam_name].otherPaths[0] if len(
self.usb_cameras[cam_name].otherPaths) == 1 else self.usb_cameras[cam_name].otherPaths[1]
video_mode: VideoMode = self.usb_cameras[self.usb_cameras[cam_name].name].enumerateVideoModes()[0]
self.cams[self.usb_cameras[cam_name].name]["video_mode"] = {
"fps": video_mode.fps,
"width": video_mode.width,
"height": video_mode.height,
"pixel_format": str(video_mode.pixelFormat).split('.')[1]
}
# Savers
def save_settings(self):