tempo-plotter Changeset - 30cf692b39ee · protofusion repositories

Changeset - 30cf692b39ee

Parent rev.

Child rev.

[Not reviewed]

settings

0 1 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-09-03 02:19:30
hy@ozderya.net

simplified parity setting code

1 file changed with 15 insertions and 27 deletions:

src/portcontrol.cpp

0 comments (0 inline, 0 general)

src/portcontrol.cpp

➞

Show inline comments

@@ @@ -23,11 +23,19 @@ @@
 #include <QSerialPortInfo>
 #include <QKeySequence>
 #include <QLabel>
 #include <QMap>
 #include <QtDebug>
 #include "utils.h"
 #define TBPORTLIST_MINWIDTH (200)
 // setting mappings
 const QMap<QSerialPort::Parity, QString> paritySettingMap({
         {QSerialPort::NoParity, "none"},
         {QSerialPort::OddParity, "odd"},
         {QSerialPort::EvenParity, "even"},
     });
 PortControl::PortControl(QSerialPort* port, QWidget* parent) :
     QWidget(parent),
     ui(new Ui::PortControl),
@@ @@ -311,18 +319,8 @@ void PortControl::onTbPortListActivated( @@
 QString PortControl::currentParityText()
+{
     if (parityButtons.checkedId() == QSerialPort::OddParity)
+    {
         return "odd";
+    }
     else if (parityButtons.checkedId() == QSerialPort::EvenParity)
+    {
         return "even";
+    }
     else // no parity
+    {
         return "none";
+    }
     return paritySettingMap.value(
         (QSerialPort::Parity) parityButtons.checkedId());
+}
 QString PortControl::currentFlowControlText()
@@ @@ -373,22 +371,12 @@ void PortControl::loadSettings(QSettings @@
     if (baudIndex > -1) ui->cbBaudRate->setCurrentIndex(baudIndex);
     // load parity setting
-    QString paritySetting =
+    QString parityText =
         settings->value("parity", currentParityText()).toString();
     if (paritySetting == "odd")
+    {
         ui->rbOddParity->setChecked(true);
+    }
     else if (paritySetting == "even")
+    {
         ui->rbEvenParity->setChecked(true);
+    }
     else
+    {
         ui->rbNoParity->setChecked(true);
+    }
     selectParity((QSerialPort::Parity) parityButtons.checkedId());
     QSerialPort::Parity paritySetting = paritySettingMap.key(
         parityText, (QSerialPort::Parity) parityButtons.checkedId());
     parityButtons.button(paritySetting)->setChecked(true);
     selectParity(paritySetting);
     // load number of bits
     int dataBits = settings->value("dataBits", dataBitsButtons.checkedId()).toInt();

0 comments (0 inline, 0 general)