Correct auto simulation

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

omodsim/datasimulator.cpp

@@ -47,6 +47,8 @@ void DataSimulator::startSimulation(DataDisplayMode mode, QModbusDataUnit::Regis
     }
 
     _simulationMap[{ type, addr}] = { mode, params };
+    emit dataSimulationStarted(type, addr, params);
+
     resumeSimulations();
 }
 
@@ -58,6 +60,7 @@ void DataSimulator::startSimulation(DataDisplayMode mode, QModbusDataUnit::Regis
 void DataSimulator::stopSimulation(QModbusDataUnit::RegisterType type, quint16 addr)
 {
     _simulationMap.remove({ type, addr});
+    emit dataSimulationStopped(type, addr);
 }
 
 ///
@@ -100,6 +103,31 @@ void DataSimulator::restartSimulations()
     }
 }
 
+///
+/// \brief DataSimulator::simulationParams
+/// \param type
+/// \param addr
+/// \return
+///
+ModbusSimulationParams DataSimulator::simulationParams(QModbusDataUnit::RegisterType type, quint16 addr) const
+{
+    const auto it = _simulationMap.find({type, addr});
+    return (it != _simulationMap.end()) ? it->Params : ModbusSimulationParams();
+}
+
+///
+/// \brief DataSimulator::simulationMap
+/// \return
+///
+ModbusSimulationMap DataSimulator::simulationMap() const
+{
+    ModbusSimulationMap map;
+    for(auto&& key : _simulationMap.keys())
+        map[key] = _simulationMap[key].Params;
+
+    return map;
+}
+
 ///
 /// \brief DataSimulator::on_timeout
 ///

omodsim/datasimulator.h

@@ -5,8 +5,11 @@
 #include <QModbusDataUnit>
 #include "modbussimulationparams.h"
 
-class ModbusMultiServer;
+typedef QMap<QPair<QModbusDataUnit::RegisterType, quint16>, ModbusSimulationParams> ModbusSimulationMap;
 
+///
+/// \brief The DataSimulator class
+///
 class DataSimulator : public QObject
 {
     Q_OBJECT
@@ -22,7 +25,12 @@ class DataSimulator : public QObject
     void resumeSimulations();
     void restartSimulations();
 
+    ModbusSimulationParams simulationParams(QModbusDataUnit::RegisterType type, quint16 addr) const;
+    ModbusSimulationMap simulationMap() const;
+
 signals:
+    void dataSimulationStarted(QModbusDataUnit::RegisterType type, quint16 addr, const ModbusSimulationParams& params);
+    void dataSimulationStopped(QModbusDataUnit::RegisterType type, quint16 addr);
     void dataSimulated(DataDisplayMode mode, QModbusDataUnit::RegisterType type, quint16 addr, QVariant value);
 
 private slots:

omodsim/formmodsim.cpp

@@ -17,12 +17,12 @@ QVersionNumber FormModSim::VERSION = QVersionNumber(1, 1);
 /// \param num
 /// \param parent
 ///
-FormModSim::FormModSim(int id, ModbusMultiServer& server, MainWindow* parent) :
+FormModSim::FormModSim(int id, ModbusMultiServer& server, QSharedPointer<DataSimulator> simulator, MainWindow* parent) :
     QWidget(parent)
     , ui(new Ui::FormModSim)
     ,_formId(id)
     ,_mbMultiServer(server)
-    ,_dataSimulator(new DataSimulator(this))
+    ,_dataSimulator(simulator)
 {
     Q_ASSERT(parent != nullptr);
 
@@ -344,29 +344,38 @@ void FormModSim::print(QPrinter* printer)
 }
 
 ///
-/// \brief FormModSim::resumeSimulations
+/// \brief FormModSim::simulationMap
+/// \return
 ///
-void FormModSim::resumeSimulations()
+ModbusSimulationMap FormModSim::simulationMap() const
 {
-    _dataSimulator->resumeSimulations();
-}
+    const auto dd = displayDefinition();
+    const auto startAddr = dd.PointAddress - 1;
+    const auto endAddr = startAddr + dd.Length;
 
-///
-/// \brief FormModSim::pauseSimulations
-///
-void FormModSim::pauseSimulations()
-{
-    _dataSimulator->pauseSimulations();
+    ModbusSimulationMap result;
+    const auto simulationMap = _dataSimulator->simulationMap();
+    for(auto&& key : _dataSimulator->simulationMap().keys())
+    {
+        if(key.first == dd.PointType &&
+           key.second >= startAddr && key.second < endAddr)
+        {
+            result[key] = simulationMap[key];
+        }
+    }
+
+    return result;
 }
 
 ///
-/// \brief FormModSca::restartSimulations
+/// \brief FormModSim::startSimulation
+/// \param type
+/// \param addr
+/// \param params
 ///
-void FormModSim::restartSimulations()
+void FormModSim::startSimulation(QModbusDataUnit::RegisterType type, quint16 addr, const ModbusSimulationParams& params)
 {
-    _dataSimulator->stopSimulations();
-    for(auto&& k : _simulationMap.keys())
-        _dataSimulator->startSimulation(dataDisplayMode(), k.first, k.second,  _simulationMap[k]);
+    _dataSimulator->startSimulation(dataDisplayMode(), type, addr, params);
 }
 
 ///
@@ -449,12 +458,9 @@ void FormModSim::onDefinitionChanged()
 ///
 void FormModSim::on_outputWidget_itemDoubleClicked(quint16 addr, const QVariant& value)
 {
-    if(!_mbMultiServer.isConnected())
-        return;
-
     const auto mode = dataDisplayMode();
     const auto pointType = ui->comboBoxModbusPointType->currentPointType();
-    auto& simParams = _simulationMap[{pointType, addr}];
+    auto simParams = _dataSimulator->simulationParams(pointType, addr);
 
     switch(pointType)
     {
@@ -526,7 +532,6 @@ void FormModSim::on_mbDeviceIdChanged(quint8 deviceId)
 ///
 void FormModSim::on_mbConnected(const ConnectionDetails&)
 {
-    _dataSimulator->resumeSimulations();
     updateStatus();
 }
 
@@ -535,9 +540,6 @@ void FormModSim::on_mbConnected(const ConnectionDetails&)
 ///
 void FormModSim::on_mbDisconnected(const ConnectionDetails&)
 {
-    if(!_mbMultiServer.isConnected())
-       _dataSimulator->pauseSimulations();
-
    updateStatus();
 }
 
@@ -579,8 +581,5 @@ void FormModSim::on_mbDataChanged(const QModbusDataUnit&)
 ///
 void FormModSim::on_dataSimulated(DataDisplayMode mode, QModbusDataUnit::RegisterType type, quint16 addr, QVariant value)
 {
-    if(!_mbMultiServer.isConnected())
-        return;
-
     _mbMultiServer.writeRegister(type, { addr, value, mode, byteOrder() });
 }

omodsim/formmodsim.h

@@ -5,6 +5,7 @@
 #include <QTimer>
 #include <QPrinter>
 #include <QVersionNumber>
+#include "datasimulator.h"
 #include "modbusmultiserver.h"
 #include "displaydefinition.h"
 
@@ -27,7 +28,7 @@ class FormModSim : public QWidget
 public:
     static QVersionNumber VERSION;
 
-    explicit FormModSim(int id, ModbusMultiServer& server, MainWindow* parent);
+    explicit FormModSim(int id, ModbusMultiServer& server, QSharedPointer<DataSimulator> simulator, MainWindow* parent);
     ~FormModSim();
 
     int formId() const { return _formId; }
@@ -66,9 +67,8 @@ class FormModSim : public QWidget
 
     void print(QPrinter* painter);
 
-    void resumeSimulations();
-    void pauseSimulations();
-    void restartSimulations();
+    ModbusSimulationMap simulationMap() const;
+    void startSimulation(QModbusDataUnit::RegisterType type, quint16 addr, const ModbusSimulationParams& params);
 
 protected:
     void changeEvent(QEvent* event) override;
@@ -106,7 +106,6 @@ private slots:
     QString _filename;
     ModbusMultiServer& _mbMultiServer;
     QSharedPointer<DataSimulator> _dataSimulator;
-    QMap<QPair<QModbusDataUnit::RegisterType, quint16>, ModbusSimulationParams> _simulationMap;
 };
 
 ///
@@ -220,7 +219,7 @@ inline QDataStream& operator <<(QDataStream& out, const FormModSim* frm)
     out << dd.Length;
 
     out << frm->byteOrder();
-    out << frm->_simulationMap;
+    out << frm->simulationMap();
 
     return out;
 }
@@ -270,11 +269,13 @@ inline QDataStream& operator >>(QDataStream& in, FormModSim* frm)
     in >> dd.Length;
 
     ByteOrder byteOrder = ByteOrder::LittleEndian;
+    ModbusSimulationMap simulationMap;
+
     const auto ver = frm->property("Version").value<QVersionNumber>();
     if(ver >= QVersionNumber(1, 1))
     {
         in >> byteOrder;
-        in >> frm->_simulationMap;
+        in >> simulationMap;
     }
 
     if(in.status() != QDataStream::Ok)
@@ -294,7 +295,9 @@ inline QDataStream& operator >>(QDataStream& in, FormModSim* frm)
     frm->setFont(font);
     frm->setDisplayDefinition(dd);
     frm->setByteOrder(byteOrder);
-    frm->restartSimulations();
+
+    for(auto&& k : simulationMap.keys())
+        frm->startSimulation(k.first, k.second,  simulationMap[k]);
 
     return in;
 }

omodsim/mainwindow.cpp

@@ -27,6 +27,7 @@ MainWindow::MainWindow(QWidget *parent)
     ,_icoBigEndian(":/res/actionBigEndian.png")
     ,_icoLittleEndian(":/res/actionLittleEndian.png")
     ,_windowCounter(0)
+    ,_dataSimulator(new DataSimulator(this))
 {
     ui->setupUi(this);
 
@@ -816,7 +817,7 @@ void MainWindow::presetRegs(QModbusDataUnit::RegisterType type)
 ///
 FormModSim* MainWindow::createMdiChild(int id)
 {
-    auto frm = new FormModSim(id, _mbMultiServer, this);
+    auto frm = new FormModSim(id, _mbMultiServer, _dataSimulator, this);
     auto wnd = ui->mdiArea->addSubWindow(frm);
     wnd->installEventFilter(this);
     wnd->setAttribute(Qt::WA_DeleteOnClose, true);

omodsim/mainwindow.h

@@ -131,6 +131,7 @@ private slots:
     WindowActionList* _windowActionList;
     RecentFileActionList* _recentFileActionList;
     QSharedPointer<QPrinter> _selectedPrinter;
+    QSharedPointer<DataSimulator> _dataSimulator;
 };
 
 #endif // MAINWINDOW_H

omodsim/modbusmultiserver.h

@@ -4,7 +4,6 @@
 #include <QObject>
 #include <QModbusServer>
 #include <QModbusTcpServer>
-#include "datasimulator.h"
 #include "modbusdataunitmap.h"
 #include "modbuswriteparams.h"
 #include "connectiondetails.h"
@@ -113,18 +112,14 @@ class ModbusMultiServer final : public QObject
     void setData(const QModbusDataUnit& data);
 
     void writeValue(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, quint16 value, ByteOrder order);
+    void writeRegister(QModbusDataUnit::RegisterType pointType, const ModbusWriteParams& params);
 
     float readFloat(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, ByteOrder order, bool swapped);
     void writeFloat(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, float value, ByteOrder order, bool swapped);
 
     double readDouble(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, ByteOrder order, bool swapped);
     void writeDouble(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, double value, ByteOrder order, bool swapped);
 
-    void writeRegister(QModbusDataUnit::RegisterType pointType, const ModbusWriteParams& params);
-    void simulateRegister(DataDisplayMode mode, QModbusDataUnit::RegisterType pointType, quint16 pointAddress, const ModbusSimulationParams& params);
-    void stopSimulation(QModbusDataUnit::RegisterType pointType, quint16 pointAddress);
-    void stopSimulations();
-
 signals:
     void connected(const ConnectionDetails& cd);
     void disconnected(const ConnectionDetails& cd);