summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorStefan Klug <stefan.klug@ideasonboard.com>2024-06-11 08:36:43 +0200
committerStefan Klug <stefan.klug@ideasonboard.com>2024-07-05 17:47:42 +0200
commitb1f3b3f08d365dc087508b573dd095808267e640 (patch)
tree8bcde4490b0bfddd9f874226cde8a1c82b9fbd56 /utils
parent388fe3bcf9ab5e6a5888dd573f590a84c2ac3e93 (diff)
libtuning: Fix imports
Fix imports to match new structure in the files copied from Raspberry Pi. Add missing imports in macbeth.py. Add missing dependencies to requirements.txt. Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/tuning/libtuning/ctt_awb.py4
-rw-r--r--utils/tuning/libtuning/ctt_ccm.py12
-rw-r--r--utils/tuning/libtuning/macbeth.py5
-rw-r--r--utils/tuning/requirements.txt3
4 files changed, 18 insertions, 6 deletions
diff --git a/utils/tuning/libtuning/ctt_awb.py b/utils/tuning/libtuning/ctt_awb.py
index 5ba6f978..f3a1ce77 100644
--- a/utils/tuning/libtuning/ctt_awb.py
+++ b/utils/tuning/libtuning/ctt_awb.py
@@ -4,10 +4,12 @@
#
# camera tuning tool for AWB
-from ctt_image_load import *
import matplotlib.pyplot as plt
from bisect import bisect_left
from scipy.optimize import fmin
+import numpy as np
+
+from .image import Image
"""
diff --git a/utils/tuning/libtuning/ctt_ccm.py b/utils/tuning/libtuning/ctt_ccm.py
index 59753e33..f37adaf4 100644
--- a/utils/tuning/libtuning/ctt_ccm.py
+++ b/utils/tuning/libtuning/ctt_ccm.py
@@ -4,12 +4,14 @@
#
# camera tuning tool for CCM (colour correction matrix)
-from ctt_image_load import *
-from ctt_awb import get_alsc_patches
-import colors
-from scipy.optimize import minimize
-from ctt_visualise import visualise_macbeth_chart
import numpy as np
+from scipy.optimize import minimize
+
+from . import ctt_colors as colors
+from .image import Image
+from .ctt_awb import get_alsc_patches
+from .utils import visualise_macbeth_chart
+
"""
takes 8-bit macbeth chart values, degammas and returns 16 bit
"""
diff --git a/utils/tuning/libtuning/macbeth.py b/utils/tuning/libtuning/macbeth.py
index 81f3e87c..265a33d6 100644
--- a/utils/tuning/libtuning/macbeth.py
+++ b/utils/tuning/libtuning/macbeth.py
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (C) 2019, Raspberry Pi Ltd
+# Copyright (C) 2024, Ideas on Board Oy
#
# Locate and extract Macbeth charts from images
# (Copied from: ctt_macbeth_locator.py)
@@ -11,6 +12,10 @@ import cv2
import os
from pathlib import Path
import numpy as np
+import warnings
+from sklearn import cluster as cluster
+
+from .ctt_ransac import get_square_verts, get_square_centres
from libtuning.image import Image
diff --git a/utils/tuning/requirements.txt b/utils/tuning/requirements.txt
index d1dc589d..b2875524 100644
--- a/utils/tuning/requirements.txt
+++ b/utils/tuning/requirements.txt
@@ -1,5 +1,8 @@
+matplotlib
numpy
opencv-python
py3exiv2
pyyaml
rawpy
+scikit-learn
+scipy