From patchwork Wed Jul 3 14:16:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 20520 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 6E2FABEFBE for ; Wed, 3 Jul 2024 14:17:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 146766333B; Wed, 3 Jul 2024 16:17:53 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="BacAVCJp"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C6AE66333B for ; Wed, 3 Jul 2024 16:17:49 +0200 (CEST) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:9263:c199:9587:576]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A88094CA; Wed, 3 Jul 2024 16:17:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1720016241; bh=7aE52oCUh9ZNIxxT8s5bnyRaWjcCtyo80eVfD4vW8jY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BacAVCJptjzS1PwzFf/bNMTJBlOp2h9JRjEz2ZWWyJcjwAbbW12/FTCF6hikm/dU3 gRP4S/KDlllQbkDxHkX2jzpiNcGsxJtVEGFFymh66D+C/iI5JNtVu1wxr3+c/cQsuo Ml/nrdYBIjiaTDXovNBhuMwrbH9Y/sA+DCTaZDjo= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug , Paul Elder , Laurent Pinchart Subject: [PATCH v3 06/23] libtuning: Fix imports Date: Wed, 3 Jul 2024 16:16:55 +0200 Message-ID: <20240703141726.252368-7-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240703141726.252368-1-stefan.klug@ideasonboard.com> References: <20240703141726.252368-1-stefan.klug@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Fix imports to match new structure in the files copied from Raspberry Pi. Add missing imports in macbeth.py. Signed-off-by: Stefan Klug Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart --- utils/tuning/libtuning/ctt_awb.py | 4 +++- utils/tuning/libtuning/ctt_ccm.py | 12 +++++++----- utils/tuning/libtuning/macbeth.py | 5 +++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/utils/tuning/libtuning/ctt_awb.py b/utils/tuning/libtuning/ctt_awb.py index 5ba6f978a228..f3a1ce779e21 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 59753e332ee9..f37adaf45538 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 81f3e87c9088..265a33d68378 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