diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,7 @@ add_executable(${PROGRAM_NAME} WIN32 zoomer.cpp hidabletabwidget.cpp framebuffer.cpp + portlist.cpp ${UI_FILES} misc/windows_icon.rc ) diff --git a/portcontrol.cpp b/portcontrol.cpp --- a/portcontrol.cpp +++ b/portcontrol.cpp @@ -43,6 +43,9 @@ PortControl::PortControl(QSerialPort* po this, &PortControl::openActionTriggered); portToolBar.addAction(&openAction); + portToolBar.addWidget(&tbPortListBox); + tbPortListBox.setModel(&portList); + // setup buttons QObject::connect(ui->pbReloadPorts, &QPushButton::clicked, this, &PortControl::loadPortList); diff --git a/portcontrol.h b/portcontrol.h --- a/portcontrol.h +++ b/portcontrol.h @@ -26,6 +26,9 @@ #include #include #include +#include + +#include "portlist.h" namespace Ui { class PortControl; @@ -53,6 +56,8 @@ private: QToolBar portToolBar; QAction openAction; + QComboBox tbPortListBox; + PortList portList; QStringList discoveredPorts; // list of port names returned by availablePorts QStringList userEnteredPorts; // list of port names entered by user diff --git a/portlist.cpp b/portlist.cpp new file mode 100644 --- /dev/null +++ b/portlist.cpp @@ -0,0 +1,80 @@ +/* + 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 . +*/ + +#include +#include + +#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() +{ + return data(PortNameRole).toString(); +} + +PortList::PortList(QObject* parent) : + QStandardItemModel(parent) +{ + loadPortList(); +} + +void PortList::loadPortList() +{ + clear(); + + for (auto portInfo : QSerialPortInfo::availablePorts()) + { + appendRow(new PortListItem(&portInfo)); + } +} diff --git a/portlist.h b/portlist.h new file mode 100644 --- /dev/null +++ b/portlist.h @@ -0,0 +1,52 @@ +/* + 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 . +*/ + +#include +#include +#include +#include + +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 + +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(); + +private: + QList userEnteredPorts; +};