Correct ui dialogs for preset data

Author: sanny32

omodsim/dialogs/dialogforcemultiplecoils.cpp

@@ -15,6 +15,7 @@ DialogForceMultipleCoils::DialogForceMultipleCoils(ModbusWriteParams& params, QM
       QDialog(parent)
     , ui(new Ui::DialogForceMultipleCoils)
     ,_writeParams(params)
+    ,_type(type)
 {
     ui->setupUi(this);
     setWindowFlags(Qt::Dialog |
@@ -110,8 +111,8 @@ void DialogForceMultipleCoils::updateTableWidget()
 
     for(int i = 0; i < ui->tableWidget->rowCount(); i++)
     {
-        const auto addressFrom = QString("%1").arg(_writeParams.Address + i * columns, 5, 10, QLatin1Char('0'));
-        const auto addressTo = QString("%1").arg(_writeParams.Address + qMin(length - 1, (i + 1) * columns - 1), 5, 10, QLatin1Char('0'));
+        const auto addressFrom = formatAddress(_type, _writeParams.Address + i * columns, false);
+        const auto addressTo = formatAddress(_type, _writeParams.Address + qMin(length - 1, (i + 1) * columns - 1), false);
         ui->tableWidget->setVerticalHeaderItem(i, new QTableWidgetItem(QString("%1-%2").arg(addressFrom, addressTo)));
 
         for(int j = 0; j < columns; j++)
@@ -122,7 +123,7 @@ void DialogForceMultipleCoils::updateTableWidget()
                 auto item = new QTableWidgetItem(QString::number(_data[idx]));
                 item->setData(Qt::UserRole, idx);
                 item->setTextAlignment(Qt::AlignCenter);
-                item->setToolTip(QString("%1").arg(_writeParams.Address + idx, 5, 10, QLatin1Char('0')));
+                item->setToolTip(formatAddress(_type,_writeParams.Address + idx, false));
                 ui->tableWidget->setItem(i, j, item);
             }
             else

omodsim/dialogs/dialogforcemultiplecoils.h

@@ -32,6 +32,7 @@ private slots:
     Ui::DialogForceMultipleCoils *ui;
     QVector<quint16> _data;
     ModbusWriteParams& _writeParams;
+    QModbusDataUnit::RegisterType _type;
 };
 
 #endif // DIALOGFORCEMULTIPLECOILS_H

omodsim/dialogs/dialogforcemultipleregisters.cpp

@@ -17,6 +17,7 @@ DialogForceMultipleRegisters::DialogForceMultipleRegisters(ModbusWriteParams& pa
       QDialog(parent)
     , ui(new Ui::DialogForceMultipleRegisters)
     ,_writeParams(params)
+    ,_type(type)
 {
     ui->setupUi(this);
     setWindowFlags(Qt::Dialog |
@@ -356,8 +357,8 @@ void DialogForceMultipleRegisters::updateTableWidget()
 
     for(int i = 0; i < ui->tableWidget->rowCount(); i++)
     {
-        const auto addressFrom = QString("%1").arg(_writeParams.Address + i * columns, 5, 10, QLatin1Char('0'));
-        const auto addressTo = QString("%1").arg(_writeParams.Address + qMin(length - 1, (i + 1) * columns - 1), 5, 10, QLatin1Char('0'));
+        const auto addressFrom = formatAddress(QModbusDataUnit::HoldingRegisters, _writeParams.Address + i * columns, _hexView);
+        const auto addressTo = formatAddress(QModbusDataUnit::HoldingRegisters, _writeParams.Address + qMin(length - 1, (i + 1) * columns - 1), _hexView);
         ui->tableWidget->setVerticalHeaderItem(i, new QTableWidgetItem(QString("%1-%2").arg(addressFrom, addressTo)));
 
         for(int j = 0; j < columns; j++)

omodsim/dialogs/dialogforcemultipleregisters.h

@@ -37,6 +37,8 @@ private slots:
     Ui::DialogForceMultipleRegisters *ui;
     QVector<quint16> _data;
     ModbusWriteParams& _writeParams;
+    QModbusDataUnit::RegisterType _type;
+    bool _hexView = false;
 };
 
 #endif // DIALOGFORCEMULTIPLEREGISTERS_H