tempo-plotter Changeset - 9b553a2ff43b · protofusion repositories

Changeset - 9b553a2ff43b

Parent rev.

Child rev.

[Not reviewed]

portlist

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-03 14:43:13
hy@ozderya.net

connected cbPortList to PortList model, and synchronized with toolbar combobox

2 files changed with 25 insertions and 34 deletions:

portcontrol.cpp

portcontrol.h

0 comments (0 inline, 0 general)

portcontrol.cpp

➞

Show inline comments

@@ @@ -40,14 +40,22 @@ PortControl::PortControl(QSerialPort* po @@
     openAction.setShortcut(QKeySequence("F2"));
     openAction.setToolTip("Open Port (F2)");
     QObject::connect(&openAction, &QAction::triggered,
                      this, &PortControl::openActionTriggered);
     portToolBar.addAction(&openAction);
     portToolBar.addWidget(&tbPortListBox);
     tbPortListBox.setModel(&portList);
     portToolBar.addWidget(&tbPortList);
     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);
     // setup buttons
     QObject::connect(ui->pbReloadPorts, &QPushButton::clicked,
                      this, &PortControl::loadPortList);
     ui->pbOpenPort->setDefaultAction(&openAction);
@@ @@ -118,43 +126,13 @@ PortControl::~PortControl() @@
+{
     delete ui;
+}
 void PortControl::loadPortList()
+{
     QString currentSelection = ui->cbPortList->currentText();
     ui->cbPortList->clear();
     discoveredPorts.clear();
     for (auto port : QSerialPortInfo::availablePorts())
+    {
         QString pName = port.portName();
         if (!port.description().isEmpty()) pName += QString(" ") + port.description();
         if (port.hasProductIdentifier())
+        {
             QString vID = QString("%1").arg(port.vendorIdentifier(), 4, 16, QChar('0'));
             QString pID = QString("%1").arg(port.productIdentifier(), 4, 16, QChar('0'));
             pName = pName + " [" + vID + ":" + pID + "]";
+        }
         ui->cbPortList->addItem(pName);
         discoveredPorts << port.portName();
+    }
     ui->cbPortList->addItems(userEnteredPorts);
     // find current selection in the new list, maybe it doesn't exist anymore?
     int currentSelectionIndex = ui->cbPortList->findText(currentSelection);
     if (currentSelectionIndex >= 0)
+    {
         ui->cbPortList->setCurrentIndex(currentSelectionIndex);
+    }
     else // our port doesn't exist anymore, close port if it's open
+    {
         if (serialPort->isOpen()) togglePort();
+    }
     portList.loadPortList();
+}
 void PortControl::loadBaudRateList()
+{
     ui->cbBaudRate->clear();
@@ @@ -303,6 +281,16 @@ QToolBar* PortControl::toolBar() @@
+}
 void PortControl::openActionTriggered(bool checked)
+{
     togglePort();
+}
 void PortControl::onCbPortListActivated(int index)
+{
     tbPortList.setCurrentIndex(index);
+}
 void PortControl::onTbPortListActivated(int index)
+{
     ui->cbPortList->setCurrentIndex(index);
+}

portcontrol.h

➞

Show inline comments

@@ @@ -53,13 +53,13 @@ private: @@
     QButtonGroup dataBitsButtons;
     QButtonGroup stopBitsButtons;
     QButtonGroup flowControlButtons;
     QToolBar portToolBar;
     QAction openAction;
-    QComboBox tbPortListBox;
+    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
@@ @@ -77,12 +77,15 @@ public slots: @@
     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)