mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-07-07 22:52:06 +08:00
ui: remove variable world_objects_visible, use rcv_frame (#23264)
old-commit-hash: e4de82f90636a551a2490ccda1abc30a9b7f30b1
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
+3
-2
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user