cabana: move dbc related files to dbc/ (#27712)

* move dbc related files to dbc/ * move generate_dbc_json.py to dbc/ old-commit-hash: 8903e03c88
2 years ago · 640d68e3bc
parent ad5b489005
commit 640d68e3bc
22 changed files with 23 additions and 22 deletions
--- a/tools/cabana/.gitignore
+++ b/tools/cabana/.gitignore
@ -3,5 +3,5 @@ moc_*

 _cabana
 settings
-car_fingerprint_to_dbc.json
+dbc/car_fingerprint_to_dbc.json
 tests/_test_cabana
--- a/tools/cabana/SConscript
+++ b/tools/cabana/SConscript
@ -28,7 +28,8 @@ cabana_env.Depends(assets, Glob('/assets/*', exclude=[assets, assets_src, "asset

 prev_moc_path = cabana_env['QT_MOCHPREFIX']
 cabana_env['QT_MOCHPREFIX'] = os.path.dirname(prev_moc_path) + '/cabana/moc_'
-cabana_lib = cabana_env.Library("cabana_lib", ['mainwin.cc', 'streams/livestream.cc', 'streams/abstractstream.cc', 'streams/replaystream.cc', 'binaryview.cc', 'chartswidget.cc', 'historylog.cc', 'videowidget.cc', 'signaledit.cc', 'dbc.cc', 'dbcfile.cc', 'dbcmanager.cc',
+cabana_lib = cabana_env.Library("cabana_lib", ['mainwin.cc', 'streams/livestream.cc', 'streams/abstractstream.cc', 'streams/replaystream.cc', 'binaryview.cc', 'chartswidget.cc', 'historylog.cc', 'videowidget.cc', 'signaledit.cc', 
+                                               'dbc/dbc.cc', 'dbc/dbcfile.cc', 'dbc/dbcmanager.cc',
                                               'commands.cc', 'messageswidget.cc', 'route.cc', 'settings.cc', 'util.cc', 'detailwidget.cc', 'tools/findsimilarbits.cc'], LIBS=cabana_libs, FRAMEWORKS=base_frameworks)
 cabana_env.Program('_cabana', ['cabana.cc', cabana_lib, assets], LIBS=cabana_libs, FRAMEWORKS=base_frameworks)

@ -39,5 +40,5 @@ if GetOption('test'):
  cabana_env.Program('tests/_test_cabana', ['tests/test_runner.cc', 'tests/test_cabana.cc', cabana_lib], LIBS=[cabana_libs])

 def generate_dbc_json(target, source, env):
-  env.Execute('tools/cabana/generate_dbc_json.py --out tools/cabana/car_fingerprint_to_dbc.json')
+  env.Execute('tools/cabana/dbc/generate_dbc_json.py --out tools/cabana/dbc/car_fingerprint_to_dbc.json')
 cabana_env.Command('generate_dbc_json', [], generate_dbc_json)
--- a/tools/cabana/binaryview.h
+++ b/tools/cabana/binaryview.h
@ -6,7 +6,7 @@
 #include <QStyledItemDelegate>
 #include <QTableView>

-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"

 class BinaryItemDelegate : public QStyledItemDelegate {
--- a/tools/cabana/chartswidget.h
+++ b/tools/cabana/chartswidget.h
@ -13,7 +13,7 @@
 #include <QtCharts/QScatterSeries>
 #include <QtCharts/QValueAxis>

-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"
 using namespace QtCharts;

--- a/tools/cabana/commands.h
+++ b/tools/cabana/commands.h
@ -3,7 +3,7 @@
 #include <QUndoCommand>
 #include <QUndoStack>

-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"

 class EditMsgCommand : public QUndoCommand {
--- a/tools/cabana/dbc/dbc.cc
+++ b/tools/cabana/dbc/dbc.cc
@ -1,4 +1,4 @@
-#include "tools/cabana/dbc.h"
+#include "tools/cabana/dbc/dbc.h"
 #include "tools/cabana/util.h"

 uint qHash(const MessageId &item) {
--- a/tools/cabana/dbc/dbc.h
+++ b/tools/cabana/dbc/dbc.h
--- a/tools/cabana/dbc/dbcfile.cc
+++ b/tools/cabana/dbc/dbcfile.cc
@ -1,4 +1,4 @@
-#include "tools/cabana/dbcfile.h"
+#include "tools/cabana/dbc/dbcfile.h"

 #include <QDebug>

--- a/tools/cabana/dbc/dbcfile.h
+++ b/tools/cabana/dbc/dbcfile.h
@ -8,7 +8,7 @@
 #include <QSet>
 #include <QDebug>

-#include "tools/cabana/dbc.h"
+#include "tools/cabana/dbc/dbc.h"

 const QString AUTO_SAVE_EXTENSION = ".tmp";

--- a/tools/cabana/dbc/dbcmanager.cc
+++ b/tools/cabana/dbc/dbcmanager.cc
@ -1,4 +1,4 @@
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"

 #include <QFile>
 #include <QRegularExpression>
--- a/tools/cabana/dbc/dbcmanager.h
+++ b/tools/cabana/dbc/dbcmanager.h
@ -8,8 +8,8 @@
 #include <QSet>
 #include <QDebug>

-#include "tools/cabana/dbc.h"
-#include "tools/cabana/dbcfile.h"
+#include "tools/cabana/dbc/dbc.h"
+#include "tools/cabana/dbc/dbcfile.h"

 typedef QSet<uint8_t> SourceSet;
 const SourceSet SOURCE_ALL = {};
--- a/tools/cabana/dbc/generate_dbc_json.py
+++ b/tools/cabana/dbc/generate_dbc_json.py
--- a/tools/cabana/historylog.h
+++ b/tools/cabana/historylog.h
@ -7,7 +7,7 @@
 #include <QLineEdit>
 #include <QTableView>

-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"
 #include "tools/cabana/util.h"

--- a/tools/cabana/mainwin.cc
+++ b/tools/cabana/mainwin.cc
@ -55,7 +55,7 @@ MainWindow::MainWindow() : QMainWindow() {
  main_win = this;
  qInstallMessageHandler(qLogMessageHandler);

-  for (const QString &fn : {"./car_fingerprint_to_dbc.json", "./tools/cabana/car_fingerprint_to_dbc.json"}) {
+  for (const QString &fn : {"./dbc/car_fingerprint_to_dbc.json", "./tools/cabana/dbc/car_fingerprint_to_dbc.json"}) {
    QFile json_file(fn);
    if (json_file.open(QIODevice::ReadOnly)) {
      fingerprint_to_dbc = QJsonDocument::fromJson(json_file.readAll());
--- a/tools/cabana/mainwin.h
+++ b/tools/cabana/mainwin.h
@ -8,7 +8,7 @@
 #include <QStatusBar>

 #include "tools/cabana/chartswidget.h"
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/detailwidget.h"
 #include "tools/cabana/messageswidget.h"
 #include "tools/cabana/videowidget.h"
--- a/tools/cabana/messageswidget.h
+++ b/tools/cabana/messageswidget.h
@ -6,7 +6,7 @@
 #include <QSet>
 #include <QTableView>

-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"

 class MessageListModel : public QAbstractTableModel {
--- a/tools/cabana/streams/abstractstream.h
+++ b/tools/cabana/streams/abstractstream.h
@ -6,7 +6,7 @@
 #include <QColor>
 #include <QHash>

-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/settings.h"
 #include "tools/cabana/util.h"
 #include "tools/replay/replay.h"
--- a/tools/cabana/tests/test_cabana.cc
+++ b/tools/cabana/tests/test_cabana.cc
@ -3,7 +3,7 @@
 #undef INFO
 #include "catch2/catch.hpp"
 #include "tools/replay/logreader.h"
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"

 // demo route, first segment
--- a/tools/cabana/tools/findsimilarbits.cc
+++ b/tools/cabana/tools/findsimilarbits.cc
@ -8,7 +8,7 @@
 #include <QPushButton>
 #include <QRadioButton>

-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"

 FindSimilarBitsDlg::FindSimilarBitsDlg(QWidget *parent) : QDialog(parent, Qt::WindowFlags() | Qt::Window) {
--- a/tools/cabana/tools/findsimilarbits.h
+++ b/tools/cabana/tools/findsimilarbits.h
@ -6,7 +6,7 @@
 #include <QSpinBox>
 #include <QTableWidget>

-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"

 class FindSimilarBitsDlg : public QDialog {
  Q_OBJECT
--- a/tools/cabana/util.h
+++ b/tools/cabana/util.h
@ -12,7 +12,7 @@
 #include <QToolButton>
 #include <QVector>

-#include "tools/cabana/dbc.h"
+#include "tools/cabana/dbc/dbc.h"

 class ChangeTracker {
 public:
--- a/tools/cabana/videowidget.h
+++ b/tools/cabana/videowidget.h
@ -12,7 +12,7 @@

 #include "selfdrive/ui/qt/widgets/cameraview.h"
 #include "selfdrive/ui/qt/widgets/controls.h"
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"

 class Slider : public QSlider {