cabana: split SettingsDialog out of settings (#38719)

cabana: split SettingsDialog out of settings.{h,cc}

openpilot/tools/cabana/SConscript

@@ -102,7 +102,7 @@ cabana_srcs = ['mainwin.cc', 'streams/pandastream.cc', 'streams/devicestream.cc'
                'routesdialog.cc', 'dbc/dbc.cc', 'dbc/dbcfile.cc', 'dbc/dbcmanager.cc',
                'utils/export.cc', 'utils/util.cc', 'utils/strings.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',
+               'commands.cc', 'messageswidget.cc', 'streamselector.cc', 'settings.cc', 'settingsdialog.cc', 'panda.cc',
                'cameraview.cc', 'detailwidget.cc', 'tools/findsimilarbits.cc', 'tools/findsignal.cc', 'tools/routeinfo.cc']
 if arch != "Darwin":
   cabana_srcs += ['streams/socketcanstream.cc']

openpilot/tools/cabana/mainwin.cc

@@ -19,6 +19,7 @@
 
 #include "json11/json11.hpp"
 #include "tools/cabana/commands.h"
+#include "tools/cabana/settingsdialog.h"
 #include "tools/cabana/streamselector.h"
 #include "tools/cabana/tools/findsignal.h"
 #include "tools/cabana/utils/export.h"
@@ -617,7 +618,7 @@ void MainWindow::closeEvent(QCloseEvent *event) {
 }
 
 void MainWindow::setOption() {
-  SettingsDlg dlg(this);
+  SettingsDialog dlg(this);
   dlg.exec();
 }
 

openpilot/tools/cabana/settings.cc

@@ -24,19 +24,11 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
-#include <QAbstractButton>
-#include <QDialogButtonBox>
-#include <QFileDialog>
-#include <QFormLayout>
-#include <QPushButton>
 #include <type_traits>
 
 #include "json11/json11.hpp"
 #include "tools/cabana/utils/util.h"
 
-const int MIN_CACHE_MINIUTES = 30;
-const int MAX_CACHE_MINIUTES = 120;
-
 Settings settings;
 
 namespace {
@@ -535,84 +527,3 @@ void Settings::save() {
   settingsOp(stored_settings.values, [](auto &s, const char *key, const auto &value) { writeSetting(s, key, value); });
   saveSettings(stored_settings.values);
 }
-
-// SettingsDlg
-
-SettingsDlg::SettingsDlg(QWidget *parent) : QDialog(parent) {
-  setWindowTitle(tr("Settings"));
-  QVBoxLayout *main_layout = new QVBoxLayout(this);
-  QGroupBox *groupbox = new QGroupBox("General");
-  QFormLayout *form_layout = new QFormLayout(groupbox);
-
-  form_layout->addRow(tr("Color Theme"), theme = new QComboBox(this));
-  theme->setToolTip(tr("You may need to restart cabana after changes theme"));
-  theme->addItems({tr("Automatic"), tr("Light"), tr("Dark")});
-  theme->setCurrentIndex(settings.theme);
-
-  form_layout->addRow("FPS", fps = new QSpinBox(this));
-  fps->setRange(10, 100);
-  fps->setSingleStep(10);
-  fps->setValue(settings.fps);
-
-  form_layout->addRow(tr("Max Cached Minutes"), cached_minutes = new QSpinBox(this));
-  cached_minutes->setRange(MIN_CACHE_MINIUTES, MAX_CACHE_MINIUTES);
-  cached_minutes->setSingleStep(1);
-  cached_minutes->setValue(settings.max_cached_minutes);
-  main_layout->addWidget(groupbox);
-
-  groupbox = new QGroupBox("New Signal Settings");
-  form_layout = new QFormLayout(groupbox);
-  form_layout->addRow(tr("Drag Direction"), drag_direction = new QComboBox(this));
-  drag_direction->addItems({tr("MSB First"), tr("LSB First"), tr("Always Little Endian"), tr("Always Big Endian")});
-  drag_direction->setCurrentIndex(settings.drag_direction);
-  main_layout->addWidget(groupbox);
-
-  groupbox = new QGroupBox("Chart");
-  form_layout = new QFormLayout(groupbox);
-  form_layout->addRow(tr("Chart Height"), chart_height = new QSpinBox(this));
-  chart_height->setRange(100, 500);
-  chart_height->setSingleStep(10);
-  chart_height->setValue(settings.chart_height);
-  main_layout->addWidget(groupbox);
-
-  log_livestream = new QGroupBox(tr("Enable live stream logging"), this);
-  log_livestream->setCheckable(true);
-  log_livestream->setChecked(settings.log_livestream);
-  QHBoxLayout *path_layout = new QHBoxLayout(log_livestream);
-  path_layout->addWidget(log_path = new QLineEdit(QString::fromStdString(settings.log_path), this));
-  log_path->setReadOnly(true);
-  auto browse_btn = new QPushButton(tr("B&rowse..."));
-  path_layout->addWidget(browse_btn);
-  main_layout->addWidget(log_livestream);
-
-  auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-  main_layout->addWidget(buttonBox);
-  setFixedSize(400, sizeHint().height());
-
-  QObject::connect(browse_btn, &QPushButton::clicked, [this]() {
-    QString fn = QFileDialog::getExistingDirectory(
-        this, tr("Log File Location"),
-        QString::fromStdString(utils::homePath()),
-        QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
-    if (!fn.isEmpty()) {
-      log_path->setText(fn);
-    }
-  });
-  QObject::connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-  QObject::connect(buttonBox, &QDialogButtonBox::accepted, this, &SettingsDlg::save);
-}
-
-void SettingsDlg::save() {
-  if (std::exchange(settings.theme, theme->currentIndex()) != settings.theme) {
-    // set theme before emit changed
-    utils::setTheme(settings.theme);
-  }
-  settings.fps = fps->value();
-  settings.max_cached_minutes = cached_minutes->value();
-  settings.chart_height = chart_height->value();
-  settings.log_livestream = log_livestream->isChecked();
-  settings.log_path = log_path->text().toStdString();
-  settings.drag_direction = (Settings::DragDirection)drag_direction->currentIndex();
-  settings.changed();
-  QDialog::accept();
-}

openpilot/tools/cabana/settings.h

@@ -3,12 +3,6 @@
 #include <cstdint>
 #include <vector>
 
-#include <QComboBox>
-#include <QDialog>
-#include <QGroupBox>
-#include <QLineEdit>
-#include <QSpinBox>
-
 #include "tools/cabana/core/observable.h"
 #include "tools/cabana/core/settings.h"
 
@@ -26,18 +20,4 @@ public:
   Observable<> changed;
 };
 
-class SettingsDlg : public QDialog {
-public:
-  SettingsDlg(QWidget *parent);
-  void save();
-  QSpinBox *fps;
-  QSpinBox *cached_minutes;
-  QSpinBox *chart_height;
-  QComboBox *chart_series_type;
-  QComboBox *theme;
-  QGroupBox *log_livestream;
-  QLineEdit *log_path;
-  QComboBox *drag_direction;
-};
-
 extern Settings settings;

openpilot/tools/cabana/settingsdialog.cc

@@ -0,0 +1,94 @@
+#include "tools/cabana/settingsdialog.h"
+
+#include <utility>
+
+#include <QDialogButtonBox>
+#include <QFileDialog>
+#include <QFormLayout>
+#include <QPushButton>
+#include <QVBoxLayout>
+
+#include "tools/cabana/settings.h"
+#include "tools/cabana/utils/util.h"
+
+const int MIN_CACHE_MINIUTES = 30;
+const int MAX_CACHE_MINIUTES = 120;
+
+SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) {
+  setWindowTitle(tr("Settings"));
+  QVBoxLayout *main_layout = new QVBoxLayout(this);
+  QGroupBox *groupbox = new QGroupBox("General");
+  QFormLayout *form_layout = new QFormLayout(groupbox);
+
+  form_layout->addRow(tr("Color Theme"), theme = new QComboBox(this));
+  theme->setToolTip(tr("You may need to restart cabana after changes theme"));
+  theme->addItems({tr("Automatic"), tr("Light"), tr("Dark")});
+  theme->setCurrentIndex(settings.theme);
+
+  form_layout->addRow("FPS", fps = new QSpinBox(this));
+  fps->setRange(10, 100);
+  fps->setSingleStep(10);
+  fps->setValue(settings.fps);
+
+  form_layout->addRow(tr("Max Cached Minutes"), cached_minutes = new QSpinBox(this));
+  cached_minutes->setRange(MIN_CACHE_MINIUTES, MAX_CACHE_MINIUTES);
+  cached_minutes->setSingleStep(1);
+  cached_minutes->setValue(settings.max_cached_minutes);
+  main_layout->addWidget(groupbox);
+
+  groupbox = new QGroupBox("New Signal Settings");
+  form_layout = new QFormLayout(groupbox);
+  form_layout->addRow(tr("Drag Direction"), drag_direction = new QComboBox(this));
+  drag_direction->addItems({tr("MSB First"), tr("LSB First"), tr("Always Little Endian"), tr("Always Big Endian")});
+  drag_direction->setCurrentIndex(settings.drag_direction);
+  main_layout->addWidget(groupbox);
+
+  groupbox = new QGroupBox("Chart");
+  form_layout = new QFormLayout(groupbox);
+  form_layout->addRow(tr("Chart Height"), chart_height = new QSpinBox(this));
+  chart_height->setRange(100, 500);
+  chart_height->setSingleStep(10);
+  chart_height->setValue(settings.chart_height);
+  main_layout->addWidget(groupbox);
+
+  log_livestream = new QGroupBox(tr("Enable live stream logging"), this);
+  log_livestream->setCheckable(true);
+  log_livestream->setChecked(settings.log_livestream);
+  QHBoxLayout *path_layout = new QHBoxLayout(log_livestream);
+  path_layout->addWidget(log_path = new QLineEdit(QString::fromStdString(settings.log_path), this));
+  log_path->setReadOnly(true);
+  auto browse_btn = new QPushButton(tr("B&rowse..."));
+  path_layout->addWidget(browse_btn);
+  main_layout->addWidget(log_livestream);
+
+  auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+  main_layout->addWidget(buttonBox);
+  setFixedSize(400, sizeHint().height());
+
+  QObject::connect(browse_btn, &QPushButton::clicked, [this]() {
+    QString fn = QFileDialog::getExistingDirectory(
+        this, tr("Log File Location"),
+        QString::fromStdString(utils::homePath()),
+        QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+    if (!fn.isEmpty()) {
+      log_path->setText(fn);
+    }
+  });
+  QObject::connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+  QObject::connect(buttonBox, &QDialogButtonBox::accepted, this, &SettingsDialog::save);
+}
+
+void SettingsDialog::save() {
+  if (std::exchange(settings.theme, theme->currentIndex()) != settings.theme) {
+    // set theme before emit changed
+    utils::setTheme(settings.theme);
+  }
+  settings.fps = fps->value();
+  settings.max_cached_minutes = cached_minutes->value();
+  settings.chart_height = chart_height->value();
+  settings.log_livestream = log_livestream->isChecked();
+  settings.log_path = log_path->text().toStdString();
+  settings.drag_direction = (Settings::DragDirection)drag_direction->currentIndex();
+  settings.changed();
+  QDialog::accept();
+}

openpilot/tools/cabana/settingsdialog.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <QComboBox>
+#include <QDialog>
+#include <QGroupBox>
+#include <QLineEdit>
+#include <QSpinBox>
+
+class SettingsDialog : public QDialog {
+public:
+  SettingsDialog(QWidget *parent);
+  void save();
+  QSpinBox *fps;
+  QSpinBox *cached_minutes;
+  QSpinBox *chart_height;
+  QComboBox *chart_series_type;
+  QComboBox *theme;
+  QGroupBox *log_livestream;
+  QLineEdit *log_path;
+  QComboBox *drag_direction;
+};

openpilot/tools/cabana/utils/util.h

@@ -12,9 +12,14 @@
 
 #include <QApplication>
 #include <QColor>
+#include <QComboBox>
+#include <QDialog>
 #include <QFont>
 #include <QFontMetrics>
+#include <QGroupBox>
+#include <QLineEdit>
 #include <QPainter>
+#include <QSpinBox>
 #include <QStaticText>
 #include <QStringBuilder>
 #include <QStyledItemDelegate>