Enable Filter Regex Replacement also for exporting into DLT format.

Signed-off-by: Alexander Wenzel <[email protected]>

qdlt/qdltexporter.cpp

@@ -434,6 +434,14 @@ void QDltExporter::exportMessages(QDltFile *from, QFile *to, QDltPluginManager *
             }
         }
 
+        // apply Regex if needed
+        if(exportFormat == QDltExporter::FormatDlt || exportFormat == QDltExporter::FormatDltDecoded)
+        {
+            msg.setNumberOfArguments(msg.sizeArguments());
+            if(from) from->applyRegExStringMsg(msg);
+            msg.getMsg(buf,true);
+        }
+
         // export message
         if(!exportMsg(starting,msg,buf))
         {

qdlt/qdltfile.cpp

@@ -759,3 +759,8 @@ bool QDltFile::applyRegExString(QString &text)
 {
     return filterList.applyRegExString(text);
 }
+
+bool QDltFile::applyRegExStringMsg(QDltMsg &msg)
+{
+    return filterList.applyRegExStringMsg(msg);
+}

qdlt/qdltfile.h

@@ -304,6 +304,11 @@ class QDLT_EXPORT QDltFile : public QDlt
     */
     bool applyRegExString(QString &text);
 
+    //! Apply RegEx Replace to the arguments of a message, if any active in the filters
+    /*!
+    */
+    bool applyRegExStringMsg(QDltMsg &msg);
+
 protected:
 
 private:

qdlt/qdltfilterlist.cpp

@@ -142,6 +142,37 @@ bool QDltFilterList::applyRegExString(QString &text)
     return result;
 }
 
+bool QDltFilterList::applyRegExStringMsg(QDltMsg &msg)
+{
+    QDltFilter *filter;
+    bool result = false;
+
+    for(int numfilter=0;numfilter<pfilters.size();numfilter++)
+    {
+        filter = pfilters[numfilter];
+
+        if(filter->enableFilter && filter->enableRegexSearchReplace)
+        {
+            for(int num=0;num<msg.getNumberOfArguments();num++)
+            {
+                QDltArgument arg;
+                msg.getArgument(num,arg);
+                if(arg.getTypeInfo()==QDltArgument::DltTypeInfoStrg || arg.getTypeInfo()==QDltArgument::DltTypeInfoUtf8)
+                {
+                    QString text = arg.getValue().toString();
+                    text.replace(QRegularExpression(filter->regex_search), filter->regex_replace);
+                    arg.setValue(text);
+                    msg.removeArgument(num);
+                    msg.addArgument(arg,num);
+                }
+            }
+
+            result = true;
+        }
+    }
+    return result;
+}
+
 bool QDltFilterList::checkFilter(QDltMsg &msg)
 {
     QDltFilter *filter;

qdlt/qdltfilterlist.h

@@ -127,6 +127,11 @@ class QDLT_EXPORT QDltFilterList
     */
     bool applyRegExString(QString &text);
 
+    //! Apply RegEx Replace to the argumnets of a message, if any active in the filters.
+    /*!
+    */
+    bool applyRegExStringMsg(QDltMsg &msg);
+
 protected:
 private: