IQ.Pilot Release Commit @ e46d557

tools/cabana/utils/util.h

@@ -1,26 +1,32 @@
 #pragma once
 
 #include <array>
+#include <atomic>
 #include <cmath>
+#include <filesystem>
+#include <string>
+#include <thread>
 #include <vector>
 #include <utility>
 
 #include <QApplication>
-#include <QByteArray>
-#include <QDoubleValidator>
+#include <QColor>
 #include <QFont>
 #include <QFontMetrics>
 #include <QPainter>
-#include <QRegExpValidator>
-#include <QSocketNotifier>
 #include <QStaticText>
 #include <QStringBuilder>
 #include <QStyledItemDelegate>
 #include <QToolButton>
+#include <QValidator>
 
 #include "tools/cabana/dbc/dbc.h"
 #include "tools/cabana/settings.h"
 
+inline QColor toQColor(const CabanaColor &color) {
+  return QColor(color.r, color.g, color.b, color.a);
+}
+
 class LogSlider : public QSlider {
   Q_OBJECT
 
@@ -84,22 +90,53 @@ private:
   int h_margin, v_margin;
 };
 
-class NameValidator : public QRegExpValidator {
+// Accepts a single identifier: one or more [A-Za-z0-9_], spaces rewritten to '_'.
+class NameValidator : public QValidator {
   Q_OBJECT
 public:
   NameValidator(QObject *parent=nullptr);
   QValidator::State validate(QString &input, int &pos) const override;
 };
 
-class DoubleValidator : public QDoubleValidator {
+// Accepts comma-separated identifiers: \w+(,\w+)*
+class NodeValidator : public QValidator {
+  Q_OBJECT
+public:
+  NodeValidator(QObject *parent=nullptr);
+  QValidator::State validate(QString &input, int &pos) const override;
+};
+
+// Accepts one or more non-whitespace characters (\S+).
+class NonWhitespaceValidator : public QValidator {
+  Q_OBJECT
+public:
+  NonWhitespaceValidator(QObject *parent=nullptr);
+  QValidator::State validate(QString &input, int &pos) const override;
+};
+
+// Accepts a dotted IPv4 address (0-255 per octet).
+class IpAddressValidator : public QValidator {
+  Q_OBJECT
+public:
+  IpAddressValidator(QObject *parent=nullptr);
+  QValidator::State validate(QString &input, int &pos) const override;
+};
+
+// C-locale floating-point validator (matches QString::toDouble).
+class DoubleValidator : public QValidator {
   Q_OBJECT
 public:
   DoubleValidator(QObject *parent = nullptr);
+  QValidator::State validate(QString &input, int &pos) const override;
 };
 
 namespace utils {
 
 QPixmap icon(const QString &id);
+std::string homePath();
+std::filesystem::path configPath();
+bool getClipboardText(std::string *text);  // false if no clipboard tool is available
+bool setClipboardText(const std::string &text);
 bool isDarkTheme();
 void setTheme(int theme);
 QString formatSeconds(double sec, bool include_milliseconds = false, bool absolute_time = false);
@@ -108,7 +145,22 @@ inline void drawStaticText(QPainter *p, const QRect &r, const QStaticText &text)
   p->drawStaticText(r.left() + size.width(), r.top() + size.height(), text);
 }
 inline QString toHex(const std::vector<uint8_t> &dat, char separator = '\0') {
-  return QByteArray::fromRawData((const char *)dat.data(), dat.size()).toHex(separator).toUpper();
+  static const char digits[] = "0123456789ABCDEF";
+  QString hex;
+  hex.reserve(dat.size() * (separator ? 3 : 2));
+  for (size_t i = 0; i < dat.size(); ++i) {
+    if (separator && i) hex += QLatin1Char(separator);
+    hex += QLatin1Char(digits[dat[i] >> 4]);
+    hex += QLatin1Char(digits[dat[i] & 0xf]);
+  }
+  return hex;
+}
+
+// boundary conversions for the remaining Qt byte-array based state APIs
+template <typename T>
+std::vector<uint8_t> toBytes(const T &dat) { return {dat.begin(), dat.end()}; }
+inline auto qbytes(const std::vector<uint8_t> &dat) {
+  return decltype(QString().toUtf8())((const char *)dat.data(), (int)dat.size());
 }
 
 }
@@ -147,20 +199,18 @@ private:
   void closeTabClicked();
 };
 
-class UnixSignalHandler : public QObject {
-  Q_OBJECT
-
+// Watches SIGINT/SIGTERM via a self-pipe and a dedicated waiter thread
+// (no Qt notifiers/timers). Exit is marshaled onto the GUI thread.
+class UnixSignalHandler {
 public:
-  UnixSignalHandler(QObject *parent = nullptr);
+  UnixSignalHandler();
   ~UnixSignalHandler();
   static void signalHandler(int s);
 
-public slots:
-  void handleSigTerm();
-
 private:
   inline static int sig_fd[2] = {};
-  QSocketNotifier *sn;
+  std::atomic<bool> shutting_down{false};
+  std::thread waiter;
 };
 
 int num_decimals(double num);