CanRawFilter (GENIVI#109)

Signed-off-by: Remigiusz Kołłątaj <[email protected]>

Author: rkollataj

3rdParty/nodeeditor

@@ -83,6 +83,8 @@
         <file>files/images/light/CANbus_icon_CheckBoxOn_disabled.svg</file>
         <file>files/images/dark/CANbus_icon_CheckBoxOff_disabled.svg</file>
         <file>files/images/dark/CANbus_icon_CheckBoxOn_disabled.svg</file>
+        <file>files/images/light/CANbus_icon_arrow_down.svg</file>
+        <file>files/images/light/CANbus_icon_arrow_up.svg</file>
     </qresource>
     <qresource prefix="/">
         <file>files/json/projectConfigSchema.json</file>

CANdevResources.qrc

@@ -2,6 +2,7 @@ coverage:
     ignore:
         - "src/components/canrawsender/gui"
         - "src/components/canrawview/gui"
+        - "src/components/canrawfilter/gui"
         - "src/gui"
         - "src/common/guiinterface"
         - "tests"

codecov.yml

@@ -131,7 +131,7 @@ QPushButton#pbStartNew, #pbStartOpen, #close {
     border: 0px;
 }
 
-QWidget#CanRawSenderPrivate, #CanRawViewPrivate {
+QWidget#CanRawSenderPrivate, #CanRawViewPrivate, #CanRawFilterPrivate {
     background-color: #616161;
 }
 

files/css/darkStyle.css

@@ -73,13 +73,23 @@ QTableView#tv QTableCornerButton::section {
     border: 1px solid #f7f7f7;
 }
 
-QTableView#tv {
+QTableView#rxTv QTableCornerButton::section {
+    background-color: #f7f7f7;
+    border: 1px solid #f7f7f7;
+}
+
+QTableView#txTv QTableCornerButton::section {
+    background-color: #f7f7f7;
+    border: 1px solid #f7f7f7;
+}
+
+QTableView#tv, QTableView#txTv, QTableView#rxTv {
     background: #ffffff;
     gridline-color: #d3d3d3;
     color: #626262
 }
 
-QTableView#tv::item {
+QTableView#tv::item, QTableView#txTv::item, QTableView#rxTv::item{
     background: #ffffff;
     border : 0px;
     border-color: #ff0000;

files/css/lightStyle.css

@@ -5,3 +5,4 @@ add_subdirectory(projectconfig)
 add_subdirectory(canrawplayer)
 add_subdirectory(canrawlogger)
 add_subdirectory(canload)
+add_subdirectory(canrawfilter)

files/images/light/CANbus_icon_arrow_down.svg

@@ -0,0 +1,12 @@
+set(COMPONENT_NAME canrawfilter)
+
+set(SRC
+    gui/canrawfilter.ui
+    gui/canrawfilterguiimpl.h
+    canrawfilter.cpp
+    canrawfilter_p.cpp
+)
+
+add_library(${COMPONENT_NAME} ${SRC})
+target_link_libraries(${COMPONENT_NAME} Qt5::Widgets Qt5::Core Qt5::SerialBus nodes cds-common)
+target_include_directories(${COMPONENT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

files/images/light/CANbus_icon_arrow_up.svg

@@ -0,0 +1,98 @@
+#include "canrawfilter.h"
+#include "canrawfilter_p.h"
+#include <confighelpers.h>
+#include <log.h>
+#include <QCanBusFrame>
+
+CanRawFilter::CanRawFilter()
+    : d_ptr(new CanRawFilterPrivate(this))
+{
+}
+
+CanRawFilter::CanRawFilter(CanRawFilterCtx&& ctx)
+    : d_ptr(new CanRawFilterPrivate(this, std::move(ctx)))
+{
+}
+
+CanRawFilter::~CanRawFilter()
+{
+}
+
+QWidget* CanRawFilter::mainWidget()
+{
+    Q_D(CanRawFilter);
+
+    return d->_ui.mainWidget();
+}
+
+void CanRawFilter::setConfig(const QJsonObject& json)
+{
+    Q_D(CanRawFilter);
+
+    d_ptr->setSettings(json);
+}
+
+void CanRawFilter::setConfig(const QObject& qobject)
+{
+    Q_D(CanRawFilter);
+
+    configHelpers::setQConfig(qobject, getSupportedProperties(), d->_props);
+}
+
+QJsonObject CanRawFilter::getConfig() const
+{
+    return d_ptr->getSettings();
+}
+
+std::shared_ptr<QObject> CanRawFilter::getQConfig() const
+{
+    const Q_D(CanRawFilter);
+
+    return configHelpers::getQConfig(getSupportedProperties(), d->_props);
+}
+
+void CanRawFilter::configChanged()
+{
+}
+
+bool CanRawFilter::mainWidgetDocked() const
+{
+    return d_ptr->_docked;
+}
+
+ComponentInterface::ComponentProperties CanRawFilter::getSupportedProperties() const
+{
+    return d_ptr->getSupportedProperties();
+}
+
+void CanRawFilter::stopSimulation()
+{
+    Q_D(CanRawFilter);
+
+    d->_simStarted = false;
+}
+
+void CanRawFilter::startSimulation()
+{
+    Q_D(CanRawFilter);
+
+    d->_simStarted = true;
+}
+
+void CanRawFilter::txFrameIn(const QCanBusFrame& frame)
+{
+    Q_D(CanRawFilter);
+
+    if(d->acceptTxFrame(frame) && d->_simStarted) {
+        emit txFrameOut(frame);
+    }
+}
+
+void CanRawFilter::rxFrameIn(const QCanBusFrame& frame)
+{
+    Q_D(CanRawFilter);
+
+    if(d->acceptRxFrame(frame) && d->_simStarted) {
+        emit rxFrameOut(frame);
+    }
+}

src/components/CMakeLists.txt

@@ -0,0 +1,49 @@
+#ifndef CANRAWFILTER_H
+#define CANRAWFILTER_H
+
+#include <QtCore/QObject>
+#include <QtCore/QScopedPointer>
+#include <componentinterface.h>
+#include <context.h>
+#include <memory>
+
+class CanRawFilterPrivate;
+class QWidget;
+class QCanBusFrame;
+struct CanRawFilterGuiInt;
+typedef Context<CanRawFilterGuiInt> CanRawFilterCtx;
+
+class CanRawFilter : public QObject, public ComponentInterface {
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(CanRawFilter)
+
+public:
+    CanRawFilter();
+    explicit CanRawFilter(CanRawFilterCtx&& ctx);
+    ~CanRawFilter();
+
+    QWidget* mainWidget() override;
+    void setConfig(const QJsonObject& json) override;
+    void setConfig(const QObject& qobject) override;
+    QJsonObject getConfig() const override;
+    std::shared_ptr<QObject> getQConfig() const override;
+    void configChanged() override;
+    bool mainWidgetDocked() const override;
+    ComponentInterface::ComponentProperties getSupportedProperties() const override;
+
+signals:
+    void mainWidgetDockToggled(QWidget* widget) override;
+    void txFrameOut(const QCanBusFrame& frame);
+    void rxFrameOut(const QCanBusFrame& frame);
+
+public slots:
+    void txFrameIn(const QCanBusFrame& frame);
+    void rxFrameIn(const QCanBusFrame& frame);
+    void stopSimulation() override;
+    void startSimulation() override;
+
+private:
+    QScopedPointer<CanRawFilterPrivate> d_ptr;
+};
+
+#endif //CANRAWFILTER_H