ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

related tdf#152992: rename HitTolerance to HitTolerancePerAxis

Browse Source 
Rename ...HitTolerance instances to ...HitTolerancePerAxis as
suggested by Noel on:
https://gerrit.libreoffice.org/c/core/+/154694/2/include/drawinglayer/processor2d/hittestprocessor2d.hxx#45

Change-Id: I9c5b69218a4809f795c9a6324d76b2e2c1b12343
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154716
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir <sarper.akdemir.extern@allotropia.de>
This commit is contained in:
Sarper Akdemir
2023-07-21 18:25:59 +02:00
parent 396cbd8cd0
commit 2acfc1448f
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drawinglayer/source/processor2d/hittestprocessor2d.cxx
+18 -18
View File
@@ -41,25 +41,25 @@ namespace drawinglayer::processor2d
{
HitTestProcessor2D::HitTestProcessor2D(const geometry::ViewInformation2D& rViewInformation,
const basegfx::B2DPoint& rLogicHitPosition,
const basegfx::B2DVector& rLogicHitTolerance,
const basegfx::B2DVector& rLogicHitTolerancePerAxis,
bool bHitTextOnly)
: BaseProcessor2D(rViewInformation),
maDiscreteHitTolerance(rLogicHitTolerance),
maDiscreteHitTolerancePerAxis(rLogicHitTolerancePerAxis),
mbCollectHitStack(false),
mbHit(false),
mbHitTextOnly(bHitTextOnly)
{
// ensure input parameters for hit tolerance is >= 0.0
if (maDiscreteHitTolerance.getX() < 0.0)
maDiscreteHitTolerance.setX(0.0);
if (maDiscreteHitTolerance.getY() < 0.0)
maDiscreteHitTolerance.setY(0.0);
if (maDiscreteHitTolerancePerAxis.getX() < 0.0)
maDiscreteHitTolerancePerAxis.setX(0.0);
if (maDiscreteHitTolerancePerAxis.getY() < 0.0)
maDiscreteHitTolerancePerAxis.setY(0.0);
if (!maDiscreteHitTolerance.equalZero())
if (!maDiscreteHitTolerancePerAxis.equalZero())
{
// generate discrete hit tolerance
maDiscreteHitTolerance
= getViewInformation2D().getObjectToViewTransformation() * rLogicHitTolerance;
maDiscreteHitTolerancePerAxis
= getViewInformation2D().getObjectToViewTransformation() * rLogicHitTolerancePerAxis;
}
// generate discrete hit position
@@ -72,7 +72,7 @@ namespace drawinglayer::processor2d
bool HitTestProcessor2D::checkHairlineHitWithTolerance(
const basegfx::B2DPolygon& rPolygon,
const basegfx::B2DVector& rDiscreteHitTolerance) const
const basegfx::B2DVector& rDiscreteHitTolerancePerAxis) const
{
basegfx::B2DPolygon aLocalPolygon(rPolygon);
aLocalPolygon.transform(getViewInformation2D().getObjectToViewTransformation());
@@ -80,9 +80,9 @@ namespace drawinglayer::processor2d
// get discrete range
basegfx::B2DRange aPolygonRange(aLocalPolygon.getB2DRange());
if(rDiscreteHitTolerance.getX() > 0 || rDiscreteHitTolerance.getY() > 0)
if(rDiscreteHitTolerancePerAxis.getX() > 0 || rDiscreteHitTolerancePerAxis.getY() > 0)
{
aPolygonRange.grow(rDiscreteHitTolerance);
aPolygonRange.grow(rDiscreteHitTolerancePerAxis);
}
// do rough range test first
@@ -92,7 +92,7 @@ namespace drawinglayer::processor2d
return basegfx::utils::isInEpsilonRange(
aLocalPolygon,
getDiscreteHitPosition(),
std::max(rDiscreteHitTolerance.getX(), rDiscreteHitTolerance.getY()));
std::max(rDiscreteHitTolerancePerAxis.getX(), rDiscreteHitTolerancePerAxis.getY()));
}
return false;
@@ -100,7 +100,7 @@ namespace drawinglayer::processor2d
bool HitTestProcessor2D::checkFillHitWithTolerance(
const basegfx::B2DPolyPolygon& rPolyPolygon,
const basegfx::B2DVector& rDiscreteHitTolerance) const
const basegfx::B2DVector& rDiscreteHitTolerancePerAxis) const
{
bool bRetval(false);
basegfx::B2DPolyPolygon aLocalPolyPolygon(rPolyPolygon);
@@ -109,12 +109,12 @@ namespace drawinglayer::processor2d
// get discrete range
basegfx::B2DRange aPolygonRange(aLocalPolyPolygon.getB2DRange());
const bool bDiscreteHitToleranceUsed(rDiscreteHitTolerance.getX() > 0
|| rDiscreteHitTolerance.getY() > 0);
const bool bDiscreteHitToleranceUsed(rDiscreteHitTolerancePerAxis.getX() > 0
|| rDiscreteHitTolerancePerAxis.getY() > 0);
if (bDiscreteHitToleranceUsed)
{
aPolygonRange.grow(rDiscreteHitTolerance);
aPolygonRange.grow(rDiscreteHitTolerancePerAxis);
}
// do rough range test first
@@ -125,7 +125,7 @@ namespace drawinglayer::processor2d
basegfx::utils::isInEpsilonRange(
aLocalPolyPolygon,
getDiscreteHitPosition(),
std::max(rDiscreteHitTolerance.getX(), rDiscreteHitTolerance.getY())))
std::max(rDiscreteHitTolerancePerAxis.getX(), rDiscreteHitTolerancePerAxis.getY())))
{
bRetval = true;
}
include/drawinglayer/processor2d/hittestprocessor2d.hxx
+5 -5
View File
@@ -42,7 +42,7 @@ namespace drawinglayer::processor2d
basegfx::B2DPoint maDiscreteHitPosition;
/// discrete HitTolerance
basegfx::B2DVector maDiscreteHitTolerance;
basegfx::B2DVector maDiscreteHitTolerancePerAxis;
/// stack of HitPrimitives, taken care of during HitTest run
primitive2d::Primitive2DContainer maHitStack;
@@ -60,17 +60,17 @@ namespace drawinglayer::processor2d
void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) override;
bool checkHairlineHitWithTolerance(
const basegfx::B2DPolygon& rPolygon,
const basegfx::B2DVector& rDiscreteHitTolerance) const;
const basegfx::B2DVector& rDiscreteHitTolerancePerAxis) const;
bool checkFillHitWithTolerance(
const basegfx::B2DPolyPolygon& rPolyPolygon,
const basegfx::B2DVector& rDiscreteHitTolerance) const;
const basegfx::B2DVector& rDiscreteHitTolerancePerAxis) const;
void check3DHit(const primitive2d::ScenePrimitive2D& rCandidate);
public:
HitTestProcessor2D(
const geometry::ViewInformation2D& rViewInformation,
const basegfx::B2DPoint& rLogicHitPosition,
const basegfx::B2DVector& rLogicHitTolerance,
const basegfx::B2DVector& rLogicHitTolerancePerAxis,
bool bHitTextOnly);
virtual ~HitTestProcessor2D() override;
@@ -83,7 +83,7 @@ namespace drawinglayer::processor2d
/// data read access
const basegfx::B2DPoint& getDiscreteHitPosition() const { return maDiscreteHitPosition; }
const basegfx::B2DVector& getDiscreteHitTolerance() const { return maDiscreteHitTolerance; }
const basegfx::B2DVector& getDiscreteHitTolerance() const { return maDiscreteHitTolerancePerAxis; }
bool getCollectHitStack() const { return mbCollectHitStack; }
bool getHit() const { return mbHit; }
bool getHitTextOnly() const { return mbHitTextOnly; }