Merge remote-tracking branch 'origin/dev'

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

omodsim/datasimulator.cpp

@@ -46,7 +46,7 @@ void DataSimulator::startSimulation(DataDisplayMode mode, QModbusDataUnit::Regis
         break;
     }
 
-    _simulationMap[{ type, addr}] = { mode, params };
+    _simulationMap[{ type, addr}] = { mode, params, value };
     resumeSimulations();
 }
 

omodsim/dialogs/dialogforcemultiplecoils.cpp

@@ -18,8 +18,8 @@ DialogForceMultipleCoils::DialogForceMultipleCoils(ModbusWriteParams& params, in
                    Qt::CustomizeWindowHint |
                    Qt::WindowTitleHint);
 
-    ui->labelAddress->setText(QStringLiteral("Address: %1").arg(params.Address, 5, 10, QLatin1Char('0')));
-    ui->labelLength->setText(QStringLiteral("Length: %1").arg(length, 3, 10, QLatin1Char('0')));
+    ui->labelAddress->setText(QString(tr("Address: %1")).arg(params.Address, 5, 10, QLatin1Char('0')));
+    ui->labelLength->setText(QString(tr("Length: %1")).arg(length, 3, 10, QLatin1Char('0')));
 
     _data = params.Value.value<QVector<quint16>>();
     if(_data.length() != length) _data.resize(length);

omodsim/dialogs/dialogforcemultiplecoils.ui

@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>15: FORCE MULTIPLE COILS</string>
+   <string>FORCE MULTIPLE COILS</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>

omodsim/dialogs/dialogforcemultipleregisters.cpp

@@ -21,8 +21,8 @@ DialogForceMultipleRegisters::DialogForceMultipleRegisters(ModbusWriteParams& pa
                    Qt::CustomizeWindowHint |
                    Qt::WindowTitleHint);
 
-    ui->labelAddress->setText(QStringLiteral("Address: %1").arg(params.Address, 5, 10, QLatin1Char('0')));
-    ui->labelLength->setText(QStringLiteral("Length: %1").arg(length, 3, 10, QLatin1Char('0')));
+    ui->labelAddress->setText(QString(tr("Address: %1")).arg(params.Address, 5, 10, QLatin1Char('0')));
+    ui->labelLength->setText(QString(tr("Length: %1")).arg(length, 3, 10, QLatin1Char('0')));
 
     _data = params.Value.value<QVector<quint16>>();
     if(_data.length() != length) _data.resize(length);

omodsim/dialogs/dialogforcemultipleregisters.ui

@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>16: PRESET MULTIPLE REGISTERS</string>
+   <string>PRESET MULTIPLE REGISTERS</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>

omodsim/mainwindow.cpp

@@ -185,12 +185,6 @@ void MainWindow::on_awake()
     ui->actionDblFloat->setEnabled(frm != nullptr);
     ui->actionSwappedDbl->setEnabled(frm != nullptr);
 
-    const auto isConnected = _mbMultiServer.isConnected();
-    ui->actionForceCoils->setEnabled(isConnected);
-    ui->actionForceDiscretes->setEnabled(isConnected);
-    ui->actionPresetInputRegs->setEnabled(isConnected);
-    ui->actionPresetHoldingRegs->setEnabled(isConnected);
-
     ui->actionToolbar->setChecked(ui->toolBarMain->isVisible());
     ui->actionStatusBar->setChecked(statusBar()->isVisible());
     ui->actionDisplayBar->setChecked(ui->toolBarDisplay->isVisible());

omodsim/menuconnect.cpp

@@ -1,3 +1,4 @@
+#include <QEvent>
 #include <QSerialPortInfo>
 #include "menuconnect.h"
 
@@ -41,6 +42,32 @@ MenuConnect::MenuConnect(MenuType type, ModbusMultiServer& server, QWidget *pare
     });
 }
 
+///
+/// \brief MenuConnect::changeEvent
+/// \param event
+///
+void MenuConnect::changeEvent(QEvent* event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        for(auto&& a : actions())
+        {
+            const auto data = a->data().value<QPair<ConnectionType, QString>>();
+            switch(data.first)
+            {
+                case ConnectionType::Tcp:
+                    a->setText(tr("Modbus/TCP Srv"));
+                break;
+                case ConnectionType::Serial:
+                    a->setText(QString(tr("Port %1")).arg(data.second));
+                break;
+            }
+        }
+    }
+
+    QMenu::changeEvent(event);
+}
+
 ///
 /// \brief MenuConnect::canConnect
 /// \param cd

omodsim/menuconnect.h

@@ -24,6 +24,9 @@ class MenuConnect : public QMenu
     void connectAction(ConnectionDetails& cd);
     void disconnectAction(ConnectionType type, const QString& port);
 
+protected:
+    void changeEvent(QEvent* event) override;
+
 private:
     void addAction(const QString& text, ConnectionType type, const QString& port);
 

omodsim/modbusdataunitmap.cpp

@@ -93,7 +93,7 @@ void ModbusDataUnitMap::setData(const QModbusDataUnit& data)
     const auto length = data.valueCount();
     const auto type = data.registerType();
 
-    for(int i = 0; i < length; i++)
+    for(uint i = 0; i < length; i++)
     {
         setDataValue(_modbusDataUnitMap, type, addr + i, data.value(i));
         setDataValue(_modbusDataUnitGlobalMap, type, addr + i, data.value(i));

omodsim/omodsim.pro

@@ -4,7 +4,7 @@ CONFIG += c++17
 CONFIG -= debug_and_release
 CONFIG -= debug_and_release_target
 
-VERSION = 1.1.0
+VERSION = 1.1.1
 
 QMAKE_TARGET_PRODUCT = "Open ModSim"
 QMAKE_TARGET_DESCRIPTION = "An Open Source Modbus Slave (Server) Utility"