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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Sagi Frimer
2019-04-28 23:10:11 +03:00
parent a37e73bde5 95429f69c5
commit 17381a37bf
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/app/classes/SettingsManager.py
View File

@@ -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:

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

@@ -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