tempo-plotter Changeset - be61b4b13812 · protofusion repositories

Changeset - be61b4b13812

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-02 00:13:28
hy@ozderya.net

added portToolBar with "Open" button

3 files changed with 30 insertions and 1 deletions:

mainwindow.cpp

portcontrol.cpp

portcontrol.h

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -39,24 +39,25 @@ @@
 #include <QtPlugin>
 Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
 #endif
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     portControl(&serialPort)
+{
     ui->setupUi(this);
     ui->tabWidget->insertTab(0, &portControl, "Port");
     ui->tabWidget->setCurrentIndex(0);
     addToolBar(portControl.toolBar());
     setupAboutDialog();
     // init UI signals
     // menu signals
     QObject::connect(ui->actionHelpAbout, &QAction::triggered,
               &aboutDialog, &QWidget::show);
     QObject::connect(ui->actionExportCsv, &QAction::triggered,
                      this, &MainWindow::onExportCsv);

portcontrol.cpp

➞

Show inline comments

@@ @@ -17,30 +17,39 @@ @@
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "portcontrol.h"
 #include "ui_portcontrol.h"
 #include <QSerialPortInfo>
 #include <QtDebug>
 #include "utils.h"
 PortControl::PortControl(QSerialPort* port, QWidget* parent) :
     QWidget(parent),
     ui(new Ui::PortControl)
     ui(new Ui::PortControl),
     portToolBar("Port"),
     openAction("Open", this)
+{
     ui->setupUi(this);
     serialPort = port;
     // setup the toolbar
     openAction.setCheckable(true);
     QObject::connect(&openAction, &QAction::triggered,
                      this, &PortControl::openActionTriggered);
     portToolBar.addAction(&openAction);
     // setup buttons
     QObject::connect(ui->pbReloadPorts, &QPushButton::clicked,
                      this, &PortControl::loadPortList);
     QObject::connect(ui->pbOpenPort, &QPushButton::clicked,
                      this, &PortControl::togglePort);
     // 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);
@@ @@ -231,24 +240,25 @@ void PortControl::togglePort() @@
             // set port settings
             selectBaudRate(ui->cbBaudRate->currentText());
             selectParity((QSerialPort::Parity) parityButtons.checkedId());
             selectDataBits((QSerialPort::DataBits) dataBitsButtons.checkedId());
             selectStopBits((QSerialPort::StopBits) stopBitsButtons.checkedId());
             selectFlowControl((QSerialPort::FlowControl) flowControlButtons.checkedId());
             qDebug() << "Opened port:" << serialPort->portName();
             emit portToggled(true);
+        }
+    }
     ui->pbOpenPort->setChecked(serialPort->isOpen());
     openAction.setChecked(serialPort->isOpen());
+}
 void PortControl::selectPort(QString portName)
+{
     // portName may be coming from combobox
     portName = portName.split(" ")[0];
     // has selection actually changed
     if (portName != serialPort->portName())
+    {
         // if another port is already open, close it by toggling
         if (serialPort->isOpen())
+        {
@@ @@ -273,12 +283,22 @@ void PortControl::keepPortName(QString p @@
         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();
+}

portcontrol.h

➞

Show inline comments

@@ @@ -15,61 +15,69 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef PORTCONTROL_H
 #define PORTCONTROL_H
 #include <QWidget>
 #include <QButtonGroup>
 #include <QSerialPort>
 #include <QStringList>
 #include <QToolBar>
 #include <QAction>
 namespace Ui {
 class PortControl;
+}
 class PortControl : public QWidget
+{
     Q_OBJECT
 public:
     explicit PortControl(QSerialPort* port, QWidget* parent = 0);
     ~PortControl();
     QSerialPort* serialPort;
     QToolBar* toolBar();
 private:
     Ui::PortControl *ui;
     QButtonGroup parityButtons;
     QButtonGroup dataBitsButtons;
     QButtonGroup stopBitsButtons;
     QButtonGroup flowControlButtons;
     QToolBar portToolBar;
     QAction openAction;
     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);
 signals:
     void skipByteRequested();
     void portToggled(bool open);
 };
 #endif // PORTCONTROL_H

0 comments (0 inline, 0 general)