integration of camera handler into settings manager

This commit is contained in:
ori
2019-05-02 12:42:44 -07:00
parent ce94cea27b
commit 0907c31aad
5 changed files with 92 additions and 38 deletions

View File

@@ -63,7 +63,7 @@ class ChameleonWebSocket(tornado.websocket.WebSocketHandler):
full_settings = self.settings_manager.general_settings.copy()
try:
full_settings["data"] = self.settings_manager.get_curr_pipeline()
full_settings = self.settings_manager.get_curr_pipeline()
except NoCameraConnectedException:
# TODO: return something if no camera connected
full_settings["data"] = None