commit 3929a98a42a8ae6d8f956e88eb6f3e25d502ae7c
author Clemenz Portmann <portmannc@google.com> Fri Mar 19 10:47:06 2021 -0700
committer Clemenz Portmann <portmannc@google.com> Fri Mar 19 18:15:42 2021 +0000
tree 18de6f023c3df5683ba4a397aac93b9cee17ceef
parent 11441377193cf7ce0e7cd642808576669df50fcf

ITS: Use TEST_IMG_DIR

bug: 179302527
Change-Id: Iffead2ffb0b72d373be78bc9b51cddf39853ab73

apps/CameraITS/utils/opencv_processing_utils.py

diff --git a/apps/CameraITS/utils/opencv_processing_utils.py b/apps/CameraITS/utils/opencv_processing_utils.py
index 137e0a3..d427abc 100644
--- a/apps/CameraITS/utils/opencv_processing_utils.py
+++ b/apps/CameraITS/utils/opencv_processing_utils.py
@@ -30,8 +30,8 @@
 ANGLE_NUM_MIN = 10  # Minimum number of angles for find_angle() to be valid
 
 
-CHART_FILE = os.path.join(os.environ['CAMERA_ITS_TOP'], 'test_images',
-                          'ISO12233.png')
+TEST_IMG_DIR = os.path.join(os.environ['CAMERA_ITS_TOP'], 'test_images')
+CHART_FILE = os.path.join(TEST_IMG_DIR, 'ISO12233.png')
 CHART_HEIGHT = 13.5  # cm
 CHART_DISTANCE_RFOV = 31.0  # cm
 CHART_DISTANCE_WFOV = 22.0  # cm
@@ -63,8 +63,6 @@
 SQUARE_AREA_MIN_REL = 0.05  # Minimum size for square relative to image area
 SQUARE_TOL = 0.1  # Square W vs H mismatch RTOL
 
-TEST_IMG_DIR = os.path.join(os.environ['CAMERA_ITS_TOP'], 'test_images')
-
 VGA_HEIGHT = 480
 VGA_WIDTH = 640