include/svx/framelinkarray.hxx | 3
svx/source/dialog/framelinkarray.cxx | 290 ++++++++++++++++++++++++++++-------
2 files changed, 235 insertions(+), 58 deletions(-)
New commits:
commit 11dd4c918749839867568651f0c62db30fdda297
Author: Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
AuthorDate: Wed Dec 29 18:01:05 2021 +0100
Commit: Armin Le Grand <armin.le.gr...@me.com>
CommitDate: Thu Dec 30 16:00:43 2021 +0100
tdf#126269 Add clipping to diagonal border lines
See task for in-deep discussion. Needed to do some
re-arrangements to add clipping to diagonal border
lines. It is necessary to only clip visible geometry
but not touch vectors that get added to be able to
solve all that dynamic border line style start/end
overlapping.
Change-Id: I656a5cd63a011140ee1281873e44ab5e60606b67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127713
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <armin.le.gr...@me.com>
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index 46b17c025641..d46b3762a331 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -293,6 +293,9 @@ public:
Returns total output range of merged ranges, if bExpandMerged is true.
*/
basegfx::B2DRange GetCellRange( sal_Int32 nCol, sal_Int32 nRow, bool
bExpandMerged ) const;
+ // return output range of given row/col range in logical coordinates
+ basegfx::B2DRange GetB2DRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow,
sal_Int32 nLastCol, sal_Int32 nLastRow ) const;
+
// mirroring
/** Mirrors the entire array horizontally. */
diff --git a/svx/source/dialog/framelinkarray.cxx
b/svx/source/dialog/framelinkarray.cxx
index 46d9629bf233..568043c7a8f8 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -28,6 +28,13 @@
#include <vcl/canvastools.hxx>
#include <svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/polygon/b2dpolygonclipper.hxx>
+
+//#define OPTICAL_CHECK_CLIPRANGE_FOR_MERGED_CELL
+#ifdef OPTICAL_CHECK_CLIPRANGE_FOR_MERGED_CELL
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx>
+#endif
namespace svx::frame {
@@ -43,6 +50,9 @@ private:
Style maTLBR;
Style maBLTR;
+ basegfx::B2DHomMatrix HelperCreateB2DHomMatrixFromB2DRange(
+ const basegfx::B2DRange& rRange ) const;
+
public:
sal_Int32 mnAddLeft;
sal_Int32 mnAddRight;
@@ -78,55 +88,90 @@ public:
void MirrorSelfX();
- basegfx::B2DHomMatrix CreateCoordinateSystem(const Array& rArray,
sal_Int32 nCol, sal_Int32 nRow, bool bExpandMerged) const;
+ basegfx::B2DHomMatrix CreateCoordinateSystemSingleCell(
+ const Array& rArray, sal_Int32 nCol, sal_Int32 nRow ) const;
+ basegfx::B2DHomMatrix CreateCoordinateSystemMergedCell(
+ const Array& rArray, sal_Int32 nColLeft, sal_Int32 nRowTop, sal_Int32
nColRight, sal_Int32 nRowBottom ) const;
};
}
typedef std::vector< Cell > CellVec;
-basegfx::B2DHomMatrix Cell::CreateCoordinateSystem(const Array& rArray,
sal_Int32 nCol, sal_Int32 nRow, bool bExpandMerged) const
+basegfx::B2DHomMatrix Cell::HelperCreateB2DHomMatrixFromB2DRange(
+ const basegfx::B2DRange& rRange ) const
{
- basegfx::B2DHomMatrix aRetval;
- const basegfx::B2DRange aRange(rArray.GetCellRange(nCol, nRow,
bExpandMerged));
+ if( rRange.isEmpty() )
+ return basegfx::B2DHomMatrix();
+
+ basegfx::B2DPoint aOrigin(rRange.getMinimum());
+ basegfx::B2DVector aX(rRange.getWidth(), 0.0);
+ basegfx::B2DVector aY(0.0, rRange.getHeight());
- if(!aRange.isEmpty())
+ if (IsRotated() && SvxRotateMode::SVX_ROTATE_MODE_STANDARD != meRotMode )
{
- basegfx::B2DPoint aOrigin(aRange.getMinimum());
- basegfx::B2DVector aX(aRange.getWidth(), 0.0);
- basegfx::B2DVector aY(0.0, aRange.getHeight());
+ // when rotated, adapt values. Get Skew (cos/sin == 1/tan)
+ const double fSkew(aY.getY() * (cos(mfOrientation) /
sin(mfOrientation)));
- if (IsRotated() && SvxRotateMode::SVX_ROTATE_MODE_STANDARD !=
meRotMode)
+ switch (meRotMode)
{
- // when rotated, adapt values. Get Skew (cos/sin == 1/tan)
- const double fSkew(aY.getY() * (cos(mfOrientation) /
sin(mfOrientation)));
-
- switch (meRotMode)
- {
- case SvxRotateMode::SVX_ROTATE_MODE_TOP:
- // shear Y-Axis
- aY.setX(-fSkew);
- break;
- case SvxRotateMode::SVX_ROTATE_MODE_CENTER:
- // shear origin half, Y full
- aOrigin.setX(aOrigin.getX() + (fSkew * 0.5));
- aY.setX(-fSkew);
- break;
- case SvxRotateMode::SVX_ROTATE_MODE_BOTTOM:
- // shear origin full, Y full
- aOrigin.setX(aOrigin.getX() + fSkew);
- aY.setX(-fSkew);
- break;
- default: // SvxRotateMode::SVX_ROTATE_MODE_STANDARD, already
excluded above
- break;
- }
+ case SvxRotateMode::SVX_ROTATE_MODE_TOP:
+ // shear Y-Axis
+ aY.setX(-fSkew);
+ break;
+ case SvxRotateMode::SVX_ROTATE_MODE_CENTER:
+ // shear origin half, Y full
+ aOrigin.setX(aOrigin.getX() + (fSkew * 0.5));
+ aY.setX(-fSkew);
+ break;
+ case SvxRotateMode::SVX_ROTATE_MODE_BOTTOM:
+ // shear origin full, Y full
+ aOrigin.setX(aOrigin.getX() + fSkew);
+ aY.setX(-fSkew);
+ break;
+ default: // SvxRotateMode::SVX_ROTATE_MODE_STANDARD, already excluded
above
+ break;
}
+ }
+
+ // use column vectors as coordinate axes, homogen column for translation
+ return basegfx::utils::createCoordinateSystemTransform( aOrigin, aX, aY );
+}
+
+basegfx::B2DHomMatrix Cell::CreateCoordinateSystemSingleCell(
+ const Array& rArray, sal_Int32 nCol, sal_Int32 nRow) const
+{
+ const Point aPoint( rArray.GetColPosition( nCol ), rArray.GetRowPosition(
nRow ) );
+ const Size aSize( rArray.GetColWidth( nCol, nCol ) + 1,
rArray.GetRowHeight( nRow, nRow ) + 1 );
+ const basegfx::B2DRange aRange( vcl::unotools::b2DRectangleFromRectangle(
tools::Rectangle( aPoint, aSize ) ) );
+
+ return HelperCreateB2DHomMatrixFromB2DRange( aRange );
+}
+
+basegfx::B2DHomMatrix Cell::CreateCoordinateSystemMergedCell(
+ const Array& rArray, sal_Int32 nColLeft, sal_Int32 nRowTop, sal_Int32
nColRight, sal_Int32 nRowBottom) const
+{
+ basegfx::B2DRange aRange( rArray.GetB2DRange(
+ nColLeft, nRowTop, nColRight, nRowBottom ) );
- // use column vectors as coordinate axes, homogen column for
translation
- aRetval = basegfx::utils::createCoordinateSystemTransform(aOrigin, aX,
aY);
+ // adjust rectangle for partly visible merged cells
+ if( IsMerged() )
+ {
+ // not *sure* what exactly this is good for,
+ // it is just a hard set extension at merged cells,
+ // probably *should* be included in the above extended
+ // GetColPosition/GetColWidth already. This might be
+ // added due to GetColPosition/GetColWidth not working
+ // correctly over PageChanges (if used), but not sure.
+ aRange.expand(
+ basegfx::B2DRange(
+ aRange.getMinX() - mnAddLeft,
+ aRange.getMinY() - mnAddTop,
+ aRange.getMaxX() + mnAddRight,
+ aRange.getMaxY() + mnAddBottom ) );
}
- return aRetval;
+ return HelperCreateB2DHomMatrixFromB2DRange( aRange );
}
Cell::Cell() :
@@ -225,7 +270,7 @@ struct ArrayImpl
bool IsColInClipRange( sal_Int32 nCol ) const;
bool IsRowInClipRange( sal_Int32 nRow ) const;
- bool OverlapsClipRange(sal_Int32 nFirstCol, sal_Int32
nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow) const;
+ bool OverlapsClipRange( sal_Int32 nFirstCol, sal_Int32
nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ) const;
sal_Int32 GetMirrorCol( sal_Int32 nCol ) const { return mnWidth
- nCol - 1; }
@@ -330,7 +375,7 @@ bool ArrayImpl::IsRowInClipRange( sal_Int32 nRow ) const
return (mnFirstClipRow <= nRow) && (nRow <= mnLastClipRow);
}
-bool ArrayImpl::OverlapsClipRange(sal_Int32 nFirstCol, sal_Int32 nFirstRow,
sal_Int32 nLastCol, sal_Int32 nLastRow) const
+bool ArrayImpl::OverlapsClipRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow,
sal_Int32 nLastCol, sal_Int32 nLastRow ) const
{
if(nLastCol < mnFirstClipCol)
return false;
@@ -909,6 +954,15 @@ basegfx::B2DRange Array::GetCellRange( sal_Int32 nCol,
sal_Int32 nRow, bool bExp
}
}
+// return output range of given row/col range in logical coordinates
+basegfx::B2DRange Array::GetB2DRange(sal_Int32 nFirstCol, sal_Int32 nFirstRow,
sal_Int32 nLastCol, sal_Int32 nLastRow) const
+{
+ const Point aPoint( GetColPosition( nFirstCol ), GetRowPosition( nFirstRow
) );
+ const Size aSize( GetColWidth( nFirstCol, nLastCol ) + 1, GetRowHeight(
nFirstRow, nLastRow ) + 1 );
+
+ return vcl::unotools::b2DRectangleFromRectangle(tools::Rectangle(aPoint,
aSize));
+}
+
// mirroring
void Array::MirrorSelfX()
{
@@ -1039,6 +1093,37 @@ static void HelperCreateVerticalEntry(
rInstance.addSdrConnectStyleData(false, rEndFromTL, -rY - rX, true);
}
+static void HelperClipLine(
+ basegfx::B2DPoint& rStart,
+ basegfx::B2DVector& rDirection,
+ const basegfx::B2DRange& rClipRange)
+{
+ basegfx::B2DPolygon aLine({rStart, rStart + rDirection});
+ const basegfx::B2DPolyPolygon aResultPP(
+ basegfx::utils::clipPolygonOnRange(
+ aLine,
+ rClipRange,
+ true, // bInside
+ true)); // bStroke
+
+ if(aResultPP.count() > 0)
+ {
+ const basegfx::B2DPolygon aResultP(aResultPP.getB2DPolygon(0));
+
+ if(aResultP.count() > 0)
+ {
+ const basegfx::B2DPoint aResultStart(aResultP.getB2DPoint(0));
+ const basegfx::B2DPoint
aResultEnd(aResultP.getB2DPoint(aResultP.count() - 1));
+
+ if(aResultStart != aResultEnd)
+ {
+ rStart = aResultStart;
+ rDirection = aResultEnd - aResultStart;
+ }
+ }
+ }
+}
+
static void HelperCreateTLBREntry(
const Array& rArray,
const Style& rStyle,
@@ -1050,14 +1135,25 @@ static void HelperCreateTLBREntry(
sal_Int32 nColRight,
sal_Int32 nRowTop,
sal_Int32 nRowBottom,
- const Color* pForceColor)
+ const Color* pForceColor,
+ const basegfx::B2DRange* pClipRange)
{
if(rStyle.IsUsed())
{
+ /// prepare geometry line data
+ basegfx::B2DPoint aStart(rOrigin);
+ basegfx::B2DVector aDirection(rX + rY);
+
+ /// check if we need to clip geometry line data and do it
+ if(nullptr != pClipRange)
+ {
+ HelperClipLine(aStart, aDirection, *pClipRange);
+ }
+
/// top-left and bottom-right Style Tables
rData.emplace_back(
- rOrigin,
- rX + rY,
+ aStart,
+ aDirection,
rStyle,
pForceColor);
drawinglayer::primitive2d::SdrFrameBorderData& rInstance(rData.back());
@@ -1089,14 +1185,25 @@ static void HelperCreateBLTREntry(
sal_Int32 nColRight,
sal_Int32 nRowTop,
sal_Int32 nRowBottom,
- const Color* pForceColor)
+ const Color* pForceColor,
+ const basegfx::B2DRange* pClipRange)
{
if(rStyle.IsUsed())
{
+ /// prepare geometry line data
+ basegfx::B2DPoint aStart(rOrigin + rY);
+ basegfx::B2DVector aDirection(rX - rY);
+
+ /// check if we need to clip geometry line data and do it
+ if(nullptr != pClipRange)
+ {
+ HelperClipLine(aStart, aDirection, *pClipRange);
+ }
+
/// bottom-left and top-right Style Tables
rData.emplace_back(
- rOrigin + rY,
- rX - rY,
+ aStart,
+ aDirection,
rStyle,
pForceColor);
drawinglayer::primitive2d::SdrFrameBorderData& rInstance(rData.back());
@@ -1124,6 +1231,10 @@ drawinglayer::primitive2d::Primitive2DContainer
Array::CreateB2DPrimitiveRange(
DBG_FRAME_CHECK_COLROW( nFirstCol, nFirstRow, "CreateB2DPrimitiveRange" );
DBG_FRAME_CHECK_COLROW( nLastCol, nLastRow, "CreateB2DPrimitiveRange" );
+#ifdef OPTICAL_CHECK_CLIPRANGE_FOR_MERGED_CELL
+ std::vector<basegfx::B2DRange> aClipRanges;
+#endif
+
// It may be necessary to extend the loop ranges by one cell to the
outside,
// when possible. This is needed e.g. when there is in Calc a Cell with an
// upper CellBorder using DoubleLine and that is right/left connected
upwards
@@ -1160,7 +1271,7 @@ drawinglayer::primitive2d::Primitive2DContainer
Array::CreateB2DPrimitiveRange(
// get Cell and CoordinateSystem (*only* for this Cell, do *not*
expand for
// merged cells (!)), check if used (non-empty vectors)
const Cell& rCell(CELL(nCol, nRow));
- basegfx::B2DHomMatrix
aCoordinateSystem(rCell.CreateCoordinateSystem(*this, nCol, nRow, false));
+ basegfx::B2DHomMatrix
aCoordinateSystem(rCell.CreateCoordinateSystemSingleCell(*this, nCol, nRow));
basegfx::B2DVector aX(basegfx::utils::getColumn(aCoordinateSystem,
0));
basegfx::B2DVector aY(basegfx::utils::getColumn(aCoordinateSystem,
1));
@@ -1247,10 +1358,7 @@ drawinglayer::primitive2d::Primitive2DContainer
Array::CreateB2DPrimitiveRange(
{
// first check if this merged cell was already handled. To
do so,
// calculate and use the index of the TopLeft cell
- sal_Int32 nColLeft(nCol);
- sal_Int32 nRowTop(nRow);
- sal_Int32 nColRight(nCol);
- sal_Int32 nRowBottom(nRow);
+ sal_Int32 nColLeft(nCol), nRowTop(nRow), nColRight(nCol),
nRowBottom(nRow);
GetMergedRange(nColLeft, nRowTop, nColRight, nRowBottom,
nCol, nRow);
const sal_Int32
nIndexOfMergedCell(mxImpl->GetIndex(nColLeft, nRowTop));
@@ -1259,31 +1367,78 @@ drawinglayer::primitive2d::Primitive2DContainer
Array::CreateB2DPrimitiveRange(
// not found, so not yet handled. Add now to mark as
handled
aMergedCells.insert(nIndexOfMergedCell);
- // get and check if diagonal styles are used
+ // Get and check if diagonal styles are used
+ // Note: For GetCellStyleBLTR below I tried to use
nRowBottom
+ // as Y-value what seemed more logical, but that
+ // is wrong. Despite defining a line starting at
+ // bottom-left, the Style is defined in the cell
at top-left
const Style& rTLBR(GetCellStyleTLBR(nColLeft,
nRowTop));
const Style& rBLTR(GetCellStyleBLTR(nColLeft,
nRowTop));
if(rTLBR.IsUsed() || rBLTR.IsUsed())
{
- // test for in ClipRange for BottomRight corner of
merged cell
+ // test if merged cell overlaps ClipRange at all
(needs visualization)
if(mxImpl->OverlapsClipRange(nColLeft, nRowTop,
nColRight, nRowBottom))
{
// when merged, get extended coordinate system
and derived values
- // for the full range of this merged cell
- aCoordinateSystem =
rCell.CreateCoordinateSystem(*this, nCol, nRow, true);
+ // for the full range of this merged cell.
Only work with rMergedCell
+ // (which is the top-left single cell of the
merged cell) from here on
+ const Cell& rMergedCell(CELL(nColLeft,
nRowTop));
+ aCoordinateSystem =
rMergedCell.CreateCoordinateSystemMergedCell(
+ *this, nColLeft, nRowTop, nColRight,
nRowBottom);
aX =
basegfx::utils::getColumn(aCoordinateSystem, 0);
aY =
basegfx::utils::getColumn(aCoordinateSystem, 1);
aOrigin =
basegfx::utils::getColumn(aCoordinateSystem, 2);
- HelperCreateTLBREntry(*this, rTLBR, *aData,
aOrigin, aX, aY, nColLeft, nRowTop, nColRight, nRowBottom, pForceColor);
- HelperCreateBLTREntry(*this, rBLTR, *aData,
aOrigin, aX, aY, nColLeft, nRowTop, nColRight, nRowBottom, pForceColor);
+ // check if clip is needed
+ basegfx::B2DRange aClipRange;
+
+ // first use row/col ClipTest for raw check
+ bool bNeedToClip(
+ !mxImpl->IsColInClipRange(nColLeft) ||
+ !mxImpl->IsRowInClipRange(nRowTop) ||
+ !mxImpl->IsColInClipRange(nColRight) ||
+ !mxImpl->IsRowInClipRange(nRowBottom));
+
+ if(bNeedToClip)
+ {
+ // now get ClipRange and CellRange in
logical coordinates
+ aClipRange = GetB2DRange(
+ mxImpl->mnFirstClipCol,
mxImpl->mnFirstClipRow,
+ mxImpl->mnLastClipCol,
mxImpl->mnLastClipRow);
+
+ basegfx::B2DRange aCellRange(
+ GetB2DRange(
+ nColLeft, nRowTop,
+ nColRight, nRowBottom));
+
+ // intersect these to get the target
ClipRange, ensure
+ // that clip is needed
+ aClipRange.intersect(aCellRange);
+ bNeedToClip = !aClipRange.isEmpty();
+
+#ifdef OPTICAL_CHECK_CLIPRANGE_FOR_MERGED_CELL
+ aClipRanges.push_back(aClipRange);
+#endif
+ }
+
+ // create top-left to bottom-right geometry
+ HelperCreateTLBREntry(*this, rTLBR, *aData,
aOrigin, aX, aY,
+ nColLeft, nRowTop, nColRight, nRowBottom,
pForceColor,
+ bNeedToClip ? &aClipRange : nullptr);
+
+ // create bottom-left to top-right geometry
+ HelperCreateBLTREntry(*this, rBLTR, *aData,
aOrigin, aX, aY,
+ nColLeft, nRowTop, nColRight, nRowBottom,
pForceColor,
+ bNeedToClip ? &aClipRange : nullptr);
}
}
}
}
else
{
- // must be in clipping range: else not visible
+ // must be in clipping range: else not visible. This
+ // already clips completely for non-merged cells
if( mxImpl->IsInClipRange( nCol, nRow ) )
{
// get and check if diagonal styles are used
@@ -1292,15 +1447,18 @@ drawinglayer::primitive2d::Primitive2DContainer
Array::CreateB2DPrimitiveRange(
if(rTLBR.IsUsed() || rBLTR.IsUsed())
{
- HelperCreateTLBREntry(*this, rTLBR, *aData,
aOrigin, aX, aY, nCol, nRow, nCol, nRow, pForceColor);
- HelperCreateBLTREntry(*this, rBLTR, *aData,
aOrigin, aX, aY, nCol, nRow, nCol, nRow, pForceColor);
+ HelperCreateTLBREntry(*this, rTLBR, *aData,
aOrigin, aX, aY,
+ nCol, nRow, nCol, nRow, pForceColor, nullptr);
+
+ HelperCreateBLTREntry(*this, rBLTR, *aData,
aOrigin, aX, aY,
+ nCol, nRow, nCol, nRow, pForceColor, nullptr);
}
}
}
}
- else
+ else if(!aY.equalZero())
{
- // create left line for this Cell
+ // cell has height, but no width. Create left vertical line
for this Cell
if ((!bOverlapX // true for first column in merged
cells or cells
|| bFirstCol) // true for non_Calc usages of this
tooling
&& !bSuppressLeft) // true when left is not rotated, so
edge is already handled (see bRotated)
@@ -1313,6 +1471,10 @@ drawinglayer::primitive2d::Primitive2DContainer
Array::CreateB2DPrimitiveRange(
}
}
}
+ else
+ {
+ // Cell has *no* size, thus no visualization
+ }
}
}
@@ -1329,6 +1491,18 @@ drawinglayer::primitive2d::Primitive2DContainer
Array::CreateB2DPrimitiveRange(
true))); // force visualization to minimal one discrete
unit (pixel)
}
+#ifdef OPTICAL_CHECK_CLIPRANGE_FOR_MERGED_CELL
+ for(auto const& rClipRange : aClipRanges)
+ {
+ // draw ClipRange in yellow to allow simple interactive optical
control in office
+ aSequence.append(
+ drawinglayer::primitive2d::Primitive2DReference(
+ new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(
+ basegfx::utils::createPolygonFromRect(rClipRange),
+ basegfx::BColor(1.0, 1.0, 0.0))));
+ }
+#endif
+
return aSequence;
}
