Settings upload

Author: ds12a

.gitignore

@@ -3,4 +3,5 @@ walleye.log*
 **/__pycache__/*.pyc
 Calibration/Cam_*CalImgs/*
 profile.html
-profile.json
+profile.json
+config.zip

Camera/CameraConfigs/ConfigSettings_platform-fc800000-usb-usb-0-1-1-0-video-index0.json

@@ -1 +1 @@
-{"Resolution": [1600, 1200], "Gain": 0.0, "Exposure": 66.0}
+{"Resolution": [1280, 720], "Gain": -1.0, "Exposure": 66.0}

Camera/camera.py

@@ -83,32 +83,7 @@ def __init__(self):
                     self.info[camPath].resolution = self.getResolutions()[camPath]
 
                     # Attempt to import config from file
-                    cleaned = self.cleanIdentifier(camPath)
-                    config = None
-
-                    try:
-                        # Parse config from config file
-                        config = parseConfig(cleaned)
-                        Cameras.logger.info(f"Config found!")
-
-                    except (FileNotFoundError, json.decoder.JSONDecodeError):
-                        Cameras.logger.warning(f"Config not found for camera {camPath}")
-
-                    if config is not None:
-                        # Config was found, set config data
-                        if not self.setResolution(
-                            camPath, config["Resolution"]
-                        ):  # Calls self.importCalibration iff resolution was set
-                            self.importCalibration(camPath)
-                        self.setGain(camPath, config["Gain"])
-                        self.setExposure(camPath, config["Exposure"])
-
-                    else:
-                        self.importCalibration(camPath)
-                        Cameras.logger.warning(
-                            f"Camera config not found for camera {camPath}"
-                        )
-
+                    self.importConfig(camPath)
 
                     # Save configs
                     writeConfig(
@@ -271,6 +246,37 @@ def importCalibration(self, identifier):
                 f"Calibration not found for camera {identifier} at resolution {resolution}"
             )
             return False
+    
+    def importConfig(self, camPath):
+        # Attempt to import config from file
+        Cameras.logger.info(f"Attempting to import config for {camPath}")
+        cleaned = self.cleanIdentifier(camPath)
+        config = None
+
+        try:
+            # Parse config from config file
+            config = parseConfig(cleaned)
+            Cameras.logger.info(f"Config found!")
+
+        except (FileNotFoundError, json.decoder.JSONDecodeError):
+            Cameras.logger.warning(f"Config not found for camera {camPath}")
+
+        if config is not None:
+            # Config was found, set config data
+            if not self.setResolution(
+                camPath, config["Resolution"]
+            ):  # Calls self.importCalibration iff resolution was set
+                self.importCalibration(camPath)
+            self.setGain(camPath, config["Gain"])
+            self.setExposure(camPath, config["Exposure"])
+
+        else:
+            self.importCalibration(camPath)
+            Cameras.logger.warning(
+                f"Camera config not found for camera {camPath}"
+            )
+        
+        return config
 
     @staticmethod
     def cleanIdentifier(identifier):

Processing/Processing.py

@@ -83,7 +83,7 @@ def imagePose(self, images, K, D, layout, arucoDetector):
 
         # Loop through images
         for imgIndex, img in enumerate(images):
-            curTags = [0]
+            curTags = []
 
             # If an invalid image is given or no calibration return an error pose
             if img is None or K[imgIndex] is None or D[imgIndex] is None:
@@ -118,7 +118,6 @@ def imagePose(self, images, K, D, layout, arucoDetector):
                         continue
 
                     # Add id information to tagID array
-                    curTags[0] += 1
                     curTags.append(i[0])
 
                     # Grab tag pose and calcualte each corner location

WebInterface/walleye/build/asset-manifest.json

@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "/static/css/main.c0510ccb.css",
-    "main.js": "/static/js/main.efab419d.js",
+    "main.js": "/static/js/main.e5534a24.js",
     "static/media/bootstrap-icons.woff?": "/static/media/bootstrap-icons.4753c5ba57962b4d7bf8.woff",
     "static/media/bootstrap-icons.woff2?": "/static/media/bootstrap-icons.6d63d0501e5ed7b79dab.woff2",
     "index.html": "/index.html",
     "main.c0510ccb.css.map": "/static/css/main.c0510ccb.css.map",
-    "main.efab419d.js.map": "/static/js/main.efab419d.js.map"
+    "main.e5534a24.js.map": "/static/js/main.e5534a24.js.map"
   },
   "entrypoints": [
     "static/css/main.c0510ccb.css",
-    "static/js/main.efab419d.js"
+    "static/js/main.e5534a24.js"
   ]
 }

WebInterface/walleye/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="WallEYE web interface"/><title>WallEYE</title><script defer="defer" src="/static/js/main.efab419d.js"></script><link href="/static/css/main.c0510ccb.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="WallEYE web interface"/><title>WallEYE</title><script defer="defer" src="/static/js/main.e5534a24.js"></script><link href="/static/css/main.c0510ccb.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>