mawei/onepilot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cabana: fix multiple dialog popups (#28358)

Browse Source 
fix multiple popups
old-commit-hash: a19799cbe968a4f0633b591ff9ed27a9a3f35b61
This commit is contained in:
Dean Lee
2023-06-01 15:04:46 +08:00
committed by GitHub
parent 2bfd6317f3
commit c0883bcabe
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/cabana/mainwin.cc
View File

@@ -351,12 +351,13 @@ void MainWindow::streamStarted() {
}
void MainWindow::eventsMerged() {
if (!can->liveStreaming()) {
auto fingerprint = can->carFingerprint();
video_dock->setWindowTitle(tr("ROUTE: %1 FINGERPRINT: %2").arg(can->routeName()).arg(fingerprint.isEmpty() ? tr("Unknown Car") : fingerprint));
if (!can->liveStreaming() && std::exchange(car_fingerprint, can->carFingerprint()) != car_fingerprint) {
video_dock->setWindowTitle(tr("ROUTE: %1 FINGERPRINT: %2")
.arg(can->routeName())
.arg(car_fingerprint.isEmpty() ? tr("Unknown Car") : car_fingerprint));
// Don't overwrite already loaded DBC
if (!dbc()->msgCount() && !fingerprint.isEmpty()) {
auto dbc_name = fingerprint_to_dbc[fingerprint];
if (!dbc()->msgCount() && !car_fingerprint.isEmpty()) {
auto dbc_name = fingerprint_to_dbc[car_fingerprint];
if (dbc_name != QJsonValue::Undefined) {
loadDBCFromOpendbc(dbc_name.toString());
}

1
tools/cabana/mainwin.h
View File

@@ -95,6 +95,7 @@ protected:
QAction *save_dbc = nullptr;
QAction *save_dbc_as = nullptr;
QAction *copy_dbc_to_clipboard = nullptr;
QString car_fingerprint;
int prev_undostack_index = 0;
int prev_undostack_count = 0;
friend class OnlineHelp;