diff options
| author | HIDAKA Takahiro <takahr@gmail.com> | 2025-01-16 22:00:13 +0900 |
|---|---|---|
| committer | HIDAKA Takahiro <takahr@gmail.com> | 2025-02-14 03:40:34 +0900 |
| commit | fa21fc298a353d9ddfa31f384196ca6d34067a2c (patch) | |
| tree | 4b9c19c2b412d6eaa2e9e4fd55a8a8e356a925e5 /src | |
| parent | 51dc4cdd42cc57072b4e9da3aa02029597d4676c (diff) | |
iOS: cleanup debug log for touch event
Add xTilt, yTilt variables for simplify duplicate expressions.
And remove azimuthAngle as it is no longer used.
Change-Id: Ia4a058d61670c1251760835e92972406c5dfe4c0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/ios/quiview.mm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm index 96144fbb5ee..734105a6443 100644 --- a/src/plugins/platforms/ios/quiview.mm +++ b/src/plugins/platforms/ios/quiview.mm @@ -378,24 +378,21 @@ inline ulong getTimeStamp(UIEvent *event) (localViewPosition - localViewPositionI); qreal pressure = cTouch.force / cTouch.maximumPossibleForce; // azimuth unit vector: +x to the right, +y going downwards - CGVector azimuth = [cTouch azimuthUnitVectorInView: self]; - // azimuthAngle given in radians, zero when the stylus points towards +x axis; converted to degrees with 0 pointing straight up - qreal azimuthAngle = qRadiansToDegrees([cTouch azimuthAngleInView: self]) + 90; + CGVector azimuth = [cTouch azimuthUnitVectorInView:self]; // altitudeAngle given in radians, pi / 2 is with the stylus perpendicular to the iPad, smaller values mean more tilted, but never negative. // Convert to degrees with zero being perpendicular. qreal altitudeAngle = 90 - qRadiansToDegrees(cTouch.altitudeAngle); + qreal xTilt = qBound(-60.0, altitudeAngle * azimuth.dx, 60.0); + qreal yTilt = qBound(-60.0, altitudeAngle * azimuth.dy, 60.0); qCDebug(lcQpaTablet) << i << ":" << timeStamp << localViewPosition << pressure << state << "azimuth" << azimuth.dx << azimuth.dy - << "angle" << azimuthAngle << "altitude" << cTouch.altitudeAngle - << "xTilt" << qBound(-60.0, altitudeAngle * azimuth.dx, 60.0) << "yTilt" << qBound(-60.0, altitudeAngle * azimuth.dy, 60.0); + << "altitude" << cTouch.altitudeAngle << "xTilt" << xTilt << "yTilt" << yTilt; QWindowSystemInterface::handleTabletEvent(self.platformWindow->window(), timeStamp, // device, local, global iosIntegration->pencilDevice(), localViewPosition, globalScreenPosition, // buttons state == QEventPoint::State::Released ? Qt::NoButton : Qt::LeftButton, - // pressure, xTilt, yTilt - pressure, qBound(-60.0, altitudeAngle * azimuth.dx, 60.0), qBound(-60.0, altitudeAngle * azimuth.dy, 60.0), - // tangentialPressure, rotation, z, modifiers - 0, 0, 0, Qt::NoModifier); + // pressure, xTilt, yTilt, tangentialPressure, rotation, z, modifiers + pressure, xTilt, yTilt, 0, 0, 0, Qt::NoModifier); ++i; } } |