From 4208b23c60fd6c90fbe538d3c1d064abe7f703cd Mon Sep 17 00:00:00 2001
From: ori <oriagranat9@gmail.com>
Date: Sun, 5 May 2019 12:09:43 -0700
Subject: [PATCH] work on bug

---
 backend/Main.py                                 |  2 +-
 backend/app/classes/SettingsManager.py          | 17 ++++++++++-------
 .../settings/cams/USB Camera-B4.09.24.1.json    |  1 -
 backend/settings/settings.json                  |  1 -
 4 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100644 backend/settings/cams/USB Camera-B4.09.24.1.json
 delete mode 100644 backend/settings/settings.json

diff --git a/backend/Main.py b/backend/Main.py
index 8eeecd860..f2269b8bf 100644
--- a/backend/Main.py
+++ b/backend/Main.py
@@ -8,7 +8,7 @@ from app.handlers.VisionHandler import VisionHandler
 if __name__ == "__main__":
     SettingsManager()
     
-    #VisionHandler().run()
+    # VisionHandler().run()
     # SettingsManager().save_settings()
 
     tornado.options.parse_command_line()
diff --git a/backend/app/classes/SettingsManager.py b/backend/app/classes/SettingsManager.py
index f125298d7..93dc39d92 100644
--- a/backend/app/classes/SettingsManager.py
+++ b/backend/app/classes/SettingsManager.py
@@ -45,6 +45,7 @@ class SettingsManager(metaclass=Singleton):
         self._init_usb_cameras()
         self._init_cameras()
 
+
         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
@@ -59,7 +60,8 @@ class SettingsManager(metaclass=Singleton):
 
     # Initiate our camera's settings
     def _init_cameras(self):
-        for cam in self.usb_cameras_info:
+        for cam_name in self.usb_cameras_info:
+            cam = self.usb_cameras_info[cam_name]
             if os.path.exists(os.path.join(self.cams_path, cam.name + '.json')):
 
                 with open(os.path.join(self.cams_path, cam.name + '.json'), 'r') as camera:
@@ -82,12 +84,13 @@ class SettingsManager(metaclass=Singleton):
                 cap.release()
                 index += 1
 
-        for index in true_cameras:
-            self.usb_cameras_info[usb_devices[index].name] = usb_devices[index]
+        for i in true_cameras:
+            self.usb_cameras_info[usb_devices[i].name] = usb_devices[i]
 
     # Initiate cscore usb devices
     def _init_usb_cameras(self):
-        for device in self.usb_cameras_info:
+        for i in self.usb_cameras_info:
+            device = self.usb_cameras_info[i]
 
             device_name = device.name
 
@@ -185,10 +188,10 @@ class SettingsManager(metaclass=Singleton):
         self.cams[cam_name]["pipelines"] = {}
         self.create_new_pipeline(cam_name=cam_name)
 
-        self.cams[cam_name]["path"] = self.usb_cameras[cam_name].otherPaths[0] if len(
-            self.usb_cameras[cam_name].otherPaths) == 1 else self.usb_cameras[cam_name].otherPaths[1]
+        self.cams[cam_name]["path"] = self.usb_cameras_info[cam_name].otherPaths[0] if len(
+            self.usb_cameras_info[cam_name].otherPaths) == 1 else self.usb_cameras_info[cam_name].otherPaths[1]
 
-        video_mode: VideoMode = self.usb_cameras[self.usb_cameras[cam_name].name].enumerateVideoModes()[0]
+        video_mode: VideoMode = self.usb_cameras[cam_name].enumerateVideoModes()[0]
         self.cams[self.usb_cameras[cam_name].name]["video_mode"] = {
             "fps": video_mode.fps,
             "width": video_mode.width,
diff --git a/backend/settings/cams/USB Camera-B4.09.24.1.json b/backend/settings/cams/USB Camera-B4.09.24.1.json
deleted file mode 100644
index 186389c20..000000000
--- a/backend/settings/cams/USB Camera-B4.09.24.1.json	
+++ /dev/null
@@ -1 +0,0 @@
-{"pipelines": {"pipeline0": {"exposure": 50, "brightness": 50, "orientation": "Normal", "resolution": [320, 160], "hue": [0, 100], "saturation": [0, 100], "value": [0, 100], "erode": false, "dilate": false, "area": [0, 100], "ratio": [0, 20], "extent": [0, 100]}}, "path": "/dev/v4l/by-path/pci-0000:02:03.0-usb-0:1:1.0-video-index0", "video_mode": {"fps": 187, "width": 320, "height": 240, "pixel_format": "kYUYV"}}
\ No newline at end of file
diff --git a/backend/settings/settings.json b/backend/settings/settings.json
deleted file mode 100644
index c89e02900..000000000
--- a/backend/settings/settings.json
+++ /dev/null
@@ -1 +0,0 @@
-{"team_number": 1577, "connection_type": "DHCP", "ip": "", "gateway": "", "hostname": "Chameleon-Vision", "curr_camera": "USB Camera-B4.09.24.1", "curr_pipeline": "pipeline0"}
\ No newline at end of file