QTabletEvent manual test: use built-in QDebug operator

There's no need to decode the event details here anymore, and anyway
this had a bug: it always said the device is unknown.

Change-Id: If99dddbe2136d95e818f4fe526f62650cbd7c1ca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
Shawn Rutledge 2015-02-27 14:56:55 +01:00
parent 3b6d2575ae
commit b134327475

View File

@ -147,29 +147,23 @@ void EventReportWidget::paintEvent(QPaintEvent *)
void EventReportWidget::tabletEvent(QTabletEvent *event) void EventReportWidget::tabletEvent(QTabletEvent *event)
{ {
QWidget::tabletEvent(event); QWidget::tabletEvent(event);
QString type; bool isMove = false;
switch (event->type()) { switch (event->type()) {
case QEvent::TabletEnterProximity: case QEvent::TabletEnterProximity:
type = QString::fromLatin1("TabletEnterProximity");
break;
case QEvent::TabletLeaveProximity: case QEvent::TabletLeaveProximity:
type = QString::fromLatin1("TabletLeaveProximity");
break; break;
case QEvent::TabletMove: case QEvent::TabletMove:
type = QString::fromLatin1("TabletMove");
m_points.push_back(TabletPoint(event->pos(), TabletMove, m_lastButton, event->pointerType(), event->pressure(), event->rotation())); m_points.push_back(TabletPoint(event->pos(), TabletMove, m_lastButton, event->pointerType(), event->pressure(), event->rotation()));
update(); update();
isMove = true;
break; break;
case QEvent::TabletPress: case QEvent::TabletPress:
type = QString::fromLatin1("TabletPress");
m_points.push_back(TabletPoint(event->pos(), TabletButtonPress, event->button(), event->pointerType(), event->rotation())); m_points.push_back(TabletPoint(event->pos(), TabletButtonPress, event->button(), event->pointerType(), event->rotation()));
m_lastButton = event->button(); m_lastButton = event->button();
update(); update();
break; break;
case QEvent::TabletRelease: case QEvent::TabletRelease:
type = QString::fromLatin1("TabletRelease");
m_points.push_back(TabletPoint(event->pos(), TabletButtonRelease, event->button(), event->pointerType(), event->rotation())); m_points.push_back(TabletPoint(event->pos(), TabletButtonRelease, event->button(), event->pointerType(), event->rotation()));
update(); update();
break; break;
@ -178,84 +172,24 @@ void EventReportWidget::tabletEvent(QTabletEvent *event)
break; break;
} }
QString pointerType = "UNKNOWN"; if (!(isMove && m_lastIsTabletMove)) {
switch (event->pointerType()) { QDebug d = qDebug();
case QTabletEvent::Pen: d << event << " global position = " << event->globalPos()
pointerType = "Pen"; << " cursor at " << QCursor::pos();
break; if (event->button() != Qt::NoButton)
case QTabletEvent::Cursor: d << " changed button " << event->button();
pointerType = "Cursor";
break;
case QTabletEvent::Eraser:
pointerType = "Eraser";
break;
default:
break;
} }
m_lastIsTabletMove = isMove;
QString device = "UNKNOWN";
switch (event->device()) {
case QTabletEvent::Puck:
pointerType = "Puck";
break;
case QTabletEvent::Stylus:
pointerType = "Stylus";
break;
case QTabletEvent::Airbrush:
pointerType = "Airbrush";
break;
case QTabletEvent::FourDMouse:
pointerType = "FourDMouse";
break;
case QTabletEvent::RotationStylus:
pointerType = "RotationStylus";
break;
default:
break;
}
if (!m_lastIsTabletMove)
qDebug() << "Tablet event, type = " << type
<< " position = " << event->pos()
<< " global position = " << event->globalPos()
<< " cursor at " << QCursor::pos()
<< " buttons " << event->buttons() << " changed " << event->button()
<< " pointer type " << pointerType << " device " << device;
m_lastIsTabletMove = (event->type() == QEvent::TabletMove);
} }
void EventReportWidget::outputMouseEvent(QMouseEvent *event) void EventReportWidget::outputMouseEvent(QMouseEvent *event)
{ {
QString type; if (event->type() == QEvent::MouseMove) {
switch (event->type()) {
case QEvent::MouseButtonDblClick:
m_lastIsMouseMove = false;
type = QString::fromLatin1("MouseButtonDblClick");
break;
case QEvent::MouseButtonPress:
m_lastIsMouseMove = false;
type = QString::fromLatin1("MouseButtonPress");
break;
case QEvent::MouseButtonRelease:
m_lastIsMouseMove = false;
type = QString::fromLatin1("MouseButtonRelease");
break;
case QEvent::MouseMove:
if (m_lastIsMouseMove) if (m_lastIsMouseMove)
return; // only show one move to keep things readable return; // only show one move to keep things readable
m_lastIsMouseMove = true; m_lastIsMouseMove = true;
type = QString::fromLatin1("MouseMove");
break;
default:
Q_ASSERT(false);
break;
} }
qDebug() << event;
qDebug() << "Mouse event, type = " << type
<< " position = " << event->pos()
<< " global position = " << event->globalPos();
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])