IQ.Pilot Release Commit @ 661a2de

tools/cabana/dbc/dbcmanager.cc

@@ -1,10 +1,10 @@
 #include "tools/cabana/dbc/dbcmanager.h"
 
-#include <QSet>
 #include <algorithm>
-#include <numeric>
+#include <cassert>
+#include <set>
 
-bool DBCManager::open(const SourceSet &sources, const QString &dbc_file_name, QString *error) {
+bool DBCManager::open(const SourceSet &sources, const std::string &dbc_file_name, std::string *error) {
   try {
     auto it = std::find_if(dbc_files.begin(), dbc_files.end(),
                            [&](auto &f) { return f.second && f.second->filename == dbc_file_name; });
@@ -17,11 +17,11 @@ bool DBCManager::open(const SourceSet &sources, const QString &dbc_file_name, QS
     return false;
   }
 
-  emit DBCFileChanged();
+  if (callbacks_.file_changed) callbacks_.file_changed();
   return true;
 }
 
-bool DBCManager::open(const SourceSet &sources, const QString &name, const QString &content, QString *error) {
+bool DBCManager::open(const SourceSet &sources, const std::string &name, const std::string &content, std::string *error) {
   try {
     auto file = std::make_shared<DBCFile>(name, content);
     for (auto s : sources) {
@@ -32,7 +32,7 @@ bool DBCManager::open(const SourceSet &sources, const QString &name, const QStri
     return false;
   }
 
-  emit DBCFileChanged();
+  if (callbacks_.file_changed) callbacks_.file_changed();
   return true;
 }
 
@@ -40,69 +40,71 @@ void DBCManager::close(const SourceSet &sources) {
   for (auto s : sources) {
     dbc_files[s] = nullptr;
   }
-  emit DBCFileChanged();
+  if (callbacks_.file_changed) callbacks_.file_changed();
 }
 
 void DBCManager::close(DBCFile *dbc_file) {
   for (auto &[_, f] : dbc_files) {
     if (f.get() == dbc_file) f = nullptr;
   }
-  emit DBCFileChanged();
+  if (callbacks_.file_changed) callbacks_.file_changed();
 }
 
 void DBCManager::closeAll() {
   dbc_files.clear();
-  emit DBCFileChanged();
+  if (callbacks_.file_changed) callbacks_.file_changed();
 }
 
 void DBCManager::addSignal(const MessageId &id, const cabana::Signal &sig) {
   if (auto m = msg(id)) {
     if (auto s = m->addSignal(sig)) {
-      emit signalAdded(id, s);
-      emit maskUpdated();
+      if (callbacks_.signal_added) callbacks_.signal_added(id, s);
+      if (callbacks_.mask_updated) callbacks_.mask_updated();
     }
   }
 }
 
-void DBCManager::updateSignal(const MessageId &id, const QString &sig_name, const cabana::Signal &sig) {
+void DBCManager::updateSignal(const MessageId &id, const std::string &sig_name, const cabana::Signal &sig) {
   if (auto m = msg(id)) {
     if (auto s = m->updateSignal(sig_name, sig)) {
-      emit signalUpdated(s);
-      emit maskUpdated();
+      if (callbacks_.signal_updated) callbacks_.signal_updated(s);
+      if (callbacks_.mask_updated) callbacks_.mask_updated();
     }
   }
 }
 
-void DBCManager::removeSignal(const MessageId &id, const QString &sig_name) {
+void DBCManager::removeSignal(const MessageId &id, const std::string &sig_name) {
   if (auto m = msg(id)) {
     if (auto s = m->sig(sig_name)) {
-      emit signalRemoved(s);
+      if (callbacks_.signal_removed) callbacks_.signal_removed(s);
       m->removeSignal(sig_name);
-      emit maskUpdated();
+      if (callbacks_.mask_updated) callbacks_.mask_updated();
     }
   }
 }
 
-void DBCManager::updateMsg(const MessageId &id, const QString &name, uint32_t size, const QString &node, const QString &comment) {
+void DBCManager::updateMsg(const MessageId &id, const std::string &name, uint32_t size, const std::string &node, const std::string &comment) {
   auto dbc_file = findDBCFile(id);
   assert(dbc_file);  // This should be impossible
   dbc_file->updateMsg(id, name, size, node, comment);
-  emit msgUpdated(id);
+  if (callbacks_.msg_updated) callbacks_.msg_updated(id);
 }
 
 void DBCManager::removeMsg(const MessageId &id) {
   auto dbc_file = findDBCFile(id);
   assert(dbc_file);  // This should be impossible
   dbc_file->removeMsg(id);
-  emit msgRemoved(id);
-  emit maskUpdated();
+  if (callbacks_.msg_removed) callbacks_.msg_removed(id);
+  if (callbacks_.mask_updated) callbacks_.mask_updated();
 }
 
-QString DBCManager::newMsgName(const MessageId &id) {
-  return QString("NEW_MSG_") + QString::number(id.address, 16).toUpper();
+std::string DBCManager::newMsgName(const MessageId &id) {
+  char buf[64];
+  snprintf(buf, sizeof(buf), "NEW_MSG_%X", id.address);
+  return buf;
 }
 
-QString DBCManager::newSignalName(const MessageId &id) {
+std::string DBCManager::newSignalName(const MessageId &id) {
   auto m = msg(id);
   return m ? m->newSignalName() : "";
 }
@@ -118,14 +120,14 @@ cabana::Msg *DBCManager::msg(const MessageId &id) {
   return dbc_file ? dbc_file->msg(id) : nullptr;
 }
 
-cabana::Msg *DBCManager::msg(uint8_t source, const QString &name) {
+cabana::Msg *DBCManager::msg(uint8_t source, const std::string &name) {
   auto dbc_file = findDBCFile(source);
   return dbc_file ? dbc_file->msg(name) : nullptr;
 }
 
-QStringList DBCManager::signalNames() {
+std::vector<std::string> DBCManager::signalNames() {
   // Used for autocompletion
-  QSet<QString> names;
+  std::set<std::string> names;
   for (auto &f : allDBCFiles()) {
     for (auto &[_, m] : f->getMessages()) {
       for (auto sig : m.getSignals()) {
@@ -133,8 +135,8 @@ QStringList DBCManager::signalNames() {
       }
     }
   }
-  QStringList ret = names.values();
-  ret.sort();
+  std::vector<std::string> ret(names.begin(), names.end());
+  std::sort(ret.begin(), ret.end());
   return ret;
 }
 
@@ -165,14 +167,16 @@ const SourceSet DBCManager::sources(const DBCFile *dbc_file) const {
   return sources;
 }
 
-QString toString(const SourceSet &ss) {
-  return std::accumulate(ss.cbegin(), ss.cend(), QString(), [](QString str, int source) {
-    if (!str.isEmpty()) str += ", ";
-    return str + (source == -1 ? QStringLiteral("all") : QString::number(source));
-  });
+std::string toString(const SourceSet &ss) {
+  std::string result;
+  for (int source : ss) {
+    if (!result.empty()) result += ", ";
+    result += (source == -1) ? "all" : std::to_string(source);
+  }
+  return result;
 }
 
 DBCManager *dbc() {
-  static DBCManager dbc_manager(nullptr);
+  static DBCManager dbc_manager;
   return &dbc_manager;
 }