From patchwork Tue May 12 00:03:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3761 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4346A60E0B for ; Tue, 12 May 2020 02:03:36 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="aqQgAac1"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4F52711F3; Tue, 12 May 2020 02:03:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1589241815; bh=9kszIlv6hGVElr0z1u3vpJASMnkd+qi1tKYUZU1G+Kk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aqQgAac1mmURK4r4/k0Jr8crx+eZ/6mSCkZtMjCv3Z9DzcNHuJ2ej2XZYxUdryN+j /WmyFyOps0bF0TlmW/deDPVygPuG2/HLL45mm9PS0uo5w9PHDmy8UtHdyLFuzuw47J vvknNXSWGGhUsPEgzYQs10G3tQeI1XYSbvW/WZms= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 12 May 2020 03:03:05 +0300 Message-Id: <20200512000322.11753-8-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200512000322.11753-1-laurent.pinchart@ideasonboard.com> References: <20200512000322.11753-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 07/24] utils: raspberrypi: ctt: Fix pycodestyle E128 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: , X-List-Received-Date: Tue, 12 May 2020 00:03:39 -0000 E128 continuation line under-indented for visual indent Signed-off-by: Laurent Pinchart --- utils/raspberrypi/ctt/ctt_macbeth_locator.py | 8 +++----- utils/raspberrypi/ctt/ctt_ransac.py | 14 +++++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/utils/raspberrypi/ctt/ctt_macbeth_locator.py b/utils/raspberrypi/ctt/ctt_macbeth_locator.py index 55ab4fdbc17d..63dbc4a1f347 100644 --- a/utils/raspberrypi/ctt/ctt_macbeth_locator.py +++ b/utils/raspberrypi/ctt/ctt_macbeth_locator.py @@ -363,9 +363,8 @@ def get_macbeth_chart(img, ref_data): """ find Contours in image """ - conts, _ = cv2.findContours(edges, - cv2.RETR_TREE, - cv2.CHAIN_APPROX_NONE) + conts, _ = cv2.findContours(edges, cv2.RETR_TREE, + cv2.CHAIN_APPROX_NONE) if len(conts) == 0: raise MacbethError( '\nWARNING: No macbeth chart found!' @@ -381,8 +380,7 @@ def get_macbeth_chart(img, ref_data): conts_per = [] for i in range(len(conts)): per = cv2.arcLength(conts[i], True) - poly = cv2.approxPolyDP(conts[i], - epsilon*per, True) + poly = cv2.approxPolyDP(conts[i], epsilon*per, True) if len(poly) == 4 and cv2.isContourConvex(poly): conts_per.append((poly, per)) diff --git a/utils/raspberrypi/ctt/ctt_ransac.py b/utils/raspberrypi/ctt/ctt_ransac.py index f7a722e0f73e..a1f5e8c95ac1 100644 --- a/utils/raspberrypi/ctt/ctt_ransac.py +++ b/utils/raspberrypi/ctt/ctt_ransac.py @@ -29,11 +29,11 @@ def get_square_verts(c_err=0.05, scale=scale): square_verts = [] square_0 = np.array(((0, 0), (0, side), - (side, side), (side, 0)), np.float32) + (side, side), (side, 0)), np.float32) offset_0 = np.array((b_bord_x, b_bord_y), np.float32) c_off = side * c_err offset_cont = np.array(((c_off, c_off), (c_off, -c_off), - (-c_off, -c_off), (-c_off, c_off)), np.float32) + (-c_off, -c_off), (-c_off, c_off)), np.float32) square_0 += offset_0 square_0 += offset_cont """ @@ -41,16 +41,16 @@ def get_square_verts(c_err=0.05, scale=scale): """ for i in range(6): shift_i = np.array(((i*side, 0), (i*side, 0), - (i*side, 0), (i*side, 0)), np.float32) + (i*side, 0), (i*side, 0)), np.float32) shift_bord =np.array(((i*s_bord, 0), (i*s_bord, 0), - (i*s_bord, 0), (i*s_bord, 0)), np.float32) + (i*s_bord, 0), (i*s_bord, 0)), np.float32) square_i = square_0 + shift_i + shift_bord for j in range(4): shift_j = np.array(((0, j*side), (0, j*side), - (0, j*side), (0, j*side)), np.float32) + (0, j*side), (0, j*side)), np.float32) shift_bord = np.array(((0, j*s_bord), - (0, j*s_bord), (0, j*s_bord), - (0, j*s_bord)), np.float32) + (0, j*s_bord), (0, j*s_bord), + (0, j*s_bord)), np.float32) square_j = square_i + shift_j + shift_bord square_verts.append(square_j) # print('square_verts')