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

intagrated setting manager into socket handler and camera handler

Browse Source
This commit is contained in:
ori
2019-05-01 10:16:40 -07:00
parent 82f24882cc
commit 93a22ffe9f
6 changed files with 57 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
backend/app/handlers/SocketHandler.py
View File

@@ -7,9 +7,10 @@ from ..classes.SettingsManager import SettingsManager
class ChameleonWebSocket(tornado.websocket.WebSocketHandler):
actions = {}
set_this_camera_settings = ["exposure", "brightness", "video_mode"]
def __init__(self, application, request, **kwargs):
super().__init__(application, request, **kwargs)
self.settings_manager = SettingsManager()
@@ -44,12 +45,19 @@ class ChameleonWebSocket(tornado.websocket.WebSocketHandler):
def check_origin(self, origin):
return True
def send_curr_cam(self):
def send_curr_pipeline(self):
try:
self.write_message(self.settings_manager.get_curr_pipeline())
except NoCameraConnectedException:
# TODO: return something if no camera connected
self.write_message(None)
self.write_message("No camera connected")
def send_curr_cam(self):
try:
self.write_message(self.settings_manager.get_curr_cam())
except NoCameraConnectedException:
# TODO: return something if no camera connected
self.write_message("No camera connected")
def send_full_settings(self):
full_settings = self.settings_manager.general_settings.copy()
@@ -64,15 +72,17 @@ class ChameleonWebSocket(tornado.websocket.WebSocketHandler):
def change_curr_camera(self, dic):
self.settings_manager.set_curr_camera(cam_name=dic["cam"])
self.send_curr_cam()
def change_curr_pipeline(self, dic):
self.settings_manager.set_curr_pipeline(pipe_name=dic["pipeline"])
self.send_curr_pipeline()
def change_pipeline_values(self, dic):
self.settings_manager.change_pipeline_values(dic)
CamerasHandler.change_camera_values(CamerasHandler.get_usb_camera_by_name(self.settings_manager.general_settings["curr_camera"]), dic)
for key in self.set_this_camera_settings:
if key in dic:
CamerasHandler.set_camera_settings(
CamerasHandler.get_usb_camera_by_name(self.settings_manager.general_settings["curr_camera"]),
dic[key])