Automatically add spaces between bytes in hex mode

alex-spataru · alex-spataru · commit da16abd7cf10 · 2021-02-16T18:32:03.000-05:00
diff --git a/assets/qml/Windows/Console.qml b/assets/qml/Windows/Console.qml
@@ -222,14 +222,22 @@ Control {
                 // Validate hex strings
                 //
                 validator: RegExpValidator {
-                    regExp: hexCheckbox.checked ? /^[a-fA-F0-9]+$/ : /[\s\S]*/
+                    regExp: hexCheckbox.checked ? /^(?:([a-f0-9]{2})\s*)+$/i : /[\s\S]*/
                 }
 
                 //
                 // Send data on <enter>
                 //
                 Keys.onReturnPressed: root.sendData()
 
+                //
+                // Add space automatically in hex view
+                //
+                onTextChanged: {
+                    if (hexCheckbox.checked)
+                        send.text = Cpp_IO_Console.formatUserHex(send.text)
+                }
+
                 //
                 // Navigate command history upwards with <up>
                 //
diff --git a/src/IO/Console.cpp b/src/IO/Console.cpp
@@ -197,6 +197,32 @@ QStringList Console::displayModes() const
     return list;
 }
 
+/**
+ * Validates the given @a text and adds space to display the text in a byte-oriented view
+ */
+QString Console::formatUserHex(const QString &text)
+{
+    // Remove spaces & stuff
+    auto data = text.simplified();
+    data = data.replace(" ", "");
+
+    // Convert to hex string with spaces between bytes
+    QString str;
+    for (int i = 0; i < data.length(); ++i)
+    {
+        str.append(data.at(i));
+        if ((i + 1) % 2 == 0 && i > 0)
+            str.append(" ");
+    }
+
+    // Chop last space
+    while (str.endsWith(" "))
+        str.chop(1);
+
+    // Return string
+    return str;
+}
+
 /**
  * Allows the user to export the information displayed on the console
  */
diff --git a/src/IO/Console.h b/src/IO/Console.h
@@ -115,6 +115,7 @@ class Console : public QObject
     Q_INVOKABLE QStringList dataModes() const;
     Q_INVOKABLE QStringList lineEndings() const;
     Q_INVOKABLE QStringList displayModes() const;
+    Q_INVOKABLE QString formatUserHex(const QString &text);
 
 public slots:
     void save();
