[PATCH v9 2/5] libcamera: geometry: Add two-point Rectangle constructor

[Cheng-Hao Yang]

On Tue, Oct 1, 2024 at 3:55 PM Jacopo Mondi
<jacopo.mondi at ideasonboard.com> wrote:
>
> Hi Harvey
>
> On Tue, Oct 01, 2024 at 02:43:20PM GMT, Cheng-Hao Yang wrote:
> > Thank you Jacopo for the rebase and fix.
> >
> > On Tue, Oct 1, 2024 at 3:59 AM Jacopo Mondi
> > <jacopo.mondi at ideasonboard.com> wrote:
> > >
> > > From: Yudhistira Erlandinata <yerlandinata at chromium.org>
> > >
> > > Add a constructor to the Rectangle class that accepts two points.
> > >
> > > The constructed Rectangle spans all the space between the two given
> > > points.
> > >
> > > Signed-off-by: Yudhistira Erlandinata <yerlandinata at chromium.org>
> > > Co-developed-by: Harvey Yang <chenghaoyang at chromium.org>
> > > Reviewed-by: Jacopo Mondi <jacopo.mondi at ideasonboard.com>
> > > Signed-off-by: Jacopo Mondi <jacopo.mondi at ideasonboard.com>
> > > ---
> > >  include/libcamera/geometry.h |  7 +++++
> > >  src/libcamera/geometry.cpp   | 58 ++++++++++++++++++++++++++++++++++++
> > >  test/geometry.cpp            | 14 +++++++++
> > >  3 files changed, 79 insertions(+)
> > >
> > > diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h
> > > index 3e6f0f5d7fab..2cc25f1facd9 100644
> > > --- a/include/libcamera/geometry.h
> > > +++ b/include/libcamera/geometry.h
> > > @@ -262,6 +262,13 @@ public:
> > >         {
> > >         }
> > >
> > > +       constexpr Rectangle(const Point &point1, const Point &point2)
> > > +               : Rectangle(std::min(point1.x, point2.x), std::min(point1.y, point2.y),
> > > +                           std::max(point1.x, point2.x) - std::min(point1.x, point2.x),
> > > +                           std::max(point1.y, point2.y) - std::min(point1.y, point2.y))
> > > +       {
> > > +       }
> > > +
> > >         int x;
> > >         int y;
> > >         unsigned int width;
> > > diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp
> > > index 6eb432e5d803..5e5e72e15d67 100644
> > > --- a/src/libcamera/geometry.cpp
> > > +++ b/src/libcamera/geometry.cpp
> > > @@ -715,6 +715,64 @@ std::ostream &operator<<(std::ostream &out, const SizeRange &sr)
> > >   * \param[in] size The desired Rectangle size
> > >   */
> > >
> > > +/**
> > > + * \fn Rectangle::Rectangle(const Point &point1, const Point &point2)
> > > + * \brief Construct a Rectangle with the two given points
> > > + * \param[in] point1 One of corners of the rectangle
> > > + * \param[in] point2 The opposite diagonal corner point of \a point1
> > > + *
> > > + * Contruct a rectangle that spans the space between two given points. The
> > > + * position of the two given points is not relevant for the rectangle's
> > > + * contruction.
> > > + *
> > > + * \verbatim
> > > +
> > > +  p1 = point1
> > > +  p2 = point2
> > > +
> > > +          ^
> > > +          |
> > > +          |      ----------------p2
> > > +          |     |                 |
> > > +          |     |                 |
> > > +          |     p1----------------
> > > +          |
> > > +          o------------------------------->
> > > +         (0,0)
> > > +
> > > +          ^
> > > +          |
> > > +          |     p1----------------
> > > +          |     |                 |
> > > +          |     |                 |
> > > +          |      ----------------p2
> > > +          |
> > > +          o------------------------------->
> > > +         (0,0)
> > > +
> > > +          ^
> > > +          |
> > > +          |      ----------------p1
> > > +          |     |                 |
> > > +          |     |                 |
> > > +          |     p2----------------
> > > +          |
> > > +          o------------------------------->
> > > +         (0,0)
> > > +
> > > +          ^
> > > +          |
> > > +          |     p2----------------
> > > +          |     |                 |
> > > +          |     |                 |
> > > +          |      ----------------p1
> > > +          |
> > > +          o------------------------------->
> > > +         (0,0)
> > > +
> > > +   \endverbatim
> > > + */
> > > +
> > >  /**
> > >   * \var Rectangle::x
> > >   * \brief The horizontal coordinate of the rectangle's top-left corner
> > > diff --git a/test/geometry.cpp b/test/geometry.cpp
> > > index 64169206ad16..5760fa3c885a 100644
> > > --- a/test/geometry.cpp
> > > +++ b/test/geometry.cpp
> > > @@ -481,6 +481,20 @@ protected:
> > >                         return TestFail;
> > >                 }
> > >
> > > +               Point topLeft(3, 3);
> > > +               Point bottomRight(30, 30);
> > > +               Point topRight(30, 3);
> > > +               Point bottomLeft(3, 30);
> >
> > Sorry, I think I did it wrong in v8:
> > Maybe we should swap the points of topRight and bottomLeft.
>
> I don't think it's an issue, the "visual" naming again depends on the
> reference system orientation, doesn't it ?

Ah right, and the naming should fit better with the first example below.
Thanks!
Still LGTM.

BR,
Harvey

>
>
>
>  -------------------------------------->
>  |
>  |     TL                      TR
>  |
>  |
>  |
>  |
>  |
>  |
>  |     BL                       BR
>  |
>  |
>  V
>
>
>  ^
>  |
>  |     BL                      BR
>  |
>  |
>  |
>  |
>  |
>  |
>  |     TL                       TR
>  |
>  |
>  -------------------------------------->
>
> As long as they're opposite points, I think it's fine!
>
> >
> > Otherwise LGTM.
> >
> > Reviewed-by: Harvey Yang <chenghaoyang at chromium.org>
>
> Thanks
>   j
>
> >
> > BR,
> > Harvey
> >
> > > +               Rectangle rect1(topLeft, bottomRight);
> > > +               Rectangle rect2(topRight, bottomLeft);
> > > +               Rectangle rect3(bottomRight, topLeft);
> > > +               Rectangle rect4(bottomLeft, topRight);
> > > +
> > > +               if (rect1 != rect2 || rect1 != rect3 || rect1 != rect4) {
> > > +                       cout << "Point-to-point construction failed" << endl;
> > > +                       return TestFail;
> > > +               }
> > > +
> > >                 return TestPass;
> > >         }
> > >  };
> > > --
> > > 2.46.1
> > >