mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-07-02 03:52:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: prevent constant clicking on experimental button (#27865)

Browse Source 
Co-authored-by: Cameron Clough <cameronjclough@gmail.com>

old-commit-hash: c7f72698a6b1c3e7eb7d2928c52c480af1f3dbf6
This commit is contained in:
Dean Lee
2023-06-29 21:53:53 +08:00
committed by GitHub
parent ac0b7d634e
commit f7602512f7
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/onroad.cc
+16 -18
View File
@@ -178,35 +178,33 @@ void OnroadAlerts::paintEvent(QPaintEvent *event) {
}
}
ExperimentalButton::ExperimentalButton(QWidget *parent) : QPushButton(parent) {
// ExperimentalButton
ExperimentalButton::ExperimentalButton(QWidget *parent) : experimental_mode(false), QPushButton(parent) {
setVisible(false);
setFixedSize(btn_size, btn_size);
setCheckable(true);
params = Params();
engage_img = loadPixmap("../assets/img_chffr_wheel.png", {img_size, img_size});
experimental_img = loadPixmap("../assets/img_experimental.svg", {img_size, img_size});
QObject::connect(this, &QPushButton::clicked, this, &ExperimentalButton::changeMode);
}
QObject::connect(this, &QPushButton::toggled, [=](bool checked) {
params.putBool("ExperimentalMode", checked);
});
void ExperimentalButton::changeMode() {
const auto cp = (*uiState()->sm)["carParams"].getCarParams();
const bool experimental_mode_available = cp.getExperimentalLongitudinalAvailable() ? params.getBool("ExperimentalLongitudinalEnabled") : cp.getOpenpilotLongitudinalControl();
bool can_change = experimental_mode_available && params.getBool("ExperimentalModeConfirmed");
if (can_change) {
params.putBool("ExperimentalMode", !experimental_mode);
}
}
void ExperimentalButton::updateState(const UIState &s) {
const SubMaster &sm = *(s.sm);
// button is "visible" if engageable or enabled
const auto cs = sm["controlsState"].getControlsState();
const auto cs = (*s.sm)["controlsState"].getControlsState();
setVisible(cs.getEngageable() || cs.getEnabled());
// button is "checked" if experimental mode is enabled
setChecked(sm["controlsState"].getControlsState().getExperimentalMode());
// disable button when experimental mode is not available, or has not been confirmed for the first time
const auto cp = sm["carParams"].getCarParams();
const bool experimental_mode_available = cp.getExperimentalLongitudinalAvailable() ? params.getBool("ExperimentalLongitudinalEnabled") : cp.getOpenpilotLongitudinalControl();
setEnabled(params.getBool("ExperimentalModeConfirmed") && experimental_mode_available);
if (std::exchange(experimental_mode, cs.getExperimentalMode()) != experimental_mode) {
update();
}
}
void ExperimentalButton::paintEvent(QPaintEvent *event) {
@@ -214,7 +212,7 @@ void ExperimentalButton::paintEvent(QPaintEvent *event) {
p.setRenderHint(QPainter::Antialiasing);
QPoint center(btn_size / 2, btn_size / 2);
QPixmap img = isChecked() ? experimental_img : engage_img;
QPixmap img = experimental_mode ? experimental_img : engage_img;
p.setOpacity(1.0);
p.setPen(Qt::NoPen);
selfdrive/ui/qt/onroad.h
+2
View File
@@ -38,10 +38,12 @@ public:
private:
void paintEvent(QPaintEvent *event) override;
void changeMode();
Params params;
QPixmap engage_img;
QPixmap experimental_img;
bool experimental_mode;
};
// container window for the NVG UI