Correct storing address space values on changes

Author: Ананьев Александр

omodsim/modbusdataunitmap.cpp

@@ -0,0 +1,94 @@
+#include <QDebug>
+#include "modbusdataunitmap.h"
+
+///
+/// \brief ModbusDataUnitMap::addUnitMap
+/// \param id
+/// \param pointType
+/// \param pointAddress
+/// \param length
+///
+void ModbusDataUnitMap::addUnitMap(int id, QModbusDataUnit::RegisterType pointType, quint16 pointAddress, quint16 length)
+{
+    _dataUnits.insert(id, {pointType, pointAddress, length});
+    updateDataUnitMap();
+}
+
+///
+/// \brief ModbusDataUnitMap::removeUnitMap
+/// \param pointType
+///
+void ModbusDataUnitMap::removeUnitMap(int id)
+{
+    _dataUnits.remove(id);
+    updateDataUnitMap();
+}
+
+///
+/// \brief ModbusDataUnitMap::begin
+/// \return
+///
+QModbusDataUnitMap::ConstIterator ModbusDataUnitMap::begin()
+{
+    return _modbusDataUnitMap.begin();
+}
+
+///
+/// \brief ModbusDataUnitMap::end
+/// \return
+///
+QModbusDataUnitMap::Iterator ModbusDataUnitMap::end()
+{
+    return _modbusDataUnitMap.end();
+}
+
+///
+/// \brief ModbusDataUnitMap::setData
+/// \param data
+///
+void ModbusDataUnitMap::setData(const QModbusDataUnit& data)
+{
+    const auto addr = data.startAddress();
+    const auto length = data.valueCount();
+    const auto type = data.registerType();
+
+    const auto idx = addr - _modbusDataUnitMap[type].startAddress();
+    for(int i = 0; i < length; i++)
+    {
+        _modbusDataUnitMap[type].setValue(idx + i, data.value(i));
+    }
+}
+
+///
+/// \brief ModbusDataUnitMap::updateDataUnitMap
+///
+void ModbusDataUnitMap::updateDataUnitMap()
+{
+    QMultiMap<QModbusDataUnit::RegisterType, QModbusDataUnit> multimap;
+    for(auto&& unit : _dataUnits)
+    {
+        multimap.insert(unit.registerType(), unit);
+    }
+
+    QModbusDataUnitMap modbusMap;
+    for(auto&& type: multimap.uniqueKeys())
+    {
+        quint16 startAddress = 65535;
+        quint16 endAddress = 0;
+        for(auto&& unit : multimap.values(type))
+        {
+            startAddress = qMin<quint16>(startAddress, unit.startAddress());
+            endAddress = qMax<quint16>(endAddress, unit.startAddress() + unit.valueCount());
+        }
+
+        const quint16 length = endAddress - startAddress;
+        if(length > 0)
+            modbusMap.insert(type, {type, startAddress, length});
+
+        for(int i = 0; i < length; i++)
+        {
+            modbusMap[type].setValue(i, _modbusDataUnitMap[type].value(i));
+        }
+    }
+    _modbusDataUnitMap = modbusMap;
+}

omodsim/modbusdataunitmap.h

@@ -0,0 +1,35 @@
+#ifndef MODBUSDATAUNITMAP_H
+#define MODBUSDATAUNITMAP_H
+
+#include <QModbusDataUnit>
+
+///
+/// \brief The ModbusDataUnitMap class
+///
+class ModbusDataUnitMap
+{
+public:
+    explicit ModbusDataUnitMap() = default;
+
+    void addUnitMap(int id, QModbusDataUnit::RegisterType pointType, quint16 pointAddress, quint16 length);
+    void removeUnitMap(int id);
+
+    void setData(const QModbusDataUnit& data);
+
+    QModbusDataUnitMap::ConstIterator begin();
+    QModbusDataUnitMap::Iterator end();
+
+    operator QModbusDataUnitMap(){
+        return _modbusDataUnitMap;
+    }
+
+private:
+    void updateDataUnitMap();
+
+private:
+    QMap<int, QModbusDataUnit> _dataUnits;
+    QModbusDataUnitMap _modbusDataUnitMap;
+};
+
+
+#endif // MODBUSDATAUNITMAP_H

omodsim/modbusmultiserver.cpp

@@ -8,8 +8,8 @@
 ModbusMultiServer::ModbusMultiServer(QObject *parent)
     : QObject{parent}
     ,_deviceId(1)
+    ,_simulator(new DataSimulator(this))
 {
-    _simulator = QSharedPointer<DataSimulator>(new DataSimulator(this));
 }
 
 ///
@@ -45,56 +45,28 @@ void ModbusMultiServer::setDeviceId(quint8 deviceId)
 }
 
 ///
-/// \brief ModbusServer::addUnitMap
+/// \brief ModbusMultiServer::addUnitMap
+/// \param id
 /// \param pointType
 /// \param pointAddress
 /// \param length
 ///
 void ModbusMultiServer::addUnitMap(int id, QModbusDataUnit::RegisterType pointType, quint16 pointAddress, quint16 length)
 {
-    _modbusDataUnitMap.insert(id, {pointType, pointAddress, length});
+    _modbusDataUnitMap.addUnitMap(id, pointType, pointAddress, length);
     reconfigureServers();
 }
 
 ///
-/// \brief ModbusServer::removeUnitMap
-/// \param pointType
+/// \brief ModbusMultiServer::removeUnitMap
+/// \param id
 ///
 void ModbusMultiServer::removeUnitMap(int id)
 {
-    _modbusDataUnitMap.remove(id);
+    _modbusDataUnitMap.removeUnitMap(id);
     reconfigureServers();
 }
 
-///
-/// \brief ModbusServer::createDataUnitMap
-/// \return
-///
-QModbusDataUnitMap ModbusMultiServer::createDataUnitMap()
-{
-    QMultiMap<QModbusDataUnit::RegisterType, QModbusDataUnit> multimap;
-    for(auto&& unit : _modbusDataUnitMap)
-    {
-        multimap.insert(unit.registerType(), unit);
-    }
-
-    QModbusDataUnitMap modbusMap;
-    for(auto&& type: multimap.uniqueKeys())
-    {
-        quint16 startAddress = 65535;
-        quint16 endAddress = 0;
-        for(auto&& unit : multimap.values(type))
-        {
-            startAddress = qMin<quint16>(startAddress, unit.startAddress());
-            endAddress = qMax<quint16>(endAddress, unit.startAddress() + unit.valueCount());
-        }
-
-        const quint16 length = endAddress - startAddress;
-        if(length > 0) modbusMap.insert(type, {type, startAddress, length});
-    }
-    return modbusMap;
-}
-
 ///
 /// \brief ModbusMultiServer::findModbusServer
 /// \param cd
@@ -210,11 +182,9 @@ void ModbusMultiServer::connectDevice(const ConnectionDetails& cd)
     }
 
     modbusServer->setServerAddress(_deviceId);
+    modbusServer->setMap(_modbusDataUnitMap);
 
-    const auto dataUintMap = createDataUnitMap();
-    modbusServer->setMap(dataUintMap);
-
-    for(auto data : dataUintMap)
+    for(auto data : _modbusDataUnitMap)
     {
         _modbusServerList.first()->data(&data);
         modbusServer->setData(data);
@@ -280,9 +250,8 @@ void ModbusMultiServer::reconfigureServers()
 {
     if(!_modbusServerList.isEmpty())
     {
-        const auto dataUintMap = createDataUnitMap();
         for(auto&& s : _modbusServerList)
-            s->setMap(dataUintMap);
+            s->setMap(_modbusDataUnitMap);
     }
 }
 
@@ -346,6 +315,7 @@ QModbusDataUnit ModbusMultiServer::data(QModbusDataUnit::RegisterType pointType,
 ///
 void ModbusMultiServer::setData(const QModbusDataUnit& data)
 {
+    _modbusDataUnitMap.setData(data);
     for(auto&& s : _modbusServerList)
     {
         s->blockSignals(true);

omodsim/modbusmultiserver.h

@@ -5,6 +5,7 @@
 #include <QModbusServer>
 #include <QModbusTcpServer>
 #include "datasimulator.h"
+#include "modbusdataunitmap.h"
 #include "modbuswriteparams.h"
 #include "connectiondetails.h"
 
@@ -138,7 +139,6 @@ private slots:
     void on_dataWritten(QModbusDataUnit::RegisterType table, int address, int size);
 
 private:
-    QModbusDataUnitMap createDataUnitMap();
     QSharedPointer<QModbusServer> findModbusServer(const ConnectionDetails& cd) const;
     QSharedPointer<QModbusServer> findModbusServer(ConnectionType type, const QString& port) const;
     QSharedPointer<QModbusServer> createModbusServer(const ConnectionDetails& cd);
@@ -149,7 +149,7 @@ private slots:
 
 private:
     quint8 _deviceId;
-    QMap<int, QModbusDataUnit> _modbusDataUnitMap;
+    ModbusDataUnitMap _modbusDataUnitMap;
     QList<QSharedPointer<QModbusServer>> _modbusServerList;
     QSharedPointer<DataSimulator> _simulator;
 };

omodsim/omodsim.pro

@@ -51,6 +51,7 @@ SOURCES += \
     main.cpp \
     mainwindow.cpp \
     menuconnect.cpp \
+    modbusdataunitmap.cpp \
     modbusmultiserver.cpp \
     qfixedsizedialog.cpp \
     qhexvalidator.cpp \
@@ -89,6 +90,7 @@ HEADERS += \
     formmodsim.h \
     mainwindow.h \
     menuconnect.h \
+    modbusdataunitmap.h \
     modbuslimits.h \
     modbusmultiserver.h \
     modbussimulationparams.h \