Pull Request #32: Fix/issue#28

Author: PedroCobucci

omodsim/formmodsim.cpp

@@ -448,6 +448,34 @@ ModbusSimulationMap FormModSim::simulationMap() const
     return result;
 }
 
+
+QModbusDataUnit FormModSim::serializeModbusDataUnit(QModbusDataUnit::RegisterType type,
+                                                    quint16 startAddress,
+                                                    quint16 length) const
+{
+    QModbusDataUnit dataUnit;
+
+    const auto serverData = _mbMultiServer.data(type, startAddress, length);
+
+    const auto& unit = serverData;
+
+    if (startAddress >= unit.startAddress() &&
+        (startAddress + length) <= (unit.startAddress() + unit.valueCount())) {
+
+        int offset = startAddress - unit.startAddress();
+
+        QVector<quint16> values;
+        for (int i = 0; i < length; ++i) {
+            values.append(unit.value(offset + i));
+        }
+
+        dataUnit.setValues(values);
+        dataUnit.setRegisterType(type);
+        dataUnit.setStartAddress(startAddress);
+    }
+
+    return dataUnit;
+}
 ///
 /// \brief FormModSim::startSimulation
 /// \param type
@@ -459,6 +487,18 @@ void FormModSim::startSimulation(QModbusDataUnit::RegisterType type, quint16 add
     _dataSimulator->startSimulation(dataDisplayMode(), type, addr, params);
 }
 
+void FormModSim::configureModbusDataUnit(QModbusDataUnit::RegisterType type,
+                                         quint16 startAddress,
+                                         const QVector<quint16>& values) const
+{
+    QModbusDataUnit unit;
+    unit.setRegisterType(type);
+    unit.setStartAddress(startAddress);
+    unit.setValues(values);
+    _mbMultiServer.setData(unit);
+}
+
+
 ///
 /// \brief FormModSim::descriptionMap
 /// \return

omodsim/formmodsim.h

@@ -87,6 +87,13 @@ class FormModSim : public QWidget
     ModbusSimulationMap simulationMap() const;
     void startSimulation(QModbusDataUnit::RegisterType type, quint16 addr, const ModbusSimulationParams& params);
 
+    QModbusDataUnit serializeModbusDataUnit(QModbusDataUnit::RegisterType pointType,
+                                            quint16 pointAddress,
+                                            quint16 length) const;
+    void configureModbusDataUnit(QModbusDataUnit::RegisterType type,
+                                             quint16 startAddress,
+                                             const QVector<quint16>& values) const;
+
     AddressDescriptionMap descriptionMap() const;
     void setDescription(QModbusDataUnit::RegisterType type, quint16 addr, const QString& desc);
 
@@ -274,6 +281,11 @@ inline QDataStream& operator <<(QDataStream& out, FormModSim* frm)
     out << frm->scriptSettings();
     out << frm->descriptionMap();
 
+    const auto unit = frm->serializeModbusDataUnit(dd.PointType, dd.PointAddress, dd.Length);
+    out << unit.registerType();
+    out << unit.startAddress();
+    out << unit.values();
+
     return out;
 }
 
@@ -376,6 +388,16 @@ inline QDataStream& operator >>(QDataStream& in, FormModSim* frm)
     for(auto&& k : descriptionMap.keys())
         frm->setDescription(k.first, k.second, descriptionMap[k]);
 
+    QModbusDataUnit::RegisterType type;
+    int startAddress;
+    QVector<quint16> values;
+
+    in >> type;
+    in >> startAddress;
+    in >> values;
+
+    frm->configureModbusDataUnit(type, startAddress, values);
+
     return in;
 }