tempo-plotter Changeset - 160b17420197 · protofusion repositories

Changeset - 160b17420197

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-08-12 16:27:10
hy@ozderya.net

added reload port list button to toolbar

3 files changed with 11 insertions and 6 deletions:

src/portcontrol.cpp

src/portcontrol.h

src/portcontrol.ui

0 comments (0 inline, 0 general)

src/portcontrol.cpp

➞

Show inline comments

@@ @@ -23,62 +23,66 @@ @@
 #include <QSerialPortInfo>
 #include <QKeySequence>
 #include <QLabel>
 #include <QtDebug>
 #include "utils.h"
 #define TBPORTLIST_MINWIDTH (200)
 PortControl::PortControl(QSerialPort* port, QWidget* parent) :
     QWidget(parent),
     ui(new Ui::PortControl),
     portToolBar("Port Toolbar"),
     openAction("Open", this)
     openAction("Open", this),
     loadPortListAction("↺", this)
+{
     ui->setupUi(this);
     serialPort = port;
-    // setup the toolbar
+    // setup actions
     openAction.setCheckable(true);
     openAction.setShortcut(QKeySequence("F12"));
     openAction.setToolTip("Open Port");
     QObject::connect(&openAction, &QAction::triggered,
                      this, &PortControl::openActionTriggered);
     QObject::connect(&loadPortListAction, &QAction::triggered,
                      [this](bool checked){loadPortList();});
     // setup toolbar
     portToolBar.addWidget(&tbPortList);
     portToolBar.addAction(&loadPortListAction);
     portToolBar.addAction(&openAction);
     // setup port selection widgets
     tbPortList.setMinimumWidth(TBPORTLIST_MINWIDTH);
     tbPortList.setModel(&portList);
     ui->cbPortList->setModel(&portList);
     QObject::connect(ui->cbPortList,
                      SELECT<int>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::onCbPortListActivated);
     QObject::connect(&tbPortList,
                      SELECT<int>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::onTbPortListActivated);
     QObject::connect(ui->cbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::selectPort);
     QObject::connect(&tbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::selectPort);
     // setup buttons
     QObject::connect(ui->pbReloadPorts, &QPushButton::clicked,
                      this, &PortControl::loadPortList);
     ui->pbOpenPort->setDefaultAction(&openAction);
     ui->pbReloadPorts->setDefaultAction(&loadPortListAction);
     // setup baud rate selection widget
     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,

src/portcontrol.h

➞

Show inline comments

@@ @@ -47,24 +47,25 @@ public: @@
     QToolBar* toolBar();
 private:
     Ui::PortControl *ui;
     QButtonGroup parityButtons;
     QButtonGroup dataBitsButtons;
     QButtonGroup stopBitsButtons;
     QButtonGroup flowControlButtons;
     QToolBar portToolBar;
     QAction openAction;
     QAction loadPortListAction;
     QComboBox tbPortList;
     PortList portList;
 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

src/portcontrol.ui

➞

Show inline comments

@@ @@ -47,25 +47,25 @@ @@
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="label_2">
          <property name="text">
           <string>Baud Rate:</string>
          </property>
         </widget>
        </item>
        <item row="0" column="2">
-        <widget class="QPushButton" name="pbReloadPorts">
+        <widget class="QToolButton" name="pbReloadPorts">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="maximumSize">
           <size>
            <width>30</width>
            <height>16777215</height>
           </size>
          </property>

0 comments (0 inline, 0 general)