ui: remove variable world_objects_visible, use rcv_frame (#23264)

old-commit-hash: e4de82f906
commatwo_master
Dean Lee 3 years ago committed by GitHub
parent de3f8d227b
commit 9321e1bb6c
  1. 2
      selfdrive/ui/qt/onroad.cc
  2. 3
      selfdrive/ui/ui.cc
  3. 5
      selfdrive/ui/ui.h

@ -349,7 +349,7 @@ void NvgWindow::paintGL() {
CameraViewWidget::paintGL();
UIState *s = uiState();
if (s->scene.world_objects_visible) {
if (s->worldObjectsVisible()) {
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
painter.setPen(Qt::NoPen);

@ -118,7 +118,6 @@ static void update_state(UIState *s) {
update_leads(s, sm["radarState"].getRadarState(), line);
}
if (sm.updated("liveCalibration")) {
scene.world_objects_visible = true;
auto rpy_list = sm["liveCalibration"].getLiveCalibration().getRpyCalib();
Eigen::Vector3d rpy;
rpy << rpy_list[0], rpy_list[1], rpy_list[2];
@ -211,8 +210,6 @@ static void update_status(UIState *s) {
s->scene.end_to_end = Params().getBool("EndToEndToggle");
s->wide_camera = Hardware::TICI() ? Params().getBool("EnableWideCamera") : false;
}
// Invisible until we receive a calibration message.
s->scene.world_objects_visible = false;
}
started_prev = s->scene.started;
}

@ -82,8 +82,6 @@ typedef struct {
typedef struct UIScene {
mat3 view_from_calib;
bool world_objects_visible;
cereal::PandaState::PandaType pandaType;
// modelV2
@ -106,6 +104,9 @@ class UIState : public QObject {
public:
UIState(QObject* parent = 0);
inline bool worldObjectsVisible() const {
return sm->rcv_frame("liveCalibration") > scene.started_frame;
};
int fb_w = 0, fb_h = 0;

Loading…
Cancel
Save