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

integrated resulotion list into FE and BE

Browse Source
This commit is contained in:
ori
2019-06-16 11:39:40 -07:00
parent aed12aafb4
commit b93463b2b8
7 changed files with 85 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ from ..classes.SettingsManager import SettingsManager
class ChameleonWebSocket(tornado.websocket.WebSocketHandler):
actions = {}
set_this_camera_settings = ["exposure", "brightness", "video_mode"]
set_this_camera_settings = ["exposure", "brightness", "resolution"]
def __init__(self, application, request, **kwargs):
super().__init__(application, request, **kwargs)
@@ -64,6 +64,7 @@ class ChameleonWebSocket(tornado.websocket.WebSocketHandler):
try:
full_settings.update(self.settings_manager.get_curr_pipeline())
full_settings["pipelineList"] = list(self.settings_manager.cams[self.settings_manager.general_settings["curr_camera"]]["pipelines"].keys())
full_settings["resolutionList"] = self.settings_manager.get_resolution_list()
except NoCameraConnectedException:
# TODO: return something if no camera connected
full_settings["data"] = None