IQ.Pilot Release Commit @ 661a2de

tools/cabana/dbc/dbcmanager.h

@@ -1,44 +1,52 @@
 #pragma once
 
-#include <QObject>
+#include <functional>
 #include <memory>
 #include <map>
 #include <set>
+#include <string>
+#include <vector>
 
 #include "tools/cabana/dbc/dbcfile.h"
 
 typedef std::set<int> SourceSet;
 const SourceSet SOURCE_ALL = {-1};
-const int INVALID_SOURCE = 0xff;
 inline bool operator<(const std::shared_ptr<DBCFile> &l, const std::shared_ptr<DBCFile> &r) { return l.get() < r.get(); }
 
-class DBCManager : public QObject {
-  Q_OBJECT
-
+class DBCManager {
 public:
-  DBCManager(QObject *parent) : QObject(parent) {}
-  ~DBCManager() {}
-  bool open(const SourceSet &sources, const QString &dbc_file_name, QString *error = nullptr);
-  bool open(const SourceSet &sources, const QString &name, const QString &content, QString *error = nullptr);
+  struct Callbacks {
+    std::function<void(MessageId, const cabana::Signal *)> signal_added;
+    std::function<void(const cabana::Signal *)> signal_removed;
+    std::function<void(const cabana::Signal *)> signal_updated;
+    std::function<void(MessageId)> msg_updated;
+    std::function<void(MessageId)> msg_removed;
+    std::function<void()> file_changed;
+    std::function<void()> mask_updated;
+  };
+
+  DBCManager() = default;
+  bool open(const SourceSet &sources, const std::string &dbc_file_name, std::string *error = nullptr);
+  bool open(const SourceSet &sources, const std::string &name, const std::string &content, std::string *error = nullptr);
   void close(const SourceSet &sources);
   void close(DBCFile *dbc_file);
   void closeAll();
 
   void addSignal(const MessageId &id, const cabana::Signal &sig);
-  void updateSignal(const MessageId &id, const QString &sig_name, const cabana::Signal &sig);
-  void removeSignal(const MessageId &id, const QString &sig_name);
+  void updateSignal(const MessageId &id, const std::string &sig_name, const cabana::Signal &sig);
+  void removeSignal(const MessageId &id, const std::string &sig_name);
 
-  void updateMsg(const MessageId &id, const QString &name, uint32_t size, const QString &node, const QString &comment);
+  void updateMsg(const MessageId &id, const std::string &name, uint32_t size, const std::string &node, const std::string &comment);
   void removeMsg(const MessageId &id);
 
-  QString newMsgName(const MessageId &id);
-  QString newSignalName(const MessageId &id);
+  std::string newMsgName(const MessageId &id);
+  std::string newSignalName(const MessageId &id);
 
   const std::map<uint32_t, cabana::Msg> &getMessages(uint8_t source);
   cabana::Msg *msg(const MessageId &id);
-  cabana::Msg* msg(uint8_t source, const QString &name);
+  cabana::Msg* msg(uint8_t source, const std::string &name);
 
-  QStringList signalNames();
+  std::vector<std::string> signalNames();
   inline int dbcCount() { return allDBCFiles().size(); }
   int nonEmptyDBCCount();
 
@@ -46,24 +54,17 @@ public:
   DBCFile *findDBCFile(const uint8_t source);
   inline DBCFile *findDBCFile(const MessageId &id) { return findDBCFile(id.source); }
   std::set<DBCFile *> allDBCFiles();
-
-signals:
-  void signalAdded(MessageId id, const cabana::Signal *sig);
-  void signalRemoved(const cabana::Signal *sig);
-  void signalUpdated(const cabana::Signal *sig);
-  void msgUpdated(MessageId id);
-  void msgRemoved(MessageId id);
-  void DBCFileChanged();
-  void maskUpdated();
+  void setCallbacks(Callbacks callbacks) { callbacks_ = std::move(callbacks); }
 
 private:
   std::map<int, std::shared_ptr<DBCFile>> dbc_files;
+  Callbacks callbacks_;
 };
 
 DBCManager *dbc();
 
-QString toString(const SourceSet &ss);
-inline QString msgName(const MessageId &id) {
+std::string toString(const SourceSet &ss);
+inline std::string msgName(const MessageId &id) {
   auto msg = dbc()->msg(id);
   return msg ? msg->name : UNTITLED;
 }