zhudongjer/carrot
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ui gapDist

Browse Source
This commit is contained in:
ajouatom 2025-02-18 17:18:31 +09:00
parent 792fa71d00
commit 4d6b60304a
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selfdrive/carrot/carrot_functions.py
View File

@ -266,6 +266,7 @@ class CarrotPlanner:
self.trafficState = TrafficState.off self.trafficState = TrafficState.off
def _update_carrot_man(self, sm, v_ego_kph, v_cruise_kph): def _update_carrot_man(self, sm, v_ego_kph, v_cruise_kph):
atc_active = False
if sm.alive['carrotMan']: if sm.alive['carrotMan']:
carrot_man = sm['carrotMan'] carrot_man = sm['carrotMan']
atc_turn_left = carrot_man.atcType in ["turn left", "atc left"] atc_turn_left = carrot_man.atcType in ["turn left", "atc left"]

21
selfdrive/ui/qt/onroad/onroad_home.cc
View File

@ -9,7 +9,7 @@
#include <QJsonValue> #include <QJsonValue>
#include <QJsonArray> #include <QJsonArray>
#include <QDialog> #include <QDialog>
#include <QMouseEvent>
#include "selfdrive/ui/qt/util.h" #include "selfdrive/ui/qt/util.h"
#include "selfdrive/ui/carrot.h" #include "selfdrive/ui/carrot.h"
@ -209,10 +209,21 @@ void OnroadWindow::mousePressEvent(QMouseEvent* e) {
// } // }
//#endif //#endif
// propagation event to parent(HomeWindow) // propagation event to parent(HomeWindow)
UIState* s = uiState(); int x = e->x(); // 430 - 500 : gap window
s->scene._current_carrot_display = (s->scene._current_carrot_display % 3) + 1; // 4번: full map은 안보여줌. int y = height() - e->y(); // 60 - 180 : gap window
printf("_current_carrot_display1=%d\n", s->scene._current_carrot_display); if (x > 430 && x < 500 && y > 60 && y < 180) {
QWidget::mousePressEvent(e); Params params;
int longitudinalPersonalityMax = params.getInt("LongitudinalPersonalityMax");
int personality = (params.getInt("LongitudinalPersonality") - 1 + longitudinalPersonalityMax) % longitudinalPersonalityMax;
params.putIntNonBlocking("LongitudinalPersonality", personality);
}
else {
UIState* s = uiState();
s->scene._current_carrot_display = (s->scene._current_carrot_display % 3) + 1; // 4¹ø: full mapÀº ¾Èº¸¿©ÁÜ.
printf("_current_carrot_display1=%d\n", s->scene._current_carrot_display);
QWidget::mousePressEvent(e);
}
} }
//OverlayDialog* mapDialog = nullptr; //OverlayDialog* mapDialog = nullptr;
void OnroadWindow::offroadTransition(bool offroad) { void OnroadWindow::offroadTransition(bool offroad) {