strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aw051 (1.15.30); FILE MERGED

Browse source 
2007/06/12 16:31:10 aw 1.15.30.5: #i77162# Continued adaptions to bezier handling
2007/06/11 14:41:47 aw 1.15.30.4: #i77162# 2nd adaptions to new bezier handling
2007/06/06 15:49:41 aw 1.15.30.3: #i77162# B2DPolygin control point interface changes
2007/05/10 13:21:19 aw 1.15.30.2: #i76891#
2007/05/10 09:48:51 aw 1.15.30.1: #i76891#
This commit is contained in:
Oliver Bolte 2007-07-18 10:07:10 +00:00
parent 608b61708f
commit ed0fda93cf
1 changed files with 71 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
basegfx/source/polygon/b2dpolypolygontools.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: b2dpolypolygontools.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: obo $ $Date: 2006-09-17 08:03:08 $
* last change: $Author: obo $ $Date: 2007-07-18 11:07:10 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -72,7 +72,6 @@ namespace basegfx
{
namespace tools
{
// B2DPolyPolygon tools
B2DPolyPolygon correctOrientations(const B2DPolyPolygon& rCandidate)
{
B2DPolyPolygon aRetval(rCandidate);
@ -133,72 +132,89 @@ namespace basegfx
B2DPolyPolygon adaptiveSubdivideByDistance(const B2DPolyPolygon& rCandidate, double fDistanceBound)
{
B2DPolyPolygon aRetval(rCandidate);
if(aRetval.areControlPointsUsed())
if(rCandidate.areControlPointsUsed())
{
const sal_uInt32 nPolygonCount(aRetval.count());
const sal_uInt32 nPolygonCount(rCandidate.count());
B2DPolyPolygon aRetval;
for(sal_uInt32 a(0L); aRetval.areControlPointsUsed() && a < nPolygonCount; a++)
for(sal_uInt32 a(0L); a < nPolygonCount; a++)
{
B2DPolygon aCandidate = aRetval.getB2DPolygon(a);
const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
if(aCandidate.areControlPointsUsed())
{
aCandidate = tools::adaptiveSubdivideByDistance(aCandidate, fDistanceBound);
aRetval.setB2DPolygon(a, aCandidate);
aRetval.append(tools::adaptiveSubdivideByDistance(aCandidate, fDistanceBound));
}
else
{
aRetval.append(aCandidate);
}
}
}
return aRetval;
return aRetval;
}
else
{
return rCandidate;
}
}
B2DPolyPolygon adaptiveSubdivideByAngle(const B2DPolyPolygon& rCandidate, double fAngleBound)
{
B2DPolyPolygon aRetval(rCandidate);
if(aRetval.areControlPointsUsed())
if(rCandidate.areControlPointsUsed())
{
const sal_uInt32 nPolygonCount(aRetval.count());
const sal_uInt32 nPolygonCount(rCandidate.count());
B2DPolyPolygon aRetval;
for(sal_uInt32 a(0L); aRetval.areControlPointsUsed() && a < nPolygonCount; a++)
for(sal_uInt32 a(0L); a < nPolygonCount; a++)
{
B2DPolygon aCandidate = aRetval.getB2DPolygon(a);
const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
if(aCandidate.areControlPointsUsed())
{
aCandidate = tools::adaptiveSubdivideByAngle(aCandidate, fAngleBound);
aRetval.setB2DPolygon(a, aCandidate);
aRetval.append(tools::adaptiveSubdivideByAngle(aCandidate, fAngleBound));
}
else
{
aRetval.append(aCandidate);
}
}
}
return aRetval;
return aRetval;
}
else
{
return rCandidate;
}
}
// #i37443#
B2DPolyPolygon adaptiveSubdivideByCount(const B2DPolyPolygon& rCandidate, sal_uInt32 nCount)
{
B2DPolyPolygon aRetval(rCandidate);
if(aRetval.areControlPointsUsed())
if(rCandidate.areControlPointsUsed())
{
const sal_uInt32 nPolygonCount(aRetval.count());
const sal_uInt32 nPolygonCount(rCandidate.count());
B2DPolyPolygon aRetval;
for(sal_uInt32 a(0L); aRetval.areControlPointsUsed() && a < nPolygonCount; a++)
for(sal_uInt32 a(0L); a < nPolygonCount; a++)
{
B2DPolygon aCandidate = aRetval.getB2DPolygon(a);
const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
if(aCandidate.areControlPointsUsed())
{
aCandidate = tools::adaptiveSubdivideByCount(aCandidate, nCount);
aRetval.setB2DPolygon(a, aCandidate);
aRetval.append(tools::adaptiveSubdivideByCount(aCandidate, nCount));
}
else
{
aRetval.append(aCandidate);
}
}
}
return aRetval;
return aRetval;
}
else
{
return rCandidate;
}
}
bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder)
@ -474,7 +490,7 @@ namespace basegfx
B2DPolyPolygon setContinuity(const B2DPolyPolygon& rCandidate, B2VectorContinuity eContinuity)
{
if(rCandidate.areControlVectorsUsed())
if(rCandidate.areControlPointsUsed())
{
const sal_uInt32 nPolygonCount(rCandidate.count());
B2DPolyPolygon aRetval;
@ -503,9 +519,28 @@ namespace basegfx
return isRectangle( rPoly.getB2DPolygon(0) );
}
// #i76891#
B2DPolyPolygon simplifyCurveSegments(const B2DPolyPolygon& rCandidate)
{
if(rCandidate.areControlPointsUsed())
{
B2DPolyPolygon aRetval;
for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
{
aRetval.append(simplifyCurveSegments(rCandidate.getB2DPolygon(a)));
}
return aRetval;
}
else
{
return rCandidate;
}
}
} // end of namespace tools
} // end of namespace basegfx
//////////////////////////////////////////////////////////////////////////////
// eof