tempo-plotter Changeset - fc3447903db8 · protofusion repositories

Changeset - fc3447903db8

Parent rev.

Child rev.

[Not reviewed]

settings

0 2 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-09-02 15:17:10
hy@ozderya.net

use current parity setting as default when loading

2 files changed with 22 insertions and 13 deletions:

src/portcontrol.cpp

src/portcontrol.h

0 comments (0 inline, 0 general)

src/portcontrol.cpp

➞

Show inline comments

@@ @@ -288,94 +288,101 @@ QString PortControl::selectedPortName() @@
         return static_cast<PortListItem*>(portList.item(portIndex))->portName();
+    }
+}
 QToolBar* PortControl::toolBar()
+{
     return &portToolBar;
+}
 void PortControl::openActionTriggered(bool checked)
+{
     togglePort();
+}
 void PortControl::onCbPortListActivated(int index)
+{
     tbPortList.setCurrentIndex(index);
+}
 void PortControl::onTbPortListActivated(int index)
+{
     ui->cbPortList->setCurrentIndex(index);
+}
 QString PortControl::currentParityText()
+{
     if (parityButtons.checkedId() == QSerialPort::OddParity)
+    {
         return "odd";
+    }
     else if (parityButtons.checkedId() == QSerialPort::EvenParity)
+    {
         return "even";
+    }
     else // no parity
+    {
         return "none";
+    }
+}
 void PortControl::saveSettings(QSettings* settings)
+{
     settings->beginGroup("Port");
     settings->setValue("selectedPort", selectedPortName());
     settings->setValue("baudRate", ui->cbBaudRate->currentText());
     // save parity setting
     if (parityButtons.checkedId() == QSerialPort::OddParity)
+    {
         settings->setValue("parity", "odd");
+    }
     else if (parityButtons.checkedId() == QSerialPort::EvenParity)
+    {
         settings->setValue("parity", "even");
+    }
     else
+    {
         settings->setValue("parity", "none");
+    }
     settings->setValue("parity", currentParityText());
     // save number of bits
     settings->setValue("dataBits", dataBitsButtons.checkedId());
     settings->endGroup();
+}
 void PortControl::loadSettings(QSettings* settings)
+{
     settings->beginGroup("Port");
     // set port name if it exists in the current list otherwise ignore
     QString portName = settings->value("selectedPort", QString()).toString();
     if (!portName.isEmpty())
+    {
         int index = portList.indexOfName(portName);
         if (index > -1) ui->cbPortList->setCurrentIndex(index);
+    }
     // load baud rate setting if it exists in baud rate list
     QString baudSetting = settings->value(
         "baudRate", ui->cbBaudRate->currentText()).toString();
     int baudIndex = ui->cbBaudRate->findText(baudSetting);
     if (baudIndex > -1) ui->cbBaudRate->setCurrentIndex(baudIndex);
     // load parity setting
     QString paritySetting = settings->value("parity", "none").toString();
     QString paritySetting =
         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());
     // load number of bits
     int dataBits = settings->value("dataBits", dataBitsButtons.checkedId()).toInt();
     if (dataBits >=5 && dataBits <= 8)
+    {
         dataBitsButtons.button((QSerialPort::DataBits) dataBits)->setChecked(true);
         selectDataBits(dataBits);
+    }
     settings->endGroup();
+}

src/portcontrol.h

➞

Show inline comments

@@ @@ -46,48 +46,50 @@ public: @@
     QSerialPort* serialPort;
     QToolBar* toolBar();
     /// Stores port settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads port settings from a `QSettings`
     void loadSettings(QSettings* settings);
 private:
     Ui::PortControl *ui;
     QButtonGroup parityButtons;
     QButtonGroup dataBitsButtons;
     QButtonGroup stopBitsButtons;
     QButtonGroup flowControlButtons;
     QToolBar portToolBar;
     QAction openAction;
     QAction loadPortListAction;
     QComboBox tbPortList;
     PortList portList;
     /// Returns the currently selected (entered) "portName" in the UI
     QString selectedPortName();
     /// Returns currently selected parity as text to be saved in settings
     QString currentParityText();
 public slots:
     void loadPortList();
     void loadBaudRateList();
     void togglePort();
     void selectPort(QString portName);
     void selectBaudRate(QString baudRate);
     void selectParity(int parity); // parity must be one of QSerialPort::Parity
     void selectDataBits(int dataBits); // bits must be one of QSerialPort::DataBits
     void selectStopBits(int stopBits); // stopBits must be one of QSerialPort::StopBits
     void selectFlowControl(int flowControl); // flowControl must be one of QSerialPort::FlowControl
 private slots:
     void openActionTriggered(bool checked);
     void onCbPortListActivated(int index);
     void onTbPortListActivated(int index);
 signals:
     void portToggled(bool open);
 };
 #endif // PORTCONTROL_H

0 comments (0 inline, 0 general)