integration of piplines and cams into UI

This commit is contained in:
ori
2019-06-15 13:23:49 -07:00
parent 3dbe097fce
commit aed12aafb4
4 changed files with 11 additions and 9 deletions

View File

@@ -60,8 +60,10 @@ class ChameleonWebSocket(tornado.websocket.WebSocketHandler):
def send_full_settings(self):
full_settings = self.settings_manager.general_settings.copy()
full_settings["cameraList"] = list(self.settings_manager.cams.copy().keys())
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())
except NoCameraConnectedException:
# TODO: return something if no camera connected
full_settings["data"] = None