Took new calibration pictures to little effect

Team4256 · Feb 3, 2018 · 5d6f9fd · 5d6f9fd
1 parent d3db18b
commit 5d6f9fd
Show file tree

Hide file tree

Showing 70 changed files with 4 additions and 4 deletions.
diff --git a/Cameras/USB.py b/Cameras/USB.py
@@ -5,7 +5,7 @@
 
 def highlight_cubes(image):
     image = np.rot90(image, 2)
-    return cv2.cvtColor(image, cv2.COLOR_BGR2HSV)[:,:,2]
+    return cv2.cvtColor(image, cv2.COLOR_BGR2YCrCb)[:,:,2]
 
 class USB(object):
     def __init__(self, port, calibration_path):

diff --git a/Resources/ELPFisheyeL/Chessboard (1).jpg b/Resources/ELPFisheyeL/Chessboard (1).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (10).jpg b/Resources/ELPFisheyeL/Chessboard (10).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (11).jpg b/Resources/ELPFisheyeL/Chessboard (11).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (12).jpg b/Resources/ELPFisheyeL/Chessboard (12).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (13).jpg b/Resources/ELPFisheyeL/Chessboard (13).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (14).jpg b/Resources/ELPFisheyeL/Chessboard (14).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (15).jpg b/Resources/ELPFisheyeL/Chessboard (15).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (16).jpg b/Resources/ELPFisheyeL/Chessboard (16).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (17).jpg b/Resources/ELPFisheyeL/Chessboard (17).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (18).jpg b/Resources/ELPFisheyeL/Chessboard (18).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (2).jpg b/Resources/ELPFisheyeL/Chessboard (2).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (3).jpg b/Resources/ELPFisheyeL/Chessboard (3).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (4).jpg b/Resources/ELPFisheyeL/Chessboard (4).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (5).jpg b/Resources/ELPFisheyeL/Chessboard (5).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (6).jpg b/Resources/ELPFisheyeL/Chessboard (6).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (7).jpg b/Resources/ELPFisheyeL/Chessboard (7).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (8).jpg b/Resources/ELPFisheyeL/Chessboard (8).jpg
diff --git a/Resources/ELPFisheyeL/Chessboard (9).jpg b/Resources/ELPFisheyeL/Chessboard (9).jpg
diff --git a/Resources/ELPFisheyeL/D.npy b/Resources/ELPFisheyeL/D.npy
diff --git a/Resources/ELPFisheyeL/K.npy b/Resources/ELPFisheyeL/K.npy
diff --git a/Resources/ELPFisheyeL/chessboard (1).jpg b/Resources/ELPFisheyeL/chessboard (1).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (10).jpg b/Resources/ELPFisheyeL/chessboard (10).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (11).jpg b/Resources/ELPFisheyeL/chessboard (11).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (12).jpg b/Resources/ELPFisheyeL/chessboard (12).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (13).jpg b/Resources/ELPFisheyeL/chessboard (13).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (14).jpg b/Resources/ELPFisheyeL/chessboard (14).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (2).jpg b/Resources/ELPFisheyeL/chessboard (2).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (3).jpg b/Resources/ELPFisheyeL/chessboard (3).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (4).jpg b/Resources/ELPFisheyeL/chessboard (4).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (5).jpg b/Resources/ELPFisheyeL/chessboard (5).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (6).jpg b/Resources/ELPFisheyeL/chessboard (6).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (7).jpg b/Resources/ELPFisheyeL/chessboard (7).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (8).jpg b/Resources/ELPFisheyeL/chessboard (8).jpg
diff --git a/Resources/ELPFisheyeL/chessboard (9).jpg b/Resources/ELPFisheyeL/chessboard (9).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (1).jpg b/Resources/ELPFisheyeR/Chessboard (1).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (10).jpg b/Resources/ELPFisheyeR/Chessboard (10).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (11).jpg b/Resources/ELPFisheyeR/Chessboard (11).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (12).jpg b/Resources/ELPFisheyeR/Chessboard (12).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (13).jpg b/Resources/ELPFisheyeR/Chessboard (13).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (14).jpg b/Resources/ELPFisheyeR/Chessboard (14).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (2).jpg b/Resources/ELPFisheyeR/Chessboard (2).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (3).jpg b/Resources/ELPFisheyeR/Chessboard (3).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (4).jpg b/Resources/ELPFisheyeR/Chessboard (4).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (5).jpg b/Resources/ELPFisheyeR/Chessboard (5).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (6).jpg b/Resources/ELPFisheyeR/Chessboard (6).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (7).jpg b/Resources/ELPFisheyeR/Chessboard (7).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (8).jpg b/Resources/ELPFisheyeR/Chessboard (8).jpg
diff --git a/Resources/ELPFisheyeR/Chessboard (9).jpg b/Resources/ELPFisheyeR/Chessboard (9).jpg
diff --git a/Resources/ELPFisheyeR/D.npy b/Resources/ELPFisheyeR/D.npy
diff --git a/Resources/ELPFisheyeR/K.npy b/Resources/ELPFisheyeR/K.npy
diff --git a/Resources/ELPFisheyeR/chessboard (1).jpg b/Resources/ELPFisheyeR/chessboard (1).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (10).jpg b/Resources/ELPFisheyeR/chessboard (10).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (11).jpg b/Resources/ELPFisheyeR/chessboard (11).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (12).jpg b/Resources/ELPFisheyeR/chessboard (12).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (13).jpg b/Resources/ELPFisheyeR/chessboard (13).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (14).jpg b/Resources/ELPFisheyeR/chessboard (14).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (15).jpg b/Resources/ELPFisheyeR/chessboard (15).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (16).jpg b/Resources/ELPFisheyeR/chessboard (16).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (17).jpg b/Resources/ELPFisheyeR/chessboard (17).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (2).jpg b/Resources/ELPFisheyeR/chessboard (2).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (3).jpg b/Resources/ELPFisheyeR/chessboard (3).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (4).jpg b/Resources/ELPFisheyeR/chessboard (4).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (5).jpg b/Resources/ELPFisheyeR/chessboard (5).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (6).jpg b/Resources/ELPFisheyeR/chessboard (6).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (7).jpg b/Resources/ELPFisheyeR/chessboard (7).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (8).jpg b/Resources/ELPFisheyeR/chessboard (8).jpg
diff --git a/Resources/ELPFisheyeR/chessboard (9).jpg b/Resources/ELPFisheyeR/chessboard (9).jpg
diff --git a/Stitching.py b/Stitching.py
@@ -23,7 +23,7 @@ def rotate(image, angle, scale = 1.0):
 class ThreadableStitcher(object):
     def __init__(
         self, cameraL, cameraR, destination_queue,
-        LR_PinchAmount = 600//4, Ly_Offset = 40//4, Ry_Offset = 0,
+        LR_PinchAmount = 600//4, Ly_Offset = 48//4, Ry_Offset = 0//4,
         Ltheta = -60, Rtheta = 56):
         #{defining other constants}
         self.LR_PinchAmount = LR_PinchAmount

diff --git a/Transform2D.py b/Transform2D.py
@@ -85,7 +85,7 @@ def compute_max_angle(self):
         return min(CameraProperties.functional_limit - self.cameraTilt + self.fov_vert/2.0, self.fov_vert)
 
 
-ELPFisheyeL = CameraProperties(38.5, 85.0, 140.0, 11.0)
-ELPFisheyeR = CameraProperties(38.5, 85.0, 140.0, 11.0)
+ELPFisheyeL = CameraProperties(39.0, 85.0, 140.0, 11.0)
+ELPFisheyeR = CameraProperties(39.0, 85.0, 140.0, 11.0)
 
 ZED = CameraProperties(22.4, 54.0, 96.0, 90.0)#TODO get accurate first parameter, which is height