lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inserts first successfull qt6 migration Lts/Viewer

Browse Source
This commit is contained in:
torsten committed 2026-10-14 10:11:30 +02:00
1 parent c6d5dd1649
commit f675a65bc3
29 files changed
+238 -18437
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Tests/EsriMapTouchTest/event_mouse_navigator.cpp
+5 -5
View File
@@ -125,9 +125,9 @@ namespace SituationMap { namespace RB
}
}
if (Qt::MidButton == mouseEvent->button())
if (Qt::MiddleButton == mouseEvent->button())
{
handled = (Qt::MidButton == mouseEvent->button());
handled = (Qt::MiddleButton == mouseEvent->button());
_mousePanningActive = true;
setCursorToWidget( QCursor(Qt::CursorShape::ClosedHandCursor) );
@@ -161,9 +161,9 @@ namespace SituationMap { namespace RB
pickRequested( mouseEvent->pos() );
}
if ((_mousePanningActive) || (Qt::MidButton == mouseEvent->button()))
if ((_mousePanningActive) || (Qt::MiddleButton == mouseEvent->button()))
{
handled = (Qt::MidButton == mouseEvent->button());
handled = (Qt::MiddleButton == mouseEvent->button());
setCursorToWidget( _restoreMouseCursor );
}
@@ -192,7 +192,7 @@ namespace SituationMap { namespace RB
}
}
if ((_mousePanningActive) || mouseEvent->buttons().testFlag(Qt::MidButton))
if ((_mousePanningActive) || mouseEvent->buttons().testFlag(Qt::MiddleButton))
{
handled = true;
EsriRuntimeQt::AnimationMode mode = _esriMap->animationMode();
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Tests/EsriMapTouchTest/gestures.cpp
+7 -7
View File
@@ -50,21 +50,21 @@ namespace SituationMap { namespace RB {
case QEvent::TouchBegin:
{
qDebug() << "ApplyGesture begin";
q->_position = ev->touchPoints().at(0).pos();
q->setHotSpot(ev->touchPoints().at(0).screenPos());
q->_tripleTouch = (ev->touchPoints().size() == 3);
q->_position = ev->points().at(0).position();
q->setHotSpot(ev->points().at(0).globalPosition().toPoint());
q->_tripleTouch = (ev->points().size() == 3);
result = QGestureRecognizer::TriggerGesture;
} break;
case QEvent::TouchUpdate:
case QEvent::TouchEnd:
{
if (q->state() != Qt::NoGesture && ev->touchPoints().size() >= 1 && ev->touchPoints().size() <= 3)
if (q->state() != Qt::NoGesture && ev->points().size() >= 1 && ev->points().size() <= 3)
{
if (ev->touchPoints().size() == 3) q->_tripleTouch = true;
if (ev->points().size() == 3) q->_tripleTouch = true;
qDebug() << "ApplyGesture update _tripleTouch=" << q->_tripleTouch;
QTouchEvent::TouchPoint p = ev->touchPoints().at(0);
QPoint delta = p.pos().toPoint() - p.startPos().toPoint();
QEventPoint p = ev->points().at(0);
QPoint delta = p.position().toPoint() - p.pressPosition().toPoint();
enum { TapRadius = 40 };
if (delta.manhattanLength() <= TapRadius)
{