Merge remote-tracking branch 'origin/dev'

Author: sanny

omodsim/controls/mainstatusbar.cpp

@@ -2,6 +2,37 @@
 #include <QMdiSubWindow>
 #include "mainstatusbar.h"
 
+///
+/// \brief Parity_toString
+/// \param parity
+/// \return
+///
+QString Parity_toString(QSerialPort::Parity parity)
+{
+    switch(parity)
+    {
+        case QSerialPort::NoParity:
+        return MainStatusBar::tr("NONE");
+
+        case QSerialPort::EvenParity:
+        return MainStatusBar::tr("EVEN");
+
+        case QSerialPort::OddParity:
+        return MainStatusBar::tr("ODD");
+
+        case QSerialPort::SpaceParity:
+        return MainStatusBar::tr("SPACE");
+
+        case QSerialPort::MarkParity:
+        return MainStatusBar::tr("MARK");
+
+        default:
+        break;
+    }
+
+    return QString();
+}
+
 ///
 /// \brief MainStatusBar::MainStatusBar
 /// \param parent
@@ -80,7 +111,11 @@ void MainStatusBar::updateConnectionInfo(QLabel* label, const ConnectionDetails&
         break;
 
         case ConnectionType::Serial:
-            label->setText(QString(tr("Port %1: %2")).arg(cd.SerialParams.PortName, QString::number(cd.SerialParams.BaudRate)));
+            label->setText(QString(tr("Port %1:%2:%3:%4:%5  ")).arg(cd.SerialParams.PortName,
+                                                                    QString::number(cd.SerialParams.BaudRate),
+                                                                    QString::number(cd.SerialParams.WordLength),
+                                                                    Parity_toString(cd.SerialParams.Parity),
+                                                                    QString::number(cd.SerialParams.StopBits)));
         break;
     }
 }

omodsim/controls/outputwidget.cpp

@@ -8,7 +8,7 @@
 struct ListItemData
 {
     int Row;
-    quint16 Address;
+    quint32 Address;
     QVariant Value;
 };
 Q_DECLARE_METATYPE(ListItemData)
@@ -71,11 +71,12 @@ QVector<quint16> OutputWidget::data() const
 ///
 /// \brief OutputWidget::setup
 /// \param dd
+/// \param data
 ///
-void OutputWidget::setup(const DisplayDefinition& dd)
+void OutputWidget::setup(const DisplayDefinition& dd, const QModbusDataUnit& data)
 {
     _displayDefinition = dd;
-    updateDataWidget(QModbusDataUnit());
+    updateDataWidget(data);
 }
 
 ///
@@ -268,7 +269,6 @@ void OutputWidget::updateTraffic(const QModbusResponse& response, int server)
 void OutputWidget::updateData(const QModbusDataUnit& data)
 {
     updateDataWidget(data);
-    _lastData = data;
 }
 
 ///
@@ -585,6 +585,14 @@ void OutputWidget::setNotConnectedStatus()
     setStatus(tr("NOT CONNECTED!"));
 }
 
+///
+/// \brief OutputWidget::setInvalidLengthStatus
+///
+void OutputWidget::setInvalidLengthStatus()
+{
+    setStatus(tr("Invalid Data Length Specified"));
+}
+
 ///
 /// \brief OutputWidget::updateDataWidget
 /// \param data
@@ -600,7 +608,7 @@ void OutputWidget::updateDataWidget(const QModbusDataUnit& data)
     }
 
     QStringList capstr;
-    for(quint16 i = 0; i < _displayDefinition.Length; i++)
+    for(quint32 i = 0; i < _displayDefinition.Length; i++)
     {
         ListItemData itemData;
         itemData.Row = i;
@@ -658,6 +666,8 @@ void OutputWidget::updateDataWidget(const QModbusDataUnit& data)
         item->setText(QString(format).arg(addr, valstr));
         item->setData(Qt::UserRole, QVariant::fromValue(itemData));
     }
+
+    _lastData = data;
 }
 
 ///

omodsim/controls/outputwidget.h

@@ -25,7 +25,7 @@ class OutputWidget : public QWidget
 
     QVector<quint16> data() const;
 
-    void setup(const DisplayDefinition& dd);
+    void setup(const DisplayDefinition& dd, const QModbusDataUnit& data = QModbusDataUnit());
 
     DisplayMode displayMode() const;
     void setDisplayMode(DisplayMode mode);
@@ -49,6 +49,8 @@ class OutputWidget : public QWidget
     void setFont(const QFont& font);
 
     void setStatus(const QString& status);
+    void setNotConnectedStatus();
+    void setInvalidLengthStatus();
 
     void paint(const QRect& rc, QPainter& painter);
 
@@ -66,7 +68,6 @@ private slots:
     void on_listWidget_itemDoubleClicked(QListWidgetItem *item);
 
 private:
-    void setNotConnectedStatus();
     void updateDataWidget(const QModbusDataUnit& data);
     void updateTrafficWidget(bool request, int server, const QModbusPdu& pdu);