tempo-plotter Changeset - 40acd76815dc · protofusion repositories

Changeset - 40acd76815dc

Parent rev.

Child rev.

[Not reviewed]

portlist

0 3 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-03 15:20:27
hy@ozderya.net

add user entered port to list when opening port (if not already in the list)

3 files changed with 25 insertions and 5 deletions:

portcontrol.cpp

portlist.cpp

portlist.h

0 comments (0 inline, 0 general)

portcontrol.cpp

➞

Show inline comments

@@ @@ -118,179 +118,186 @@ PortControl::PortControl(QSerialPort* po @@
                      [this](){emit skipByteRequested();});
     loadPortList();
     loadBaudRateList();
     ui->cbBaudRate->setCurrentIndex(ui->cbBaudRate->findText("9600"));
+}
 PortControl::~PortControl()
+{
     delete ui;
+}
 void PortControl::loadPortList()
+{
     portList.loadPortList();
+}
 void PortControl::loadBaudRateList()
+{
     ui->cbBaudRate->clear();
     for (auto baudRate : QSerialPortInfo::standardBaudRates())
+    {
         ui->cbBaudRate->addItem(QString::number(baudRate));
+    }
+}
 void PortControl::selectBaudRate(QString baudRate)
+{
     if (serialPort->isOpen())
+    {
         if (!serialPort->setBaudRate(baudRate.toInt()))
+        {
             qCritical() << "Can't set baud rate!";
+        }
         else
+        {
             qDebug() << "Baud rate changed to" << serialPort->baudRate();
+        }
+    }
+}
 void PortControl::selectParity(int parity)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setParity((QSerialPort::Parity) parity))
+        {
             qCritical() << "Can't set parity option!";
+        }
+    }
+}
 void PortControl::selectDataBits(int dataBits)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setDataBits((QSerialPort::DataBits) dataBits))
+        {
             qCritical() << "Can't set numer of data bits!";
+        }
+    }
+}
 void PortControl::selectStopBits(int stopBits)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setStopBits((QSerialPort::StopBits) stopBits))
+        {
             qCritical() << "Can't set number of stop bits!";
+        }
+    }
+}
 void PortControl::selectFlowControl(int flowControl)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setFlowControl((QSerialPort::FlowControl) flowControl))
+        {
             qCritical() << "Can't set flow control option!";
+        }
+    }
+}
 void PortControl::togglePort()
+{
     if (serialPort->isOpen())
+    {
         serialPort->close();
         qDebug() << "Closed port:" << serialPort->portName();
         emit portToggled(false);
+    }
     else
+    {
         // port name may contain description
         QString portName = ui->cbPortList->currentText().split(" ")[0];
         keepPortName(portName);
         // we get the port name from the edit text, which may not be
         // in the portList if user hasn't pressed Enter
         QString portName = ui->cbPortList->currentText();
         int portIndex = portList.indexOf(portName);
         if (portIndex < 0) // not in list, add to model and update the selections
+        {
             portList.appendRow(new PortListItem(portName));
             ui->cbPortList->setCurrentIndex(portList.rowCount()-1);
             tbPortList.setCurrentIndex(portList.rowCount()-1);
+        }
         serialPort->setPortName(portName);
         // open port
         if (serialPort->open(QIODevice::ReadWrite))
+        {
             // 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);
+        }
+    }
     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())
+        {
             togglePort();
             // 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)
+{
     tbPortList.setCurrentIndex(index);
+}
 void PortControl::onTbPortListActivated(int index)
+{
     ui->cbPortList->setCurrentIndex(index);
+}

portlist.cpp

➞

Show inline comments

 /*
   Copyright © 2015 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <QVariant>
 #include <QtDebug>
 #include "portlist.h"
 PortListItem::PortListItem(QString name, QString description, quint16 vid, quint16 pid)
+{
     construct(name, description, vid, pid);
+}
 PortListItem::PortListItem(QSerialPortInfo* portInfo)
+{
     if (portInfo->hasProductIdentifier())
+    {
         construct(portInfo->portName(),
                   portInfo->description(),
                   portInfo->vendorIdentifier(),
                   portInfo->productIdentifier());
+    }
     else
+    {
         construct(portInfo->portName());
+    }
+}
 void PortListItem::construct(QString name, QString description, quint16 vid, quint16 pid)
+{
     QString text = name;
     if (!description.isEmpty())
+    {
         text += QString(" ") + description;
+    }
     if (vid && pid)
+    {
         text += QString("[%1:").arg(vid, 4, 16, QChar('0'));
         text += QString("%1]").arg(pid, 4, 16, QChar('0'));
+    }
     setText(text);
     setData(name, PortNameRole);
+}
-QString PortListItem::name()
+QString PortListItem::portName()
+{
     return data(PortNameRole).toString();
+}
 PortList::PortList(QObject* parent) :
     QStandardItemModel(parent)
+{
     loadPortList();
+}
 void PortList::loadPortList()
+{
     clear();
     for (auto portInfo : QSerialPortInfo::availablePorts())
+    {
         appendRow(new PortListItem(&portInfo));
+    }
+}
 int PortList::indexOf(QString portName)
+{
     for (int i = 0; i < rowCount(); i++)
+    {
         if (static_cast<PortListItem*>(item(i))->portName() == portName)
+        {
             return i;
+        }
+    }
     return -1; // not found
+}

portlist.h

➞

Show inline comments

 /*
   Copyright © 2015 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <QStandardItemModel>
 #include <QStandardItem>
 #include <QList>
 #include <QSerialPortInfo>
 enum PortListRoles
+{
     PortNameRole = Qt::UserRole  // portName as QString
 };
 class PortListItem : public QStandardItem
+{
 public:
     PortListItem(QString name, QString description="", quint16 vid=0, quint16 pid=0);
     PortListItem(QSerialPortInfo* portInfo);
-    QString name(); // returns only the port name
+    QString portName(); // returns only the port name
 private:
     // common constructor
     void construct(QString name, QString description="", quint16 vid=0, quint16 pid=0);
 };
 class PortList : public QStandardItemModel
+{
 public:
     PortList(QObject* parent=0);
     void loadPortList();
     int indexOf(QString portName); // return -1 if not found
 private:
     QList<PortListItem*> userEnteredPorts;
 };

0 comments (0 inline, 0 general)