<Enhancement>[Rectangle]: <Make Rectangle.Inside() better>

[
* Include unit tests
* Some debug in OglInterface2
]

[#112]

src/miniogl/RectangleShape.py

@@ -154,9 +154,12 @@ def Inside(self, x, y) -> bool:
  """
  True if (x, y) is inside the rectangle.
 
- @param x
- @param y
- @return bool
+ Args:
+ x:
+ y:
+
+ Returns:
+
  """
  # this also works if width and/or height is negative.
  sx, sy = self.GetPosition()
@@ -167,10 +170,10 @@ def Inside(self, x, y) -> bool:
  topLeftX: int = sx - self._ox
  topLeftY: int = sy - self._oy
 
- topXLeftIsInside: bool = x > topLeftX
- topXRightIsInside: bool = x < topLeftX + width
- topYLeftIsInside: bool = y > topLeftY
- topYRightIsInside: bool = y < topLeftY + height
+ topXLeftIsInside: bool = x >= topLeftX
+ topXRightIsInside: bool = x <= topLeftX + width
+ topYLeftIsInside: bool = y >= topLeftY
+ topYRightIsInside: bool = y <= topLeftY + height
  if topXLeftIsInside and topXRightIsInside and topYLeftIsInside and topYRightIsInside:
  return True
  else:

src/ogl/OglInterface2.py

@@ -80,6 +80,7 @@ def Draw(self, dc: DC, withChildren: bool = True):
  dc.SetFont(self._defaultFont)
 
  xFaceName: str = self.pyutInterface.name
+ self.logger.debug(f'{xFaceName=} {self._pyutInterface.id=}')
 
  extentSize: Tuple[int, int] = dc.GetTextExtent(xFaceName) # width, height
 

src/ogl/_version.py

@@ -1 +1 @@
-__version__ = '2.1.32'
+__version__ = '2.1.33'

tests/miniogl/TestRectangleShape.py

@@ -46,6 +46,38 @@ def testInsideFalseViaY(self):
 
  self.assertFalse(actualAnswer, 'The x-coordinate IS NOT inside the rectangle')
 
+ def testOnLeftXBoundary(self):
+
+ rectangleShape: RectangleShape = RectangleShape(x=120, y=60, width=66, height=60)
+
+ isInside: bool = rectangleShape.Inside(x=120, y=90)
+
+ self.assertTrue(isInside, 'Left boundary point should be inside')
+
+ def testOnRightXBoundary(self):
+
+ rectangleShape: RectangleShape = RectangleShape(x=120, y=60, width=66, height=60)
+
+ isInside: bool = rectangleShape.Inside(x=120+66, y=90)
+
+ self.assertTrue(isInside, 'Right boundary point should be inside')
+
+ def testOnTopYBoundary(self):
+
+ rectangleShape: RectangleShape = RectangleShape(x=120, y=60, width=66, height=60)
+
+ isInside: bool = rectangleShape.Inside(x=120, y=60)
+
+ self.assertTrue(isInside, 'Top Y boundary point should be inside')
+
+ def testOnBottomYBoundary(self):
+
+ rectangleShape: RectangleShape = RectangleShape(x=120, y=60, width=66, height=60)
+
+ isInside: bool = rectangleShape.Inside(x=120, y=60+60)
+
+ self.assertTrue(isInside, 'Bottom Y boundary point should be inside')
+
 
 def suite() -> TestSuite:
  """You need to change the name of the test class here also."""