From 7cc48b5bc94e197bfce1ee88d865d16488d8c286 Mon Sep 17 00:00:00 2001
From: Trey Moen <50057480+greatgitsby@users.noreply.github.com>
Date: Thu, 27 Aug 2026 22:00:24 -0700
Subject: [PATCH] cabana: move RoutesDialog out of streams/ (#38716)

---
 openpilot/tools/cabana/SConscript                    |  2 +-
 .../cabana/{streams/routes.cc => routesdialog.cc}    | 12 ++++++------
 .../cabana/{streams/routes.h => routesdialog.h}      |  0
 openpilot/tools/cabana/streams/replaystream.cc       |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename openpilot/tools/cabana/{streams/routes.cc => routesdialog.cc} (94%)
 rename openpilot/tools/cabana/{streams/routes.h => routesdialog.h} (100%)

diff --git a/openpilot/tools/cabana/SConscript b/openpilot/tools/cabana/SConscript
index bc366ab6f..9c34de661 100644
--- a/openpilot/tools/cabana/SConscript
+++ b/openpilot/tools/cabana/SConscript
@@ -99,7 +99,7 @@ cabana_env.Command(assets, "assets/assets.qrc", f"rcc $SOURCES -o $TARGET")
 cabana_env.Depends(assets, Glob('/assets/*', exclude=[assets, "assets/assets.o"]))
 
 cabana_srcs = ['mainwin.cc', 'streams/pandastream.cc', 'streams/devicestream.cc', 'streams/livestream.cc', 'streams/abstractstream.cc', 'streams/replaystream.cc', 'binaryview.cc', 'historylog.cc', 'videowidget.cc', 'signalview.cc',
-               'streams/routes.cc', 'dbc/dbc.cc', 'dbc/dbcfile.cc', 'dbc/dbcmanager.cc',
+               'routesdialog.cc', 'dbc/dbc.cc', 'dbc/dbcfile.cc', 'dbc/dbcmanager.cc',
                'utils/export.cc', 'utils/util.cc', 'utils/elidedlabel.cc',
                'chart/chartswidget.cc', 'chart/chart.cc', 'chart/signalselector.cc', 'chart/tiplabel.cc', 'chart/sparkline.cc',
                'commands.cc', 'messageswidget.cc', 'streamselector.cc', 'settings.cc', 'panda.cc',
diff --git a/openpilot/tools/cabana/streams/routes.cc b/openpilot/tools/cabana/routesdialog.cc
similarity index 94%
rename from openpilot/tools/cabana/streams/routes.cc
rename to openpilot/tools/cabana/routesdialog.cc
index b6f98da53..35e23a6ee 100644
--- a/openpilot/tools/cabana/streams/routes.cc
+++ b/openpilot/tools/cabana/routesdialog.cc
@@ -1,4 +1,4 @@
-#include "tools/cabana/streams/routes.h"
+#include "tools/cabana/routesdialog.h"
 
 #include <chrono>
 #include <ctime>
@@ -6,7 +6,6 @@
 #include <thread>
 #include <utility>
 
-#include <QApplication>
 #include <QDialogButtonBox>
 #include <QFormLayout>
 #include <QListWidget>
@@ -14,6 +13,7 @@
 #include <QPainter>
 
 #include "json11/json11.hpp"
+#include "tools/cabana/utils/util.h"
 #include "tools/replay/py_downloader.h"
 
 namespace {
@@ -113,9 +113,9 @@ RoutesDialog::RoutesDialog(QWidget *parent) : QDialog(parent) {
   // Fetch devices
   std::thread([this, alive = std::weak_ptr<bool>(alive_)]() {
     std::string result = PyDownloader::getDevices();
-    QMetaObject::invokeMethod(qApp, [this, alive, r = QString::fromStdString(result), response = checkApiResponse(result)]() {
+    utils::runOnMainThread([this, alive, r = QString::fromStdString(result), response = checkApiResponse(result)]() {
       if (!alive.expired()) parseDeviceList(r, response.first, response.second);
-    }, Qt::QueuedConnection);
+    });
   }).detach();
 }
 
@@ -156,9 +156,9 @@ void RoutesDialog::fetchRoutes() {
   int request_id = ++fetch_id_;
   std::thread([this, alive = std::weak_ptr<bool>(alive_), did, start_ms, end_ms, preserved, request_id]() {
     std::string result = PyDownloader::getDeviceRoutes(did, start_ms, end_ms, preserved);
-    QMetaObject::invokeMethod(qApp, [this, alive, r = QString::fromStdString(result), response = checkApiResponse(result), request_id]() {
+    utils::runOnMainThread([this, alive, r = QString::fromStdString(result), response = checkApiResponse(result), request_id]() {
       if (!alive.expired() && fetch_id_ == request_id) parseRouteList(r, response.first, response.second);
-    }, Qt::QueuedConnection);
+    });
   }).detach();
 }
 
diff --git a/openpilot/tools/cabana/streams/routes.h b/openpilot/tools/cabana/routesdialog.h
similarity index 100%
rename from openpilot/tools/cabana/streams/routes.h
rename to openpilot/tools/cabana/routesdialog.h
diff --git a/openpilot/tools/cabana/streams/replaystream.cc b/openpilot/tools/cabana/streams/replaystream.cc
index 68f4fb305..56e4bfa08 100644
--- a/openpilot/tools/cabana/streams/replaystream.cc
+++ b/openpilot/tools/cabana/streams/replaystream.cc
@@ -10,7 +10,7 @@
 
 #include "common/timing.h"
 #include "common/util.h"
-#include "tools/cabana/streams/routes.h"
+#include "tools/cabana/routesdialog.h"
 
 ReplayStream::ReplayStream() {
   unsetenv("ZMQ");