[{"id":30130,"web_url":"https://patchwork.libcamera.org/comment/30130/","msgid":"<20240628223702.GD30900@pendragon.ideasonboard.com>","date":"2024-06-28T22:37:02","subject":"Re: [PATCH v2 06/25] libtuning: Fix imports","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Stefan,\n\nThank you for the patch.\n\nOn Fri, Jun 28, 2024 at 12:46:59PM +0200, Stefan Klug wrote:\n> Fix imports to match new structure in the files copied from raspberry\n> pi. Added missing imports in macbeth.py\n> \n> Signed-off-by: Stefan Klug \n> Reviewed-by: Paul Elder \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> utils/tuning/libtuning/ctt_awb.py | 4 +++-\n> utils/tuning/libtuning/ctt_ccm.py | 12 +++++++-----\n> utils/tuning/libtuning/macbeth.py | 5 +++++\n> 3 files changed, 15 insertions(+), 6 deletions(-)\n> \n> diff --git a/utils/tuning/libtuning/ctt_awb.py b/utils/tuning/libtuning/ctt_awb.py\n> index 5ba6f978a228..f3a1ce779e21 100644\n> --- a/utils/tuning/libtuning/ctt_awb.py\n> +++ b/utils/tuning/libtuning/ctt_awb.py\n> @@ -4,10 +4,12 @@\n> #\n> # camera tuning tool for AWB\n> \n> -from ctt_image_load import *\n> import matplotlib.pyplot as plt\n> from bisect import bisect_left\n> from scipy.optimize import fmin\n> +import numpy as np\n> +\n> +from .image import Image\n> \n> \n> \"\"\"\n> diff --git a/utils/tuning/libtuning/ctt_ccm.py b/utils/tuning/libtuning/ctt_ccm.py\n> index 59753e332ee9..f37adaf45538 100644\n> --- a/utils/tuning/libtuning/ctt_ccm.py\n> +++ b/utils/tuning/libtuning/ctt_ccm.py\n> @@ -4,12 +4,14 @@\n> #\n> # camera tuning tool for CCM (colour correction matrix)\n> \n> -from ctt_image_load import *\n> -from ctt_awb import get_alsc_patches\n> -import colors\n> -from scipy.optimize import minimize\n> -from ctt_visualise import visualise_macbeth_chart\n> import numpy as np\n> +from scipy.optimize import minimize\n> +\n> +from . import ctt_colors as colors\n> +from .image import Image\n> +from .ctt_awb import get_alsc_patches\n> +from .utils import visualise_macbeth_chart\n> +\n> \"\"\"\n> takes 8-bit macbeth chart values, degammas and returns 16 bit\n> \"\"\"\n> diff --git a/utils/tuning/libtuning/macbeth.py b/utils/tuning/libtuning/macbeth.py\n> index 81f3e87c9088..265a33d68378 100644\n> --- a/utils/tuning/libtuning/macbeth.py\n> +++ b/utils/tuning/libtuning/macbeth.py\n> @@ -1,6 +1,7 @@\n> # SPDX-License-Identifier: BSD-2-Clause\n> #\n> # Copyright (C) 2019, Raspberry Pi Ltd\n> +# Copyright (C) 2024, Ideas on Board Oy\n> #\n> # Locate and extract Macbeth charts from images\n> # (Copied from: ctt_macbeth_locator.py)\n> @@ -11,6 +12,10 @@ import cv2\n> import os\n> from pathlib import Path\n> import numpy as np\n> +import warnings\n> +from sklearn import cluster as cluster\n> +\n> +from .ctt_ransac import get_square_verts, get_square_centres\n> \n> from libtuning.image import Image\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id CBF29BD87C\n\tfor ;\n\tFri, 28 Jun 2024 22:37:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5DB7062C9C;\n\tSat, 29 Jun 2024 00:37:25 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E3D1F62C97\n\tfor ;\n\tSat, 29 Jun 2024 00:37:23 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DE9E4471;\n\tSat, 29 Jun 2024 00:36:58 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ozTEcqf4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719614219;\n\tbh=CK5nO+3lyNGBTqpuec7PNfpMPAVSua6PE4dqxcOaZXA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=ozTEcqf4/r3Yu6F2R9lPJTZvTA+NIitB1L3hWj3t9Gvv/yw+MUzrsWYOxUYBFUGjR\n\tcYq5ArueLVZxeSL7RmSczK0IZxyH0lGXl4A0BWzTMtJzEdCSR/3GINfCu9J1o9yW4n\n\tYnWQsmY+5bt7/eqxfKmPhA0/EGJ7wGRRqKg94pwU=","Date":"Sat, 29 Jun 2024 01:37:02 +0300","From":"Laurent Pinchart ","To":"Stefan Klug ","Cc":"libcamera-devel@lists.libcamera.org,\n\tPaul Elder ","Subject":"Re: [PATCH v2 06/25] libtuning: Fix imports","Message-ID":"<20240628223702.GD30900@pendragon.ideasonboard.com>","References":"<20240628104828.2928109-1-stefan.klug@ideasonboard.com>\n\t<20240628104828.2928109-7-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20240628104828.2928109-7-stefan.klug@ideasonboard.com>","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]