tempo-plotter Changeset - 1d9b6c31956c · protofusion repositories

Changeset - 1d9b6c31956c

Parent rev.

Child rev.

[Not reviewed]

portlist

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-05 03:41:17
hy@ozderya.net

removed keepPortName, its functionality is now provided by PortList

2 files changed with 0 insertions and 27 deletions:

portcontrol.cpp

portcontrol.h

0 comments (0 inline, 0 general)

portcontrol.cpp

➞

Show inline comments

@@ @@ -57,28 +57,24 @@ PortControl::PortControl(QSerialPort* po @@
     // setup buttons
     QObject::connect(ui->pbReloadPorts, &QPushButton::clicked,
                      this, &PortControl::loadPortList);
     ui->pbOpenPort->setDefaultAction(&openAction);
     // TODO: port name coming from combobox is dirty, create a separate layer of signals
     //       that will sanitize this information
     QObject::connect(ui->cbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::selectPort);
     QObject::connect(ui->cbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::onPortNameChanged);
     QObject::connect(ui->cbBaudRate,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::selectBaudRate);
     // setup parity selection buttons
     parityButtons.addButton(ui->rbNoParity, (int) QSerialPort::NoParity);
     parityButtons.addButton(ui->rbEvenParity, (int) QSerialPort::EvenParity);
     parityButtons.addButton(ui->rbOddParity, (int) QSerialPort::OddParity);
     QObject::connect(&parityButtons,
                      SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
                      this, &PortControl::selectParity);
@@ @@ -270,42 +266,24 @@ void PortControl::selectPort(QString por @@
             // open new selection by toggling
             togglePort();
+        }
+    }
+}
 void PortControl::enableSkipByte(bool enabled)
+{
     ui->pbSkipByte->setDisabled(enabled);
+}
 void PortControl::keepPortName(QString portName)
+{
     if(!discoveredPorts.contains(portName) &&
        !userEnteredPorts.contains(portName))
+    {
         userEnteredPorts << portName;
+    }
     if(ui->cbPortList->findText(portName) < 0)
+    {
         ui->cbPortList->addItem(portName);
+    }
+}
 void PortControl::onPortNameChanged(QString portName)
+{
     keepPortName(portName);
+}
 QToolBar* PortControl::toolBar()
+{
     return &portToolBar;
+}
 void PortControl::openActionTriggered(bool checked)
+{
     togglePort();
+}
 void PortControl::onCbPortListActivated(int index)
+{

portcontrol.h

➞

Show inline comments

@@ @@ -50,42 +50,37 @@ private: @@
     Ui::PortControl *ui;
     QButtonGroup parityButtons;
     QButtonGroup dataBitsButtons;
     QButtonGroup stopBitsButtons;
     QButtonGroup flowControlButtons;
     QToolBar portToolBar;
     QAction openAction;
     QComboBox tbPortList;
     PortList portList;
     QStringList discoveredPorts; // list of port names returned by availablePorts
     QStringList userEnteredPorts; // list of port names entered by user
     void keepPortName(QString portName); // if it's not already in userEn. or discv. list
 public slots:
     void loadPortList();
     void loadBaudRateList();
     void togglePort();
     void selectPort(QString portName);
     void enableSkipByte(bool enabled = true);
     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 onPortNameChanged(QString portName);
     void openActionTriggered(bool checked);
     void onCbPortListActivated(int index);
     void onTbPortListActivated(int index);
 signals:
     void skipByteRequested();
     void portToggled(bool open);
 };
 #endif // PORTCONTROL_H

0 comments (0 inline, 0 general)