[libcamera-devel] [PATCH 17/24] utils: raspberrypi: ctt: Fix pycodestyle E116 and E117

[Kieran Bingham]

Hi Laurent,

On 12/05/2020 01:03, Laurent Pinchart wrote:
> E116 unexpected indentation (comment)
> E117 over-indented (comment)
> 

Oh wow, this one is good (very helpful).

Otherwise it's hard to realise the scope of those indented commented out
code lines.

> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
>  utils/raspberrypi/ctt/ctt_macbeth_locator.py | 26 ++++++++++----------
>  utils/raspberrypi/ctt/ctt_tools.py           |  8 +++---
>  2 files changed, 17 insertions(+), 17 deletions(-)
> 
> diff --git a/utils/raspberrypi/ctt/ctt_macbeth_locator.py b/utils/raspberrypi/ctt/ctt_macbeth_locator.py
> index 05d1bd437001..4e666b0f1089 100644
> --- a/utils/raspberrypi/ctt/ctt_macbeth_locator.py
> +++ b/utils/raspberrypi/ctt/ctt_macbeth_locator.py
> @@ -450,14 +450,14 @@ def get_macbeth_chart(img, ref_data):
>                  """
>                  in_border = True
>                  # for p in mac_guess[0]:
> -                    # pptest = cv2.pointPolygonTest(
> -                        # img_con,
> -                        # tuple(p),
> -                        # False
> -                    # )
> -                    # if pptest == -1:
> -                        # in_border = False
> -                        # break
> +                #     pptest = cv2.pointPolygonTest(
> +                #         img_con,
> +                #         tuple(p),
> +                #         False
> +                #     )
> +                #     if pptest == -1:
> +                #         in_border = False
> +                #         break
>  
>                  if in_border:
>                      mac_mid = np.mean(mac_guess,
> @@ -499,9 +499,9 @@ def get_macbeth_chart(img, ref_data):
>          else:
>              clustering.fit(mac_mids_list)
>              # try:
> -                # clustering.fit(mac_mids_list)
> +            #     clustering.fit(mac_mids_list)
>              # except RuntimeWarning as error:
> -                # return(0, None, None, error)
> +            #     return(0, None, None, error)
>  
>              """
>              create list of all clusters
> @@ -549,9 +549,9 @@ def get_macbeth_chart(img, ref_data):
>          # copy = cv2.cvtColor(copy, cv2.COLOR_GRAY2RGB)
>          # copy = cv2.resize(copy, None, fx=2, fy=2)
>          # for clus in clus_list:
> -            # centroid = tuple(2*np.round(clus[2]).astype(np.int32))
> -            # cv2.circle(copy, centroid, 7, (255, 0, 0), -1)
> -            # cv2.circle(copy, centroid, 2, (0, 0, 255), -1)
> +        #     centroid = tuple(2*np.round(clus[2]).astype(np.int32))
> +        #     cv2.circle(copy, centroid, 7, (255, 0, 0), -1)
> +        #     cv2.circle(copy, centroid, 2, (0, 0, 255), -1)
>          # represent(copy)
>  
>          """
> diff --git a/utils/raspberrypi/ctt/ctt_tools.py b/utils/raspberrypi/ctt/ctt_tools.py
> index 27080de08cec..f4b9baac5521 100644
> --- a/utils/raspberrypi/ctt/ctt_tools.py
> +++ b/utils/raspberrypi/ctt/ctt_tools.py
> @@ -99,11 +99,11 @@ display image for debugging... read at your own risk...
>  """
>  def represent(img, name='image'):
>      # if type(img) == tuple or type(img) == list:
> -        # for i in range(len(img)):
> -            # name = 'image {}'.format(i)
> -            # cv2.imshow(name, img[i])
> +    #     for i in range(len(img)):
> +    #         name = 'image {}'.format(i)
> +    #         cv2.imshow(name, img[i])
>      # else:
> -        # cv2.imshow(name, img)
> +    #     cv2.imshow(name, img)
>      # cv2.waitKey(0)
>      # cv2.destroyAllWindows()
>      # return 0
> 

-- 
Regards
--
Kieran