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

fixed settings manager where no camera is connected

Browse Source 
didn't check yet
This commit is contained in:
Sagi Frimer
2019-04-28 00:12:02 +03:00
parent 09685d46eb
commit b99d6ef3dd
3 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,7 @@
import tornado.websocket
import json
from Exceptions import NoCameraConnectedException
from .CamerasHandler import CamerasHandler
from ..classes.SettingsManager import SettingsManager
@@ -43,11 +45,20 @@ class ChameleonWebSocket(tornado.websocket.WebSocketHandler):
return True
def send_curr_cam(self):
self.write_message(self.settings_manager.get_curr_pipeline())
try:
self.write_message(self.settings_manager.get_curr_pipeline())
except NoCameraConnectedException:
# TODO: return something if no camera connected
self.write_message(None)
def send_full_settings(self):
full_settings = self.settings_manager.general_settings.copy()
full_settings["data"] = self.settings_manager.get_curr_pipeline()
try:
full_settings["data"] = self.settings_manager.get_curr_pipeline()
except NoCameraConnectedException:
# TODO: return something if no camera connected
full_settings["data"] = None
self.write_message(full_settings)