[{"id":4795,"web_url":"https://patchwork.libcamera.org/comment/4795/","msgid":"<0d7a22f4-81d4-8e6e-7f1b-43b1ef649d44@ideasonboard.com>","date":"2020-05-12T08:29:37","subject":"Re: [libcamera-devel] [PATCH 17/24] utils: raspberrypi: ctt: Fix\n\tpycodestyle E116 and E117","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 12/05/2020 01:03, Laurent Pinchart wrote:\n> E116 unexpected indentation (comment)\n> E117 over-indented (comment)\n> \n\nOh wow, this one is good (very helpful).\n\nOtherwise it's hard to realise the scope of those indented commented out\ncode lines.\n\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> ---\n>  utils/raspberrypi/ctt/ctt_macbeth_locator.py | 26 ++++++++++----------\n>  utils/raspberrypi/ctt/ctt_tools.py           |  8 +++---\n>  2 files changed, 17 insertions(+), 17 deletions(-)\n> \n> diff --git a/utils/raspberrypi/ctt/ctt_macbeth_locator.py b/utils/raspberrypi/ctt/ctt_macbeth_locator.py\n> index 05d1bd437001..4e666b0f1089 100644\n> --- a/utils/raspberrypi/ctt/ctt_macbeth_locator.py\n> +++ b/utils/raspberrypi/ctt/ctt_macbeth_locator.py\n> @@ -450,14 +450,14 @@ def get_macbeth_chart(img, ref_data):\n>                  \"\"\"\n>                  in_border = True\n>                  # for p in mac_guess[0]:\n> -                    # pptest = cv2.pointPolygonTest(\n> -                        # img_con,\n> -                        # tuple(p),\n> -                        # False\n> -                    # )\n> -                    # if pptest == -1:\n> -                        # in_border = False\n> -                        # break\n> +                #     pptest = cv2.pointPolygonTest(\n> +                #         img_con,\n> +                #         tuple(p),\n> +                #         False\n> +                #     )\n> +                #     if pptest == -1:\n> +                #         in_border = False\n> +                #         break\n>  \n>                  if in_border:\n>                      mac_mid = np.mean(mac_guess,\n> @@ -499,9 +499,9 @@ def get_macbeth_chart(img, ref_data):\n>          else:\n>              clustering.fit(mac_mids_list)\n>              # try:\n> -                # clustering.fit(mac_mids_list)\n> +            #     clustering.fit(mac_mids_list)\n>              # except RuntimeWarning as error:\n> -                # return(0, None, None, error)\n> +            #     return(0, None, None, error)\n>  \n>              \"\"\"\n>              create list of all clusters\n> @@ -549,9 +549,9 @@ def get_macbeth_chart(img, ref_data):\n>          # copy = cv2.cvtColor(copy, cv2.COLOR_GRAY2RGB)\n>          # copy = cv2.resize(copy, None, fx=2, fy=2)\n>          # for clus in clus_list:\n> -            # centroid = tuple(2*np.round(clus[2]).astype(np.int32))\n> -            # cv2.circle(copy, centroid, 7, (255, 0, 0), -1)\n> -            # cv2.circle(copy, centroid, 2, (0, 0, 255), -1)\n> +        #     centroid = tuple(2*np.round(clus[2]).astype(np.int32))\n> +        #     cv2.circle(copy, centroid, 7, (255, 0, 0), -1)\n> +        #     cv2.circle(copy, centroid, 2, (0, 0, 255), -1)\n>          # represent(copy)\n>  \n>          \"\"\"\n> diff --git a/utils/raspberrypi/ctt/ctt_tools.py b/utils/raspberrypi/ctt/ctt_tools.py\n> index 27080de08cec..f4b9baac5521 100644\n> --- a/utils/raspberrypi/ctt/ctt_tools.py\n> +++ b/utils/raspberrypi/ctt/ctt_tools.py\n> @@ -99,11 +99,11 @@ display image for debugging... read at your own risk...\n>  \"\"\"\n>  def represent(img, name='image'):\n>      # if type(img) == tuple or type(img) == list:\n> -        # for i in range(len(img)):\n> -            # name = 'image {}'.format(i)\n> -            # cv2.imshow(name, img[i])\n> +    #     for i in range(len(img)):\n> +    #         name = 'image {}'.format(i)\n> +    #         cv2.imshow(name, img[i])\n>      # else:\n> -        # cv2.imshow(name, img)\n> +    #     cv2.imshow(name, img)\n>      # cv2.waitKey(0)\n>      # cv2.destroyAllWindows()\n>      # return 0\n>","headers":{"Return-Path":"<kieran.bingham@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 758FC603DF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 12 May 2020 10:29:41 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D4BFD33E;\n\tTue, 12 May 2020 10:29:40 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"V3316kgv\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589272181;\n\tbh=P74wIsxQqgfsLG3/jE/V3pIlEO7QGnc9aVAdQq4T0+Y=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=V3316kgvb0pfK8pEbLqCNowmU9HCgiq7qNnLCvmIHF8HRrKnM46N44hMlcJ6bnMD3\n\tVxizlsRbd5pLG9VonwpbRMfp48sten2KuSw0wydnbxoJRIx6mCnXqXv6AJHHlRBVNw\n\tstws0oocFxTsA1WIe1Mfb0g9G48oXPOzfQZcxdDA=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200512000322.11753-1-laurent.pinchart@ideasonboard.com>\n\t<20200512000322.11753-18-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<0d7a22f4-81d4-8e6e-7f1b-43b1ef649d44@ideasonboard.com>","Date":"Tue, 12 May 2020 09:29:37 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.7.0","MIME-Version":"1.0","In-Reply-To":"<20200512000322.11753-18-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 17/24] utils: raspberrypi: ctt: Fix\n\tpycodestyle E116 and E117","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Tue, 12 May 2020 08:29:41 -0000"}}]