Merge pull request #18 from ModbusScope/dev/modbus_register

Refactor modbus register

Author: jgeudens

src/communication/datapoint.cpp

@@ -0,0 +1,72 @@
+#include "datapoint.h"
+
+DataPoint::DataPoint() : DataPoint(QString(), Device::cFirstDeviceId)
+{
+}
+
+DataPoint::DataPoint(QString const& address, deviceId_t deviceId) : _address(address), _deviceId(deviceId)
+{
+}
+
+QString DataPoint::address() const
+{
+    return _address;
+}
+
+deviceId_t DataPoint::deviceId() const
+{
+    return _deviceId;
+}
+
+QString DataPoint::description() const
+{
+    QString connStr = QString("device id %1").arg(deviceId());
+
+    return QString("%1, %2").arg(_address, connStr);
+}
+
+DataPoint& DataPoint::operator=(const DataPoint& dataPoint)
+{
+    // self-assignment guard
+    if (this == &dataPoint)
+    {
+        return *this;
+    }
+
+    _address = dataPoint.address();
+    _deviceId = dataPoint.deviceId();
+
+    // return the existing object so we can chain this operator
+    return *this;
+}
+
+bool operator==(const DataPoint& dp1, const DataPoint& dp2)
+{
+    if ((dp1._address == dp2._address) && (dp1._deviceId == dp2._deviceId))
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+QDebug operator<<(QDebug debug, const DataPoint& dp)
+{
+    QDebugStateSaver saver(debug);
+
+    debug.nospace().noquote() << '[' << dp.description() << ']';
+
+    return debug;
+}
+
+QString DataPoint::dumpListToString(QList<DataPoint> const& list)
+{
+    QString str;
+    QDebug dStream(&str);
+
+    dStream << list;
+
+    return str;
+}

src/communication/datapoint.h

@@ -0,0 +1,37 @@
+#ifndef DATAPOINT_H
+#define DATAPOINT_H
+
+#include "models/device.h"
+#include <QDebug>
+#include <QString>
+
+class DataPoint
+{
+public:
+    DataPoint();
+    DataPoint(QString const& address, deviceId_t deviceId);
+
+    QString address() const;
+
+    deviceId_t deviceId() const;
+
+    QString description() const;
+
+    DataPoint(const DataPoint& copy) : _address{ copy.address() }, _deviceId{ copy.deviceId() }
+    {
+    }
+
+    DataPoint& operator=(const DataPoint& dataPoint);
+
+    friend bool operator==(const DataPoint& dp1, const DataPoint& dp2);
+
+    static QString dumpListToString(const QList<DataPoint>& list);
+
+private:
+    QString _address;
+    deviceId_t _deviceId;
+};
+
+QDebug operator<<(QDebug debug, const DataPoint& dp);
+
+#endif // DATAPOINT_H

src/communication/modbuspoll.cpp

@@ -47,7 +47,7 @@ void ModbusPoll::initAdapter()
     _pAdapterClient->prepareAdapter(adapterPath);
 }
 
-void ModbusPoll::startCommunication(QList<ModbusRegister>& registerList)
+void ModbusPoll::startCommunication(QList<DataPoint>& registerList)
 {
     _registerList = registerList;
     _bPollActive = true;
@@ -119,16 +119,12 @@ void ModbusPoll::onDescribeResult(const QJsonObject& description)
     _pSettingsModel->updateAdapterFromDescribe("modbus", description);
 }
 
-QStringList ModbusPoll::buildRegisterExpressions(const QList<ModbusRegister>& registerList)
+QStringList ModbusPoll::buildRegisterExpressions(const QList<DataPoint>& registerList)
 {
     QStringList expressions;
-    for (const ModbusRegister& reg : registerList)
+    for (const DataPoint& reg : registerList)
     {
-        QString expr = QString("${%1 @ %2 : %3}")
-                         .arg(reg.address().fullAddress())
-                         .arg(reg.deviceId())
-                         .arg(ModbusDataType::typeString(reg.type()));
-        expressions.append(expr);
+        expressions.append(reg.address());
     }
     return expressions;
 }

src/communication/modbuspoll.h

@@ -1,9 +1,9 @@
-#ifndef COMMUNICATION_MANAGER_H
-#define COMMUNICATION_MANAGER_H
+#ifndef MODBUSPOLL_H
+#define MODBUSPOLL_H
 
 #include "ProtocolAdapter/adapterclient.h"
 #include "ProtocolAdapter/adapterprocess.h"
-#include "communication/modbusregister.h"
+#include "communication/datapoint.h"
 #include "util/result.h"
 
 #include <QJsonObject>
@@ -21,7 +21,7 @@ class ModbusPoll : public QObject
     ~ModbusPoll();
 
     void initAdapter();
-    void startCommunication(QList<ModbusRegister>& registerList);
+    void startCommunication(QList<DataPoint>& registerList);
     void stopCommunication();
 
     bool isActive();
@@ -36,9 +36,9 @@ private slots:
     void onDescribeResult(const QJsonObject& description);
 
 private:
-    QStringList buildRegisterExpressions(const QList<ModbusRegister>& registerList);
+    QStringList buildRegisterExpressions(const QList<DataPoint>& registerList);
 
-    QList<ModbusRegister> _registerList;
+    QList<DataPoint> _registerList;
 
     bool _bPollActive;
     QTimer* _pPollTimer;
@@ -49,4 +49,4 @@ private slots:
     AdapterClient* _pAdapterClient;
 };
 
-#endif // COMMUNICATION_MANAGER_H
+#endif // MODBUSPOLL_H