yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: Add OutputTransform::map(QPointF,QPoint)

Browse source
This commit is contained in:
Vlad Zahorodnii 2023-12-20 11:49:28 +02:00
parent a9b01a68b8
commit e6853a9109
3 changed files with 128 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
autotests/output_transform_test.cpp
View file

@ -26,6 +26,10 @@ private Q_SLOTS:
void mapRectF();
void mapRect_data();
void mapRect();
void mapPointF_data();
void mapPointF();
void mapPoint_data();
void mapPoint();
void inverted_data();
void inverted();
void combine_data();
@ -138,6 +142,62 @@ void TestOutputTransform::mapRect()
QCOMPARE(OutputTransform(kind).map(source, QSize(100, 200)), target);
}
void TestOutputTransform::mapPointF_data()
{
QTest::addColumn<OutputTransform::Kind>("kind");
QTest::addColumn<QPointF>("source");
QTest::addColumn<QPointF>("target");
QTest::addRow("rotate-0") << OutputTransform::Normal << QPointF(10, 20) << QPointF(10, 20);
QTest::addRow("rotate-90") << OutputTransform::Rotated90 << QPointF(10, 20) << QPointF(180, 10);
QTest::addRow("rotate-180") << OutputTransform::Rotated180 << QPointF(10, 20) << QPointF(90, 180);
QTest::addRow("rotate-270") << OutputTransform::Rotated270 << QPointF(10, 20) << QPointF(20, 90);
QTest::addRow("flip-0") << OutputTransform::Flipped << QPointF(10, 20) << QPointF(90, 20);
QTest::addRow("flip-90") << OutputTransform::Flipped90 << QPointF(10, 20) << QPointF(20, 10);
QTest::addRow("flip-180") << OutputTransform::Flipped180 << QPointF(10, 20) << QPointF(10, 180);
QTest::addRow("flip-270") << OutputTransform::Flipped270 << QPointF(10, 20) << QPointF(180, 90);
}
void TestOutputTransform::mapPointF()
{
QFETCH(OutputTransform::Kind, kind);
QFETCH(QPointF, source);
QFETCH(QPointF, target);
const OutputTransform transform(kind);
QCOMPARE(transform.map(source, QSizeF(100, 200)), target);
QCOMPARE(transform.map(QRectF(source, QSizeF(0, 0)), QSizeF(100, 200)), QRectF(target, QSizeF(0, 0)));
}
void TestOutputTransform::mapPoint_data()
{
QTest::addColumn<OutputTransform::Kind>("kind");
QTest::addColumn<QPoint>("source");
QTest::addColumn<QPoint>("target");
QTest::addRow("rotate-0") << OutputTransform::Normal << QPoint(10, 20) << QPoint(10, 20);
QTest::addRow("rotate-90") << OutputTransform::Rotated90 << QPoint(10, 20) << QPoint(180, 10);
QTest::addRow("rotate-180") << OutputTransform::Rotated180 << QPoint(10, 20) << QPoint(90, 180);
QTest::addRow("rotate-270") << OutputTransform::Rotated270 << QPoint(10, 20) << QPoint(20, 90);
QTest::addRow("flip-0") << OutputTransform::Flipped << QPoint(10, 20) << QPoint(90, 20);
QTest::addRow("flip-90") << OutputTransform::Flipped90 << QPoint(10, 20) << QPoint(20, 10);
QTest::addRow("flip-180") << OutputTransform::Flipped180 << QPoint(10, 20) << QPoint(10, 180);
QTest::addRow("flip-270") << OutputTransform::Flipped270 << QPoint(10, 20) << QPoint(180, 90);
}
void TestOutputTransform::mapPoint()
{
QFETCH(OutputTransform::Kind, kind);
QFETCH(QPoint, source);
QFETCH(QPoint, target);
const OutputTransform transform(kind);
QCOMPARE(transform.map(source, QSize(100, 200)), target);
QCOMPARE(transform.map(QRect(source, QSize(0, 0)), QSize(100, 200)), QRect(target, QSize(0, 0)));
}
void TestOutputTransform::inverted_data()
{
QTest::addColumn<OutputTransform::Kind>("kind");

62
src/core/output.cpp
View file

@ -199,6 +199,68 @@ QRect OutputTransform::map(const QRect &rect, const QSize &bounds) const
return dest;
}
QPointF OutputTransform::map(const QPointF &point, const QSizeF &bounds) const
{
switch (m_kind) {
case Kind::Normal:
return point;
case Kind::Rotated90:
return QPointF(bounds.height() - point.y(),
point.x());
case Kind::Rotated180:
return QPointF(bounds.width() - point.x(),
bounds.height() - point.y());
case Kind::Rotated270:
return QPointF(point.y(),
bounds.width() - point.x());
case Kind::Flipped:
return QPointF(bounds.width() - point.x(),
point.y());
case Kind::Flipped90:
return QPointF(point.y(),
point.x());
case Kind::Flipped180:
return QPointF(point.x(),
bounds.height() - point.y());
case Kind::Flipped270:
return QPointF(bounds.height() - point.y(),
bounds.width() - point.x());
default:
Q_UNREACHABLE();
}
}
QPoint OutputTransform::map(const QPoint &point, const QSize &bounds) const
{
switch (m_kind) {
case Kind::Normal:
return point;
case Kind::Rotated90:
return QPoint(bounds.height() - point.y(),
point.x());
case Kind::Rotated180:
return QPoint(bounds.width() - point.x(),
bounds.height() - point.y());
case Kind::Rotated270:
return QPoint(point.y(),
bounds.width() - point.x());
case Kind::Flipped:
return QPoint(bounds.width() - point.x(),
point.y());
case Kind::Flipped90:
return QPoint(point.y(),
point.x());
case Kind::Flipped180:
return QPoint(point.x(),
bounds.height() - point.y());
case Kind::Flipped270:
return QPoint(bounds.height() - point.y(),
bounds.width() - point.x());
default:
Q_UNREACHABLE();
}
}
QSizeF OutputTransform::map(const QSizeF &size) const
{
switch (m_kind) {

6
src/core/output.h
View file

@ -79,6 +79,12 @@ public:
QRectF map(const QRectF &rect, const QSizeF &bounds) const;
QRect map(const QRect &rect, const QSize &bounds) const;
/**
* Applies the output transform to the given @a point.
*/
QPointF map(const QPointF &point, const QSizeF &bounds) const;
QPoint map(const QPoint &point, const QSize &bounds) const;
/**
* Returns an output transform that is equivalent to applying this transform and @a other
* transform sequentially.