From 95429f69c5d198219ef38b3ed35b49a624d9e958 Mon Sep 17 00:00:00 2001 From: sagi Date: Sat, 27 Apr 2019 14:48:58 -0700 Subject: [PATCH] seems to work but i have no cameras to check --- backend/app/classes/SettingsManager.py | 8 ++++---- backend/app/handlers/SocketHandler.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/app/classes/SettingsManager.py b/backend/app/classes/SettingsManager.py index 0f657e781..a23b27e46 100644 --- a/backend/app/classes/SettingsManager.py +++ b/backend/app/classes/SettingsManager.py @@ -1,7 +1,6 @@ import os import json from .Singleton import Singleton -# from .handlers.CamerasHandler import CamerasHandler from ..handlers.CamerasHandler import CamerasHandler from .Exceptions import PipelineAlreadyExistsException, NoCameraConnectedException @@ -40,9 +39,10 @@ class SettingsManager(metaclass=Singleton): self._init_general_settings() self._init_cameras() - if self.general_settings["curr_camera"] not in self.cams and len(list(self.cams.keys())) > 0: - self.general_settings["curr_camera"] = list(self.cams.keys())[0] - self.general_settings["curr_pipeline"] = list(list(self.cams.keys())[0]["pipelines"].keys())[0] + if self.general_settings["curr_camera"] not in self.cams and len(self.cams) > 0: + cam_name = list(self.cams.keys())[0] + self.general_settings["curr_camera"] = cam_name + self.general_settings["curr_pipeline"] = list(self.cams[cam_name]["pipelines"].keys())[0] def _init_general_settings(self): try: diff --git a/backend/app/handlers/SocketHandler.py b/backend/app/handlers/SocketHandler.py index dff477a23..23299599a 100644 --- a/backend/app/handlers/SocketHandler.py +++ b/backend/app/handlers/SocketHandler.py @@ -1,7 +1,7 @@ import tornado.websocket import json -from Exceptions import NoCameraConnectedException +from ..classes.Exceptions import NoCameraConnectedException from .CamerasHandler import CamerasHandler from ..classes.SettingsManager import SettingsManager