mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-02-28 00:43:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui/map: interactive counter fix (#29470)

Browse Source 
* use interactive_counter instead of separate zoom and pan counters

* use interaction_counter instead of separate zoom and pan counters

* same styling

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
This commit is contained in:
pencilpusher
2023-08-19 02:07:52 -05:00
committed by GitHub
parent ac07c205ed
commit f2d22075eb
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
selfdrive/ui/qt/maps/map.cc
View File

@@ -10,7 +10,7 @@
#include "selfdrive/ui/ui.h"
const int PAN_TIMEOUT = 100;
const int INTERACTION_TIMEOUT = 100;
const float MAX_ZOOM = 17;
const float MIN_ZOOM = 14;
@@ -193,17 +193,12 @@ void MapWindow::updateState(const UIState &s) {
m_map->updateSource("carPosSource", carPosSource);
}
if (pan_counter == 0) {
if (interaction_counter == 0) {
if (last_position) m_map->setCoordinate(*last_position);
if (last_bearing) m_map->setBearing(*last_bearing);
} else {
pan_counter--;
}
if (zoom_counter == 0) {
m_map->setZoom(util::map_val<float>(velocity_filter.x(), 0, 30, MAX_ZOOM, MIN_ZOOM));
} else {
zoom_counter--;
interaction_counter--;
}
if (sm.updated("navInstruction")) {
@@ -307,15 +302,14 @@ void MapWindow::mouseDoubleClickEvent(QMouseEvent *ev) {
m_map->setZoom(util::map_val<float>(velocity_filter.x(), 0, 30, MAX_ZOOM, MIN_ZOOM));
update();
pan_counter = 0;
zoom_counter = 0;
interaction_counter = 0;
}
void MapWindow::mouseMoveEvent(QMouseEvent *ev) {
QPointF delta = ev->localPos() - m_lastPos;
if (!delta.isNull()) {
pan_counter = PAN_TIMEOUT;
interaction_counter = INTERACTION_TIMEOUT;
m_map->moveBy(delta / MAP_SCALE);
update();
}
@@ -337,7 +331,7 @@ void MapWindow::wheelEvent(QWheelEvent *ev) {
m_map->scaleBy(1 + factor, ev->pos() / MAP_SCALE);
update();
zoom_counter = PAN_TIMEOUT;
interaction_counter = INTERACTION_TIMEOUT;
ev->accept();
}
@@ -362,7 +356,7 @@ void MapWindow::pinchTriggered(QPinchGesture *gesture) {
// TODO: figure out why gesture centerPoint doesn't work
m_map->scaleBy(gesture->scaleFactor(), {width() / 2.0 / MAP_SCALE, height() / 2.0 / MAP_SCALE});
update();
zoom_counter = PAN_TIMEOUT;
interaction_counter = INTERACTION_TIMEOUT;
}
}

3
selfdrive/ui/qt/maps/map.h
View File

@@ -53,8 +53,7 @@ private:
// Panning
QPointF m_lastPos;
int pan_counter = 0;
int zoom_counter = 0;
int interaction_counter = 0;
// Position
std::optional<QMapbox::Coordinate> last_valid_nav_dest;