tempo-plotter Changeset - 716662cea3b5 · protofusion repositories

Changeset - 716662cea3b5

Parent rev.

Child rev.

[Not reviewed]

settings

0 2 0

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

close the port when loading settings

2 files changed with 4 insertions and 6 deletions:

src/portcontrol.cpp

src/portcontrol.h

0 comments (0 inline, 0 general)

src/portcontrol.cpp

➞

Show inline comments

@@ @@ -345,76 +345,74 @@ void PortControl::saveSettings(QSettings @@
     settings->setValue("selectedPort", selectedPortName());
     settings->setValue("baudRate", ui->cbBaudRate->currentText());
     settings->setValue("parity", currentParityText());
     settings->setValue("dataBits", dataBitsButtons.checkedId());
     settings->setValue("stopBits", stopBitsButtons.checkedId());
     settings->setValue("flowControl", currentFlowControlText());
     settings->endGroup();
+}
 void PortControl::loadSettings(QSettings* settings)
+{
     // make sure the port is closed
     if (serialPort->isOpen()) togglePort();
     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 parityText =
         settings->value("parity", currentParityText()).toString();
     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();
     if (dataBits >=5 && dataBits <= 8)
+    {
         dataBitsButtons.button((QSerialPort::DataBits) dataBits)->setChecked(true);
         selectDataBits(dataBits);
+    }
     // load stop bits
     int stopBits = settings->value("stopBits", stopBitsButtons.checkedId()).toInt();
     if (stopBits == QSerialPort::OneStop)
+    {
         ui->rb1StopBit->setChecked(true);
         selectStopBits(QSerialPort::OneStop);
+    }
     else if (stopBits == QSerialPort::TwoStop)
+    {
         ui->rb2StopBit->setChecked(true);
         selectStopBits(QSerialPort::TwoStop);
+    }
     // load flow control
     QString flowControlSetting =
         settings->value("flowControl", currentFlowControlText()).toString();
     if (flowControlSetting == "hardware")
+    {
         ui->rbHardwareControl->setChecked(true);
+    }
     else if (flowControlSetting == "software")
+    {
         ui->rbSoftwareControl->setChecked(true);
+    }
     else
+    {
         ui->rbNoFlowControl->setChecked(true);
+    }
     selectFlowControl(flowControlButtons.checkedId());
     settings->endGroup();
+}

src/portcontrol.h

➞

Show inline comments

@@ @@ -39,25 +39,25 @@ class PortControl : public QWidget @@
+{
     Q_OBJECT
 public:
     explicit PortControl(QSerialPort* port, QWidget* parent = 0);
     ~PortControl();
     QSerialPort* serialPort;
     QToolBar* toolBar();
     /// Stores port settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads port settings from a `QSettings`
+    /// Loads port settings from a `QSettings`. If open serial port is closed.
     void loadSettings(QSettings* settings);
 private:
     Ui::PortControl *ui;
     QButtonGroup parityButtons;
     QButtonGroup dataBitsButtons;
     QButtonGroup stopBitsButtons;
     QButtonGroup flowControlButtons;
     QToolBar portToolBar;
     QAction openAction;

0 comments (0 inline, 0 general)