1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Polish the painting/affine example

Browse Source 
- Use member initialization
- Remove C-style casts
- Add space around operators
- Use qsizetype for list indexes
- Remove commented out debugging code

Task-number: QTBUG-97095
Pick-to: 6.2
Change-Id: I11a17fa6e7f17968367a57291d83ee6fba731a34
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Friedemann Kleint 2021-10-12 17:39:00 +02:00
parent a875503d9e
commit bb56560b6b
7 changed files with 252 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
examples/widgets/painting/affine/xform.cpp
View File

@ -58,27 +58,22 @@
const int alpha = 155; const int alpha = 155;
XFormView::XFormView(QWidget *parent) XFormView::XFormView(QWidget *parent)
: ArthurFrame(parent) : ArthurFrame(parent),
m_pixmap(QPixmap(":res/affine/bg1.jpg"))
{ {
setAttribute(Qt::WA_MouseTracking); setAttribute(Qt::WA_MouseTracking);
m_type = VectorType;
m_rotation = 0.0;
m_scale = 1.0;
m_shear = 0.0;
m_pixmap = QPixmap(":res/affine/bg1.jpg"); m_hoverPoints = new HoverPoints(this, HoverPoints::CircleShape);
pts = new HoverPoints(this, HoverPoints::CircleShape); m_hoverPoints->setConnectionType(HoverPoints::LineConnection);
pts->setConnectionType(HoverPoints::LineConnection); m_hoverPoints->setEditable(false);
pts->setEditable(false); m_hoverPoints->setPointSize(QSize(15, 15));
pts->setPointSize(QSize(15, 15)); m_hoverPoints->setShapeBrush(QBrush(QColor(151, 0, 0, alpha)));
pts->setShapeBrush(QBrush(QColor(151, 0, 0, alpha))); m_hoverPoints->setShapePen(QPen(QColor(255, 100, 50, alpha)));
pts->setShapePen(QPen(QColor(255, 100, 50, alpha))); m_hoverPoints->setConnectionPen(QPen(QColor(151, 0, 0, 50)));
pts->setConnectionPen(QPen(QColor(151, 0, 0, 50))); m_hoverPoints->setBoundingRect(QRectF(0, 0, 500, 500));
pts->setBoundingRect(QRectF(0, 0, 500, 500)); m_hoverPoints->setPoints(m_controlPoints);
ctrlPoints << QPointF(250, 250) << QPointF(350, 250); connect(m_hoverPoints, &HoverPoints::pointsChanged,
pts->setPoints(ctrlPoints); this, &XFormView::updateControlPoints);
connect(pts, &HoverPoints::pointsChanged,
this,&XFormView::updateCtrlPoints);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
} }
@ -122,7 +117,7 @@ void XFormView::mousePressEvent(QMouseEvent *)
void XFormView::resizeEvent(QResizeEvent *e) void XFormView::resizeEvent(QResizeEvent *e)
{ {
pts->setBoundingRect(rect()); m_hoverPoints->setBoundingRect(rect());
ArthurFrame::resizeEvent(e); ArthurFrame::resizeEvent(e);
} }
@ -145,24 +140,24 @@ void XFormView::paint(QPainter *p)
p->restore(); p->restore();
} }
void XFormView::updateCtrlPoints(const QPolygonF &points) void XFormView::updateControlPoints(const QPolygonF &points)
{ {
QPointF trans = points.at(0) - ctrlPoints.at(0); QPointF trans = points.at(0) - m_controlPoints.at(0);
if (qAbs(points.at(0).x() - points.at(1).x()) < 10 if (qAbs(points.at(0).x() - points.at(1).x()) < 10
&& qAbs(points.at(0).y() - points.at(1).y()) < 10) && qAbs(points.at(0).y() - points.at(1).y()) < 10)
pts->setPoints(ctrlPoints); m_hoverPoints->setPoints(m_controlPoints);
if (!trans.isNull()) { if (!trans.isNull()) {
ctrlPoints[0] = points.at(0); m_controlPoints[0] = points.at(0);
ctrlPoints[1] += trans; m_controlPoints[1] += trans;
pts->setPoints(ctrlPoints); m_hoverPoints->setPoints(m_controlPoints);
} }
ctrlPoints = points; m_controlPoints = points;
QLineF line(ctrlPoints.at(0), ctrlPoints.at(1)); QLineF line(m_controlPoints.at(0), m_controlPoints.at(1));
m_rotation = 360 - QLineF(0, 0, 1, 0).angleTo(line); m_rotation = 360 - QLineF(0, 0, 1, 0).angleTo(line);
if (trans.isNull()) if (trans.isNull())
emit rotationChanged(int(m_rotation*10)); emit rotationChanged(int(m_rotation * 10));
} }
void XFormView::setVectorType() void XFormView::setVectorType()
@ -222,12 +217,12 @@ void XFormView::setRotation(qreal r)
qreal old_rot = m_rotation; qreal old_rot = m_rotation;
m_rotation = r; m_rotation = r;
QPointF center(pts->points().at(0)); QPointF center(m_hoverPoints->points().at(0));
QTransform m; QTransform m;
m.translate(center.x(), center.y()); m.translate(center.x(), center.y());
m.rotate(m_rotation - old_rot); m.rotate(m_rotation - old_rot);
m.translate(-center.x(), -center.y()); m.translate(-center.x(), -center.y());
pts->setPoints(pts->points() * m); m_hoverPoints->setPoints(m_hoverPoints->points() * m);
update(); update();
} }
@ -235,12 +230,12 @@ void XFormView::setRotation(qreal r)
void XFormView::timerEvent(QTimerEvent *e) void XFormView::timerEvent(QTimerEvent *e)
{ {
if (e->timerId() == timer.timerId()) { if (e->timerId() == timer.timerId()) {
QPointF center(pts->points().at(0)); QPointF center(m_hoverPoints->points().at(0));
QTransform m; QTransform m;
m.translate(center.x(), center.y()); m.translate(center.x(), center.y());
m.rotate(0.2); m.rotate(0.2);
m.translate(-center.x(), -center.y()); m.translate(-center.x(), -center.y());
pts->setPoints(pts->points() * m); m_hoverPoints->setPoints(m_hoverPoints->points() * m);
setUpdatesEnabled(false); setUpdatesEnabled(false);
static qreal scale_inc = 0.003; static qreal scale_inc = 0.003;
@ -253,7 +248,7 @@ void XFormView::timerEvent(QTimerEvent *e)
shear_inc = -shear_inc; shear_inc = -shear_inc;
setUpdatesEnabled(true); setUpdatesEnabled(true);
pts->firePointChange(); m_hoverPoints->firePointChange();
} }
} }
@ -271,16 +266,15 @@ void XFormView::reset()
emit rotationChanged(0); emit rotationChanged(0);
emit scaleChanged(1000); emit scaleChanged(1000);
emit shearChanged(0); emit shearChanged(0);
ctrlPoints = QPolygonF(); m_controlPoints = {{250, 250}, {350, 250}};
ctrlPoints << QPointF(250, 250) << QPointF(350, 250); m_hoverPoints->setPoints(m_controlPoints);
pts->setPoints(ctrlPoints); m_hoverPoints->firePointChange();
pts->firePointChange();
} }
void XFormView::drawPixmapType(QPainter *painter) void XFormView::drawPixmapType(QPainter *painter)
{ {
QPointF center(m_pixmap.width() / qreal(2), m_pixmap.height() / qreal(2)); QPointF center(m_pixmap.width() / qreal(2), m_pixmap.height() / qreal(2));
painter->translate(ctrlPoints.at(0) - center); painter->translate(m_controlPoints.at(0) - center);
painter->translate(center); painter->translate(center);
painter->rotate(m_rotation); painter->rotate(m_rotation);
@ -289,9 +283,11 @@ void XFormView::drawPixmapType(QPainter *painter)
painter->translate(-center); painter->translate(-center);
painter->drawPixmap(QPointF(0, 0), m_pixmap); painter->drawPixmap(QPointF(0, 0), m_pixmap);
painter->setPen(QPen(QColor(255, 0, 0, alpha), 0.25, Qt::SolidLine, Qt::FlatCap, Qt::BevelJoin)); painter->setPen(QPen(QColor(255, 0, 0, alpha), 0.25,
Qt::SolidLine, Qt::FlatCap, Qt::BevelJoin));
painter->setBrush(Qt::NoBrush); painter->setBrush(Qt::NoBrush);
painter->drawRect(QRectF(0, 0, m_pixmap.width(), m_pixmap.height()).adjusted(-2, -2, 2, 2)); painter->drawRect(QRectF(0, 0, m_pixmap.width(),
m_pixmap.height()).adjusted(-2, -2, 2, 2));
} }
void XFormView::drawTextType(QPainter *painter) void XFormView::drawTextType(QPainter *painter)
@ -306,7 +302,7 @@ void XFormView::drawTextType(QPainter *painter)
QFontMetrics fm(f); QFontMetrics fm(f);
QRectF br(fm.boundingRect(m_text)); QRectF br(fm.boundingRect(m_text));
QPointF center(br.center()); QPointF center(br.center());
painter->translate(ctrlPoints.at(0) - center); painter->translate(m_controlPoints.at(0) - center);
painter->translate(center); painter->translate(center);
painter->rotate(m_rotation); painter->rotate(m_rotation);
@ -316,7 +312,8 @@ void XFormView::drawTextType(QPainter *painter)
painter->fillPath(path, Qt::black); painter->fillPath(path, Qt::black);
painter->setPen(QPen(QColor(255, 0, 0, alpha), 0.25, Qt::SolidLine, Qt::FlatCap, Qt::BevelJoin)); painter->setPen(QPen(QColor(255, 0, 0, alpha), 0.25,
Qt::SolidLine, Qt::FlatCap, Qt::BevelJoin));
painter->setBrush(Qt::NoBrush); painter->setBrush(Qt::NoBrush);
painter->drawRect(br.adjusted(-1, -1, 1, 1)); painter->drawRect(br.adjusted(-1, -1, 1, 1));
} }
@ -324,7 +321,7 @@ void XFormView::drawTextType(QPainter *painter)
void XFormView::drawVectorType(QPainter *painter) void XFormView::drawVectorType(QPainter *painter)
{ {
QPainterPath path; QPainterPath path;
painter->translate(ctrlPoints.at(0) - QPointF(250,250)); painter->translate(m_controlPoints.at(0) - QPointF(250,250));
painter->scale(0.77, 0.77); painter->scale(0.77, 0.77);
painter->translate(98.9154 + 30 , -217.691 - 20); painter->translate(98.9154 + 30 , -217.691 - 20);
@ -339,10 +336,10 @@ void XFormView::drawVectorType(QPainter *painter)
painter->setPen(Qt::NoPen); painter->setPen(Qt::NoPen);
path.moveTo(120, 470); path.moveTo(120, 470);
path.lineTo(60+245, 470); path.lineTo(60 + 245, 470);
path.lineTo(60+245, 470+350); path.lineTo(60 + 245, 470 + 350);
path.lineTo(60, 470+350); path.lineTo(60, 470 + 350);
path.lineTo(60, 470+80); path.lineTo(60, 470 + 80);
painter->setBrush(Qt::white); painter->setBrush(Qt::white);
painter->drawPath(path); painter->drawPath(path);

16
examples/widgets/painting/affine/xform.h
View File

@ -88,7 +88,7 @@ public:
void mousePressEvent(QMouseEvent *e) override; void mousePressEvent(QMouseEvent *e) override;
void resizeEvent(QResizeEvent *e) override; void resizeEvent(QResizeEvent *e) override;
HoverPoints *hoverPoints() { return pts; } HoverPoints *hoverPoints() { return m_hoverPoints; }
bool animation() const { return timer.isActive(); } bool animation() const { return timer.isActive(); }
qreal shear() const { return m_shear; } qreal shear() const { return m_shear; }
@ -104,7 +104,7 @@ public:
public slots: public slots:
void setAnimation(bool animate); void setAnimation(bool animate);
void updateCtrlPoints(const QPolygonF &); void updateControlPoints(const QPolygonF &);
void changeRotation(int rotation); void changeRotation(int rotation);
void changeScale(int scale); void changeScale(int scale);
void changeShear(int shear); void changeShear(int shear);
@ -130,12 +130,12 @@ protected:
#endif #endif
private: private:
QPolygonF ctrlPoints; QPolygonF m_controlPoints{{250, 250}, {350, 250}};
HoverPoints *pts; HoverPoints *m_hoverPoints;
qreal m_rotation; qreal m_rotation = 0;
qreal m_scale; qreal m_scale = 1;
qreal m_shear; qreal m_shear = 0;
XFormType m_type; XFormType m_type = VectorType;
QPixmap m_pixmap; QPixmap m_pixmap;
QString m_text; QString m_text;
QBasicTimer timer; QBasicTimer timer;

2
examples/widgets/painting/deform/pathdeform.cpp
View File

@ -481,7 +481,7 @@ void PathDeformRenderer::timerEvent(QTimerEvent *e)
void PathDeformRenderer::mousePressEvent(QMouseEvent *e) void PathDeformRenderer::mousePressEvent(QMouseEvent *e)
{ {
if (m_show_doc) { if (m_showDoc) {
setDescriptionEnabled(false); setDescriptionEnabled(false);
return; return;
} }

30
examples/widgets/painting/shared/arthurwidgets.cpp
View File

@ -70,28 +70,15 @@
extern QPixmap cached(const QString &img); extern QPixmap cached(const QString &img);
ArthurFrame::ArthurFrame(QWidget *parent) ArthurFrame::ArthurFrame(QWidget *parent)
: QWidget(parent) : QWidget(parent),
, m_prefer_image(false) m_tile(QPixmap(128, 128))
{ {
#if QT_CONFIG(opengl)
m_glWindow = nullptr;
m_glWidget = nullptr;
m_use_opengl = false;
#endif
m_document = nullptr;
m_show_doc = false;
m_tile = QPixmap(128, 128);
m_tile.fill(Qt::white); m_tile.fill(Qt::white);
QPainter pt(&m_tile); QPainter pt(&m_tile);
QColor color(230, 230, 230); QColor color(230, 230, 230);
pt.fillRect(0, 0, 64, 64, color); pt.fillRect(0, 0, 64, 64, color);
pt.fillRect(64, 64, 64, 64, color); pt.fillRect(64, 64, 64, 64, color);
pt.end(); pt.end();
// QPalette pal = palette();
// pal.setBrush(backgroundRole(), m_tile);
// setPalette(pal);
} }
@ -209,7 +196,7 @@ void ArthurFrame::paintEvent(QPaintEvent *e)
painter.restore(); painter.restore();
painter.save(); painter.save();
if (m_show_doc) if (m_showDoc)
paintDescription(&painter); paintDescription(&painter);
painter.restore(); painter.restore();
@ -244,9 +231,9 @@ void ArthurFrame::resizeEvent(QResizeEvent *e)
void ArthurFrame::setDescriptionEnabled(bool enabled) void ArthurFrame::setDescriptionEnabled(bool enabled)
{ {
if (m_show_doc != enabled) { if (m_showDoc != enabled) {
m_show_doc = enabled; m_showDoc = enabled;
emit descriptionEnabledChanged(m_show_doc); emit descriptionEnabledChanged(m_showDoc);
update(); update();
} }
} }
@ -276,9 +263,8 @@ void ArthurFrame::paintDescription(QPainter *painter)
int pageWidth = qMax(width() - 100, 100); int pageWidth = qMax(width() - 100, 100);
int pageHeight = qMax(height() - 100, 100); int pageHeight = qMax(height() - 100, 100);
if (pageWidth != m_document->pageSize().width()) { if (pageWidth != m_document->pageSize().width())
m_document->setPageSize(QSize(pageWidth, pageHeight)); m_document->setPageSize(QSize(pageWidth, pageHeight));
}
QRect textRect(width() / 2 - pageWidth / 2, QRect textRect(width() / 2 - pageWidth / 2,
height() / 2 - pageHeight / 2, height() / 2 - pageHeight / 2,
@ -340,7 +326,7 @@ void ArthurFrame::showSource()
if (!f.open(QFile::ReadOnly)) if (!f.open(QFile::ReadOnly))
contents = tr("Could not open file: '%1'").arg(m_sourceFileName); contents = tr("Could not open file: '%1'").arg(m_sourceFileName);
else else
contents = f.readAll(); contents = QString::fromUtf8(f.readAll());
} }
contents.replace(QLatin1Char('&'), QStringLiteral("&amp;")); contents.replace(QLatin1Char('&'), QStringLiteral("&amp;"));

18
examples/widgets/painting/shared/arthurwidgets.h
View File

@ -69,7 +69,6 @@ public:
ArthurFrame(QWidget *parent); ArthurFrame(QWidget *parent);
virtual void paint(QPainter *) {} virtual void paint(QPainter *) {}
void paintDescription(QPainter *p); void paintDescription(QPainter *p);
void loadDescription(const QString &filename); void loadDescription(const QString &filename);
@ -77,13 +76,13 @@ public:
void loadSourceFile(const QString &fileName); void loadSourceFile(const QString &fileName);
bool preferImage() const { return m_prefer_image; } bool preferImage() const { return m_preferImage; }
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
QOpenGLWindow *glWindow() const { return m_glWindow; } QOpenGLWindow *glWindow() const { return m_glWindow; }
#endif #endif
public slots: public slots:
void setPreferImage(bool pi) { m_prefer_image = pi; } void setPreferImage(bool pi) { m_preferImage = pi; }
void setDescriptionEnabled(bool enabled); void setDescriptionEnabled(bool enabled);
void showSource(); void showSource();
@ -101,18 +100,17 @@ protected:
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
virtual void createGlWindow(); virtual void createGlWindow();
QOpenGLWindow *m_glWindow; QOpenGLWindow *m_glWindow = nullptr;
QWidget *m_glWidget; QWidget *m_glWidget = nullptr;
bool m_use_opengl; bool m_use_opengl = false;
#endif #endif
QPixmap m_tile; QPixmap m_tile;
bool m_show_doc; bool m_showDoc = false;
bool m_prefer_image; bool m_preferImage = false;
QTextDocument *m_document; QTextDocument *m_document = nullptr;;
QString m_sourceFileName; QString m_sourceFileName;
}; };
#endif #endif

362
examples/widgets/painting/shared/hoverpoints.cpp
View File

@ -57,31 +57,18 @@
#include <QtOpenGL/QOpenGLWindow> #include <QtOpenGL/QOpenGLWindow>
#endif #endif
#define printf
HoverPoints::HoverPoints(QWidget *widget, PointShape shape) HoverPoints::HoverPoints(QWidget *widget, PointShape shape)
: QObject(widget) : QObject(widget),
m_widget(widget),
m_shape(shape)
{ {
m_widget = widget;
widget->installEventFilter(this); widget->installEventFilter(this);
widget->setAttribute(Qt::WA_AcceptTouchEvents); widget->setAttribute(Qt::WA_AcceptTouchEvents);
m_connectionType = CurveConnection;
m_sortType = NoSort;
m_shape = shape;
m_pointPen = QPen(QColor(255, 255, 255, 191), 1);
m_connectionPen = QPen(QColor(255, 255, 255, 127), 2);
m_pointBrush = QBrush(QColor(191, 191, 191, 127));
m_pointSize = QSize(11, 11);
m_currentIndex = -1;
m_editable = true;
m_enabled = true;
connect(this, &HoverPoints::pointsChanged, connect(this, &HoverPoints::pointsChanged,
m_widget, QOverload<>::of(&QWidget::update)); m_widget, QOverload<>::of(&QWidget::update));
} }
void HoverPoints::setEnabled(bool enabled) void HoverPoints::setEnabled(bool enabled)
{ {
if (m_enabled != enabled) { if (m_enabled != enabled) {
@ -90,191 +77,197 @@ void HoverPoints::setEnabled(bool enabled)
} }
} }
bool HoverPoints::eventFilter(QObject *object, QEvent *event) bool HoverPoints::eventFilter(QObject *object, QEvent *event)
{ {
if (object == m_widget && m_enabled) { if (object != m_widget || !m_enabled)
switch (event->type()) { return false;
case QEvent::MouseButtonPress: switch (event->type()) {
{ case QEvent::MouseButtonPress:
if (!m_fingerPointMapping.isEmpty()) {
return true; if (!m_fingerPointMapping.isEmpty())
QMouseEvent *me = (QMouseEvent *) event; return true;
auto *me = static_cast<const QMouseEvent *>(event);
QPointF clickPos = me->position().toPoint();
qsizetype index = -1;
for (qsizetype i = 0; i < m_points.size(); ++i) {
QPainterPath path;
const QRectF rect = pointBoundingRect(m_points.at(i));
if (m_shape == CircleShape)
path.addEllipse(rect);
else
path.addRect(rect);
QPointF clickPos = me->position().toPoint(); if (path.contains(clickPos)) {
int index = -1; index = i;
for (int i=0; i<m_points.size(); ++i) { break;
QPainterPath path; }
if (m_shape == CircleShape) }
path.addEllipse(pointBoundingRect(i));
else
path.addRect(pointBoundingRect(i));
if (path.contains(clickPos)) { if (me->button() == Qt::LeftButton) {
index = i; if (index == -1) {
if (!m_editable)
return false;
qsizetype pos = 0;
// Insert sort for x or y
switch (m_sortType) {
case XSort:
for (qsizetype i = 0; i < m_points.size(); ++i) {
if (m_points.at(i).x() > clickPos.x()) {
pos = i;
break;
}
}
break;
case YSort:
for (qsizetype i = 0; i < m_points.size(); ++i) {
if (m_points.at(i).y() > clickPos.y()) {
pos = i;
break;
}
}
break;
default:
break; break;
} }
m_points.insert(pos, clickPos);
m_locks.insert(pos, 0);
m_currentIndex = pos;
firePointChange();
} else {
m_currentIndex = index;
} }
return true;
if (me->button() == Qt::LeftButton) { } else if (me->button() == Qt::RightButton) {
if (index == -1) { if (index >= 0 && m_editable) {
if (!m_editable) if (m_locks[index] == 0) {
return false; m_locks.remove(index);
int pos = 0; m_points.remove(index);
// Insert sort for x or y
if (m_sortType == XSort) {
for (int i=0; i<m_points.size(); ++i)
if (m_points.at(i).x() > clickPos.x()) {
pos = i;
break;
}
} else if (m_sortType == YSort) {
for (int i=0; i<m_points.size(); ++i)
if (m_points.at(i).y() > clickPos.y()) {
pos = i;
break;
}
}
m_points.insert(pos, clickPos);
m_locks.insert(pos, 0);
m_currentIndex = pos;
firePointChange();
} else {
m_currentIndex = index;
} }
firePointChange();
return true; return true;
} else if (me->button() == Qt::RightButton) {
if (index >= 0 && m_editable) {
if (m_locks[index] == 0) {
m_locks.remove(index);
m_points.remove(index);
}
firePointChange();
return true;
}
} }
}
}
break;
case QEvent::MouseButtonRelease:
if (!m_fingerPointMapping.isEmpty())
return true;
m_currentIndex = -1;
break;
case QEvent::MouseMove:
if (!m_fingerPointMapping.isEmpty())
return true;
if (m_currentIndex >= 0) {
auto *me = static_cast<const QMouseEvent *>(event);
movePoint(m_currentIndex, me->position().toPoint());
} }
break; break;
case QEvent::MouseButtonRelease: case QEvent::TouchBegin:
if (!m_fingerPointMapping.isEmpty()) case QEvent::TouchUpdate:
return true; {
m_currentIndex = -1; auto *touchEvent = static_cast<const QTouchEvent*>(event);
break; const auto points = touchEvent->points();
const qreal pointSize = qMax(m_pointSize.width(), m_pointSize.height());
case QEvent::MouseMove: for (const auto &point : points) {
if (!m_fingerPointMapping.isEmpty()) const int id = point.id();
return true; switch (point.state()) {
if (m_currentIndex >= 0) case QEventPoint::Pressed:
movePoint(m_currentIndex, ((QMouseEvent *)event)->position().toPoint());
break;
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
{ {
const QTouchEvent *const touchEvent = static_cast<const QTouchEvent*>(event); // find the point, move it
const auto points = touchEvent->points(); const auto mappedPoints = m_fingerPointMapping.values();
const qreal pointSize = qMax(m_pointSize.width(), m_pointSize.height()); QSet<qsizetype> activePoints(mappedPoints.begin(), mappedPoints.end());
for (const auto &point : points) { qsizetype activePoint = -1;
const int id = point.id(); qreal distance = -1;
switch (point.state()) { const qsizetype pointsCount = m_points.size();
case QEventPoint::Pressed: const qsizetype activePointCount = activePoints.size();
{ if (pointsCount == 2 && activePointCount == 1) { // only two points
// find the point, move it activePoint = activePoints.contains(0) ? 1 : 0;
const auto mappedPoints = m_fingerPointMapping.values(); } else {
QSet<int> activePoints = QSet<int>(mappedPoints.begin(), mappedPoints.end()); for (qsizetype i = 0; i < pointsCount; ++i) {
int activePoint = -1; if (activePoints.contains(i))
qreal distance = -1; continue;
const int pointsCount = m_points.size();
const int activePointCount = activePoints.size();
if (pointsCount == 2 && activePointCount == 1) { // only two points
activePoint = activePoints.contains(0) ? 1 : 0;
} else {
for (int i=0; i<pointsCount; ++i) {
if (activePoints.contains(i))
continue;
qreal d = QLineF(point.position(), m_points.at(i)).length(); qreal d = QLineF(point.position(), m_points.at(i)).length();
if ((distance < 0 && d < 12 * pointSize) || d < distance) { if ((distance < 0 && d < 12 * pointSize) || d < distance) {
distance = d; distance = d;
activePoint = i; activePoint = i;
} }
}
}
if (activePoint != -1) {
m_fingerPointMapping.insert(point.id(), activePoint);
movePoint(activePoint, point.position());
}
}
break;
case QEventPoint::Released:
{
// move the point and release
QHash<int,int>::iterator it = m_fingerPointMapping.find(id);
movePoint(it.value(), point.position());
m_fingerPointMapping.erase(it);
}
break;
case QEventPoint::Updated:
{
// move the point
const int pointIdx = m_fingerPointMapping.value(id, -1);
if (pointIdx >= 0) // do we track this point?
movePoint(pointIdx, point.position());
}
break;
default:
break;
} }
} }
if (m_fingerPointMapping.isEmpty()) { if (activePoint != -1) {
event->ignore(); m_fingerPointMapping.insert(point.id(), activePoint);
return false; movePoint(activePoint, point.position());
} else {
return true;
} }
} }
break; break;
case QEvent::TouchEnd: case QEventPoint::Released:
if (m_fingerPointMapping.isEmpty()) { {
event->ignore(); // move the point and release
return false; const auto it = m_fingerPointMapping.find(id);
movePoint(it.value(), point.position());
m_fingerPointMapping.erase(it);
} }
return true;
break; break;
case QEventPoint::Updated:
case QEvent::Resize: {
{ // move the point
QResizeEvent *e = (QResizeEvent *) event; const qsizetype pointIdx = m_fingerPointMapping.value(id, -1);
if (e->oldSize().width() == 0 || e->oldSize().height() == 0) if (pointIdx >= 0) // do we track this point?
movePoint(pointIdx, point.position());
}
break;
default:
break; break;
qreal stretch_x = e->size().width() / qreal(e->oldSize().width());
qreal stretch_y = e->size().height() / qreal(e->oldSize().height());
for (int i=0; i<m_points.size(); ++i) {
QPointF p = m_points[i];
movePoint(i, QPointF(p.x() * stretch_x, p.y() * stretch_y), false);
} }
}
if (m_fingerPointMapping.isEmpty()) {
event->ignore();
return false;
}
return true;
}
case QEvent::TouchEnd:
if (m_fingerPointMapping.isEmpty()) {
event->ignore();
return false;
}
return true;
firePointChange(); case QEvent::Resize:
{
auto *e = static_cast<const QResizeEvent *>(event);
if (e->oldSize().width() <= 0 || e->oldSize().height() <= 0)
break; break;
qreal stretch_x = e->size().width() / qreal(e->oldSize().width());
qreal stretch_y = e->size().height() / qreal(e->oldSize().height());
for (qsizetype i = 0; i < m_points.size(); ++i) {
QPointF p = m_points.at(i);
movePoint(i, QPointF(p.x() * stretch_x, p.y() * stretch_y), false);
} }
case QEvent::Paint: firePointChange();
{ break;
QWidget *that_widget = m_widget; }
m_widget = nullptr;
QCoreApplication::sendEvent(object, event); case QEvent::Paint:
m_widget = that_widget; {
paintPoints(); QWidget *that_widget = m_widget;
return true; m_widget = nullptr;
} QCoreApplication::sendEvent(object, event);
default: m_widget = that_widget;
break; paintPoints();
} return true;
}
default:
break;
} }
return false; return false;
@ -304,8 +297,8 @@ void HoverPoints::paintPoints()
if (m_connectionType == CurveConnection) { if (m_connectionType == CurveConnection) {
QPainterPath path; QPainterPath path;
path.moveTo(m_points.at(0)); path.moveTo(m_points.at(0));
for (int i=1; i<m_points.size(); ++i) { for (qsizetype i = 1; i < m_points.size(); ++i) {
QPointF p1 = m_points.at(i-1); QPointF p1 = m_points.at(i - 1);
QPointF p2 = m_points.at(i); QPointF p2 = m_points.at(i);
qreal distance = p2.x() - p1.x(); qreal distance = p2.x() - p1.x();
@ -322,8 +315,8 @@ void HoverPoints::paintPoints()
p.setPen(m_pointPen); p.setPen(m_pointPen);
p.setBrush(m_pointBrush); p.setBrush(m_pointBrush);
for (int i=0; i<m_points.size(); ++i) { for (const auto &point : qAsConst(m_points)) {
QRectF bounds = pointBoundingRect(i); QRectF bounds = pointBoundingRect(point);
if (m_shape == CircleShape) if (m_shape == CircleShape)
p.drawEllipse(bounds); p.drawEllipse(bounds);
else else
@ -354,32 +347,28 @@ void HoverPoints::setPoints(const QPolygonF &points)
if (points.size() != m_points.size()) if (points.size() != m_points.size())
m_fingerPointMapping.clear(); m_fingerPointMapping.clear();
m_points.clear(); m_points.clear();
for (int i=0; i<points.size(); ++i) for (qsizetype i = 0; i < points.size(); ++i)
m_points << bound_point(points.at(i), boundingRect(), 0); m_points << bound_point(points.at(i), boundingRect(), 0);
m_locks.clear(); m_locks.clear();
if (m_points.size() > 0) { if (m_points.size() > 0) {
m_locks.resize(m_points.size()); m_locks.resize(m_points.size());
m_locks.fill(0); m_locks.fill(0);
} }
} }
void HoverPoints::movePoint(qsizetype index, const QPointF &point, bool emitUpdate)
void HoverPoints::movePoint(int index, const QPointF &point, bool emitUpdate)
{ {
m_points[index] = bound_point(point, boundingRect(), m_locks.at(index)); m_points[index] = bound_point(point, boundingRect(), m_locks.at(index));
if (emitUpdate) if (emitUpdate)
firePointChange(); firePointChange();
} }
inline static bool x_less_than(const QPointF &p1, const QPointF &p2) inline static bool x_less_than(const QPointF &p1, const QPointF &p2)
{ {
return p1.x() < p2.x(); return p1.x() < p2.x();
} }
inline static bool y_less_than(const QPointF &p1, const QPointF &p2) inline static bool y_less_than(const QPointF &p1, const QPointF &p2)
{ {
return p1.y() < p2.y(); return p1.y() < p2.y();
@ -387,14 +376,11 @@ inline static bool y_less_than(const QPointF &p1, const QPointF &p2)
void HoverPoints::firePointChange() void HoverPoints::firePointChange()
{ {
// printf("HoverPoints::firePointChange(), current=%d\n", m_currentIndex);
if (m_sortType != NoSort) { if (m_sortType != NoSort) {
QPointF oldCurrent; QPointF oldCurrent;
if (m_currentIndex != -1) { if (m_currentIndex != -1)
oldCurrent = m_points[m_currentIndex]; oldCurrent = m_points[m_currentIndex];
}
if (m_sortType == XSort) if (m_sortType == XSort)
std::sort(m_points.begin(), m_points.end(), x_less_than); std::sort(m_points.begin(), m_points.end(), x_less_than);
@ -403,22 +389,14 @@ void HoverPoints::firePointChange()
// Compensate for changed order... // Compensate for changed order...
if (m_currentIndex != -1) { if (m_currentIndex != -1) {
for (int i=0; i<m_points.size(); ++i) { for (qsizetype i = 0; i < m_points.size(); ++i) {
if (m_points[i] == oldCurrent) { if (m_points[i] == oldCurrent) {
m_currentIndex = i; m_currentIndex = i;
break; break;
} }
} }
} }
// printf(" - firePointChange(), current=%d\n", m_currentIndex);
} }
// for (int i=0; i<m_points.size(); ++i) {
// printf(" - point(%2d)=[%.2f, %.2f], lock=%d\n",
// i, m_points.at(i).x(), m_points.at(i).y(), m_locks.at(i));
// }
emit pointsChanged(m_points); emit pointsChanged(m_points);
} }

28
examples/widgets/painting/shared/hoverpoints.h
View File

@ -124,35 +124,33 @@ public:
void firePointChange(); void firePointChange();
private: private:
inline QRectF pointBoundingRect(int i) const; inline QRectF pointBoundingRect(const QPointF &p) const;
void movePoint(int i, const QPointF &newPos, bool emitChange = true); void movePoint(qsizetype i, const QPointF &newPos, bool emitChange = true);
QWidget *m_widget; QWidget *m_widget;
QPolygonF m_points; QPolygonF m_points;
QRectF m_bounds; QRectF m_bounds;
PointShape m_shape; PointShape m_shape;
SortType m_sortType; SortType m_sortType = NoSort;
ConnectionType m_connectionType; ConnectionType m_connectionType = CurveConnection;
QList<uint> m_locks; QList<uint> m_locks;
QSizeF m_pointSize; QSizeF m_pointSize{11, 11};
int m_currentIndex; qsizetype m_currentIndex= -1;
bool m_editable; bool m_editable = true;
bool m_enabled; bool m_enabled = true;
QHash<int, int> m_fingerPointMapping; QHash<int, qsizetype> m_fingerPointMapping;
QPen m_pointPen; QPen m_pointPen{QColor(255, 255, 255, 191), 1};
QBrush m_pointBrush; QBrush m_pointBrush{QColor(191, 191, 191, 127)};
QPen m_connectionPen; QPen m_connectionPen{QColor(255, 255, 255, 127), 2};
}; };
inline QRectF HoverPoints::pointBoundingRect(const QPointF &p) const
inline QRectF HoverPoints::pointBoundingRect(int i) const
{ {
QPointF p = m_points.at(i);
qreal w = m_pointSize.width(); qreal w = m_pointSize.width();
qreal h = m_pointSize.height(); qreal h = m_pointSize.height();
qreal x = p.x() - w / 2; qreal x = p.x() - w / 2;