Merge branch 'COVESA:master' into master

qdlt/CMakeLists.txt

@@ -41,7 +41,8 @@ add_library(qdlt SHARED
     qdltimporter.cpp
     fieldnames.cpp
     dltmessagematcher.cpp
-    dltmessagematcher.h)
+    dltmessagematcher.h
+    qdltlrucache.hpp)
 
 target_compile_definitions(qdlt PRIVATE
     BYTE_ORDER=LITTLE_ENDIAN

qdlt/qdltfile.cpp

@@ -487,7 +487,7 @@ void QDltFile::addFilterIndex (int index)
 }
 
 #ifdef USECOLOR
-    QColor QDltFile::checkMarker(QDltMsg &msg)
+    QColor QDltFile::checkMarker(const QDltMsg &msg)
     {
         if(!filterFlag)
         {
@@ -498,7 +498,7 @@ void QDltFile::addFilterIndex (int index)
     }
 
 #else
- QString QDltFile::checkMarker(QDltMsg &msg)
+ QString QDltFile::checkMarker(const QDltMsg &msg)
  {
      if(!filterFlag)
      {

qdlt/qdltfile.h

@@ -252,9 +252,9 @@ class QDLT_EXPORT QDltFile : public QDlt
       \return 0 if message will not be marked, colour if message will be marked
     */
 #ifdef USECOLOR
-    QColor checkMarker(QDltMsg &msg);
+    QColor checkMarker(const QDltMsg &msg);
 #else
-    QString checkMarker(QDltMsg &msg);
+    QString checkMarker(const QDltMsg &msg);
 #endif
 
     //! Get file name of the underlying file object

qdlt/qdltfilter.cpp

@@ -161,7 +161,7 @@ bool QDltFilter::compileRegexps()
             appidRegularExpression.isValid());
 }
 
-bool QDltFilter::match(QDltMsg &msg) const
+bool QDltFilter::match(const QDltMsg &msg) const
 {
 
     if( (true == enableEcuid) && (msg.getEcuid() != ecuid))

qdlt/qdltfilter.h

@@ -130,7 +130,7 @@ class QDLT_EXPORT QDltFilter
     /*!
       \return true if filter matches the message, else false
     */
-    bool match(QDltMsg &msg) const;
+    bool match(const QDltMsg &msg) const;
 
     //! Save filter parameters in XML file.
     /*!

qdlt/qdltfilterlist.cpp

@@ -86,7 +86,7 @@ void QDltFilterList::addFilter(QDltFilter *_filter)
 
 
 #ifdef USECOLOR
-QColor QDltFilterList::checkMarker(QDltMsg &msg)
+QColor QDltFilterList::checkMarker(const QDltMsg &msg)
 {
     QDltFilter *filter;
     QColor color;
@@ -104,7 +104,7 @@ QColor QDltFilterList::checkMarker(QDltMsg &msg)
     return color;
 }
 #else
-QString QDltFilterList::checkMarker(QDltMsg &msg)
+QString QDltFilterList::checkMarker(const QDltMsg &msg)
 {
     QDltFilter *filter;
     QString color=""; // invalid colour

qdlt/qdltfilterlist.h

@@ -83,9 +83,9 @@ class QDLT_EXPORT QDltFilterList
       \return 0 if message will not be marked, colour if message will be marked
     */
 #ifdef USECOLOR
-    QColor checkMarker(QDltMsg &msg);
+    QColor checkMarker(const QDltMsg &msg);
 #else
-    QString checkMarker(QDltMsg &msg);
+    QString checkMarker(const QDltMsg &msg);
 #endif
 
 

qdlt/qdltlrucache.hpp

@@ -0,0 +1,59 @@
+#ifndef QDLTLRUCACHE_HPP
+#define QDLTLRUCACHE_HPP
+
+#include <unordered_map>
+#include <list>
+#include <stdexcept>
+
+template<typename Key, typename Value>
+class QDltLruCache {
+
+    struct CacheEntry {
+        Key key;
+        Value value;
+    };
+
+    using CacheListIterator = typename std::list<CacheEntry>::iterator;
+public:
+
+    QDltLruCache(size_t capacity) :
+        m_capacity(capacity) {
+    }
+
+    void put(const Key& key, const Value& value) {
+        auto it = m_keyIteratorsMap.find(key);
+        m_cacheItems.push_front(CacheEntry{key, value});
+        if (it != m_keyIteratorsMap.end()) {
+            m_cacheItems.erase(it->second);
+            m_keyIteratorsMap.erase(it);
+        }
+        m_keyIteratorsMap[key] = m_cacheItems.begin();
+
+        if (m_keyIteratorsMap.size() > m_capacity) {
+            auto last = std::prev(m_cacheItems.end());
+            m_keyIteratorsMap.erase(last->key);
+            m_cacheItems.pop_back();
+        }
+    }
+
+    const Value& get(const Key& key) {
+        auto it = m_keyIteratorsMap.find(key);
+        if (it == m_keyIteratorsMap.end()) {
+            throw std::range_error("no such key in cache found");
+        }
+
+        m_cacheItems.splice(m_cacheItems.begin(), m_cacheItems, it->second);
+        return it->second->value;
+    }
+
+    bool exists(const Key& key) const {
+        return m_keyIteratorsMap.find(key) != m_keyIteratorsMap.end();
+    }
+
+private:
+    std::list<CacheEntry> m_cacheItems;
+    std::unordered_map<Key, CacheListIterator> m_keyIteratorsMap;
+    const size_t m_capacity;
+};
+
+#endif // QDLTLRUCACHE_HPP

src/dlttableview.cpp

@@ -1,5 +1,8 @@
 #include "dlttableview.h"
 
+#include <QDebug>
+#include <QWheelEvent>
+
 DltTableView::DltTableView(QWidget *parent) :
     QTableView(parent)
 {
@@ -17,6 +20,15 @@ void DltTableView::paintEvent(QPaintEvent *event)
     }
 }
 
+void DltTableView::wheelEvent(QWheelEvent *event)
+{
+    if (event->modifiers().testFlag(Qt::ControlModifier)) {
+        auto val = event->angleDelta().y();
+        emit changeFontSize((0 < val) - (val < 0));
+        event->accept();
+    }
+}
+
 void DltTableView::lock()
 {
     paintMutex.lock();

src/dlttableview.h

@@ -17,11 +17,15 @@ class DltTableView : public QTableView
     explicit DltTableView(QWidget *parent = 0);
     void lock();
     void unlock();
+
+signals:
+    void changeFontSize(int delta);
 private:
     QMutex paintMutex;
 
 protected:
-    void paintEvent(QPaintEvent *e);
+    void paintEvent(QPaintEvent *e) override;
+    void wheelEvent(QWheelEvent *event) override;
 
 signals:
 

src/mainwindow.cpp

@@ -608,6 +608,15 @@ void MainWindow::initSignalConnections()
         ui->exploreView->scrollTo(
                     proxyModel->mapFromSource(fsModel->index(recentFiles[0])));
     });
+
+    connect(ui->tableView, &DltTableView::changeFontSize, this, [this](int direction){
+        QFont font;
+        font.fromString(settings->fontName);
+        int fontSize = font.pointSize() + direction;
+        font.setPointSize(fontSize);
+        settings->fontName = font.toString();
+        ui->tableView->setFont(font);
+    });
 }
 
 void MainWindow::initSearchTable()
@@ -2066,6 +2075,7 @@ void MainWindow::reloadLogFileFinishFilter()
         QList<int> list = dltIndexer->getGetLogInfoList();
         QDltMsg msg;
 
+        // FIXME: this is slow operation running in the main loop
         for(int num=0;num<list.size();num++)
         {
             if(qfile.getMsg(list[num],msg))
@@ -2082,7 +2092,6 @@ void MainWindow::reloadLogFileFinishFilter()
     // hide progress bar when finished
     statusProgressBar->reset();
     statusProgressBar->hide();
-
 }
 
 void MainWindow::reloadLogFileFinishDefaultFilter()

src/mainwindow.h

@@ -382,10 +382,10 @@ class MainWindow : public QMainWindow
     void writeDLTMessageToFile(QByteArray &bufferHeader,char*bufferPayload,quint32 bufferPayloadSize,EcuItem* ecuitem,quint32 sec=0,quint32 use=0);
 
 protected:
-    void keyPressEvent ( QKeyEvent * event );
-    void dragEnterEvent(QDragEnterEvent *event);
-    void dropEvent(QDropEvent *event);
-    void closeEvent(QCloseEvent *event);
+    void keyPressEvent ( QKeyEvent * event ) override;
+    void dragEnterEvent(QDragEnterEvent *event) override;
+    void dropEvent(QDropEvent *event) override;
+    void closeEvent(QCloseEvent *event) override;
 
 private slots:
     void reloadLogFileProgressMax(int num);