ui: fix finish setup button (#21538)

old-commit-hash: c10d46d336
vw-mqb-aeb
sshane 4 years ago committed by GitHub
parent 7198224cf2
commit 748adb4c63
  1. 6
      selfdrive/ui/qt/home.cc
  2. 4
      selfdrive/ui/ui.cc

@ -25,15 +25,15 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) {
slayout = new QStackedLayout(); slayout = new QStackedLayout();
main_layout->addLayout(slayout); main_layout->addLayout(slayout);
home = new OffroadHome();
slayout->addWidget(home);
onroad = new OnroadWindow(this); onroad = new OnroadWindow(this);
slayout->addWidget(onroad); slayout->addWidget(onroad);
QObject::connect(this, &HomeWindow::update, onroad, &OnroadWindow::update); QObject::connect(this, &HomeWindow::update, onroad, &OnroadWindow::update);
QObject::connect(this, &HomeWindow::offroadTransitionSignal, onroad, &OnroadWindow::offroadTransitionSignal); QObject::connect(this, &HomeWindow::offroadTransitionSignal, onroad, &OnroadWindow::offroadTransitionSignal);
home = new OffroadHome();
slayout->addWidget(home);
driver_view = new DriverViewWindow(this); driver_view = new DriverViewWindow(this);
connect(driver_view, &DriverViewWindow::done, [=] { connect(driver_view, &DriverViewWindow::done, [=] {
showDriverView(false); showDriverView(false);

@ -134,7 +134,7 @@ static void update_state(UIState *s) {
scene.engageable = sm["controlsState"].getControlsState().getEngageable(); scene.engageable = sm["controlsState"].getControlsState().getEngageable();
scene.dm_active = sm["driverMonitoringState"].getDriverMonitoringState().getIsActiveMode(); scene.dm_active = sm["driverMonitoringState"].getDriverMonitoringState().getIsActiveMode();
} }
if (sm.updated("radarState")) { if (sm.updated("radarState") && s->vg) {
std::optional<cereal::ModelDataV2::XYZTData::Reader> line; std::optional<cereal::ModelDataV2::XYZTData::Reader> line;
if (sm.rcv_frame("modelV2") > 0) { if (sm.rcv_frame("modelV2") > 0) {
line = sm["modelV2"].getModelV2().getPosition(); line = sm["modelV2"].getModelV2().getPosition();
@ -158,7 +158,7 @@ static void update_state(UIState *s) {
} }
} }
} }
if (sm.updated("modelV2")) { if (sm.updated("modelV2") && s->vg) {
update_model(s, sm["modelV2"].getModelV2()); update_model(s, sm["modelV2"].getModelV2());
} }
if (sm.updated("pandaState")) { if (sm.updated("pandaState")) {

Loading…
Cancel
Save