Correct application behavior

Author: sanny32

omodsim/controls/numericlineedit.cpp

@@ -2,6 +2,7 @@
 #include <float.h>
 #include <QIntValidator>
 #include "qhexvalidator.h"
+#include "quintvalidator.h"
 #include "numericlineedit.h"
 
 ///
@@ -334,7 +335,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to
             const int nums = QString::number(top.toUInt()).length();
             _paddingZeroWidth = qMax(1, nums);
             setMaxLength(qMax(1, nums));
-            setValidator(new QIntValidator(bottom.toUInt(), top.toUInt(), this));
+            setValidator(new QUIntValidator(bottom.toUInt(), top.toUInt(), this));
         }
         break;
 

omodsim/mainwindow.cpp

@@ -230,6 +230,10 @@ void MainWindow::on_awake()
         ui->actionBinary->setChecked(ddm == DataDisplayMode::Binary);
         ui->actionUnsignedDecimal->setChecked(ddm == DataDisplayMode::Decimal);
         ui->actionInteger->setChecked(ddm == DataDisplayMode::Integer);
+        ui->actionLongInteger->setChecked(ddm == DataDisplayMode::LongInteger);
+        ui->actionSwappedLI->setChecked(ddm == DataDisplayMode::SwappedLI);
+        ui->actionUnsignedLongInteger->setChecked(ddm == DataDisplayMode::UnsignedLongInteger);
+        ui->actionSwappedUnsignedLI->setChecked(ddm == DataDisplayMode::SwappedUnsignedLI);
         ui->actionHex->setChecked(ddm == DataDisplayMode::Hex);
         ui->actionFloatingPt->setChecked(ddm == DataDisplayMode::FloatingPt);
         ui->actionSwappedFP->setChecked(ddm == DataDisplayMode::SwappedFP);
@@ -530,6 +534,35 @@ void MainWindow::on_actionInteger_triggered()
     updateDataDisplayMode(DataDisplayMode::Integer);
 }
 
+///
+/// \brief MainWindow::on_actionLongInteger_triggered
+///
+void MainWindow::on_actionLongInteger_triggered()
+{
+    updateDataDisplayMode(DataDisplayMode::LongInteger);
+}
+
+///
+/// \brief MainWindow::on_actionSwappedLI_triggered
+///
+void MainWindow::on_actionSwappedLI_triggered()
+{
+    updateDataDisplayMode(DataDisplayMode::SwappedLI);
+}
+
+///
+/// \brief MainWindow::on_actionUnsignedLongInteger_triggered
+///
+void MainWindow::on_actionUnsignedLongInteger_triggered()
+{
+    updateDataDisplayMode(DataDisplayMode::UnsignedLongInteger);
+}
+
+void MainWindow::on_actionSwappedUnsignedLI_triggered()
+{
+    updateDataDisplayMode(DataDisplayMode::SwappedUnsignedLI);
+}
+
 ///
 /// \brief MainWindow::on_actionHex_triggered
 ///

omodsim/mainwindow.h

@@ -72,6 +72,10 @@ private slots:
     void on_actionBinary_triggered();
     void on_actionUnsignedDecimal_triggered();
     void on_actionInteger_triggered();
+    void on_actionLongInteger_triggered();
+    void on_actionSwappedLI_triggered();
+    void on_actionUnsignedLongInteger_triggered();
+    void on_actionSwappedUnsignedLI_triggered();
     void on_actionHex_triggered();
     void on_actionFloatingPt_triggered();
     void on_actionSwappedFP_triggered();

omodsim/omodsim.pro

@@ -72,6 +72,7 @@ SOURCES += \
     modbusmultiserver.cpp \
     qfixedsizedialog.cpp \
     qhexvalidator.cpp \
+    quintvalidator.cpp \
     recentfileactionlist.cpp \
     windowactionlist.cpp
 
@@ -132,6 +133,7 @@ HEADERS += \
     qfixedsizedialog.h \
     qhexvalidator.h \
     qrange.h \
+    quintvalidator.h \
     recentfileactionlist.h \
     scriptsettings.h \
     windowactionlist.h

omodsim/quintvalidator.cpp

@@ -0,0 +1,43 @@
+#include "quintvalidator.h"
+
+///
+/// \brief QUIntValidator::QUIntValidator
+/// \param parent
+///
+QUIntValidator::QUIntValidator(QObject *parent)
+    : QValidator{parent}
+    ,_bottom(0)
+    ,_top(UINT_MAX)
+{
+}
+
+///
+/// \brief QUIntValidator::QUIntValidator
+/// \param bottom
+/// \param top
+/// \param parent
+///
+QUIntValidator::QUIntValidator(uint bottom, uint top, QObject *parent)
+    : QValidator(parent)
+    ,_bottom(bottom)
+    ,_top(top)
+{
+
+}
+
+///
+/// \brief QUIntValidator::validate
+/// \return
+///
+QValidator::State QUIntValidator::validate(QString& input, int &) const
+{
+    bool ok = false;
+    const auto value = input.toUInt(&ok, 10);
+
+    if (ok && value >=_bottom && value <=_top )
+    {
+        return QValidator::Acceptable;
+    }
+
+    return QValidator::Invalid;
+}

omodsim/quintvalidator.h

@@ -0,0 +1,21 @@
+#ifndef QUINTVALIDATOR_H
+#define QUINTVALIDATOR_H
+
+#include <QValidator>
+#include <QObject>
+
+class QUIntValidator : public QValidator
+{
+    Q_OBJECT
+public:
+    explicit QUIntValidator(QObject *parent = nullptr);
+    QUIntValidator(uint bottom, uint top, QObject *parent = nullptr);
+
+    State validate(QString &, int &) const override;
+
+private:
+    uint _bottom;
+    uint _top;
+};
+
+#endif // QUINTVALIDATOR_H