rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-26 15:54:15 +01:00
Code Issues Releases Activity

GCS/ConnectionManager: Fixed an issue with device list removal

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@484 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
julien 2010-04-11 21:32:08 +00:00 committed by julien
parent a4147d5fb2
commit 3581e37627
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ground/src/plugins/coreplugin/connectionmanager.cpp
View File

@ -200,17 +200,21 @@ devListItem ConnectionManager::findDevice(const QString &displayedName)
void ConnectionManager::unregisterAll(IConnection *connection) void ConnectionManager::unregisterAll(IConnection *connection)
{ {
for(QLinkedList<devListItem>::iterator iter = m_devList.begin(); for(QLinkedList<devListItem>::iterator iter = m_devList.begin();
iter != m_devList.end(); ++iter) iter != m_devList.end(); )
{ {
if(iter->connection == connection) if(iter->connection == connection)
{ {
iter = m_devList.erase(iter); iter = m_devList.erase(iter);
} }
else
{
++iter;
}
} }
} }
/** /**
* Register a device from one connection plugin * Register a device from a specific connection plugin
*/ */
void ConnectionManager::registerDevice(IConnection *conn, const QString &devN, const QString &disp) void ConnectionManager::registerDevice(IConnection *conn, const QString &devN, const QString &disp)
{ {
@ -229,18 +233,21 @@ void ConnectionManager::registerDevice(IConnection *conn, const QString &devN, c
*/ */
void ConnectionManager::devChanged(IConnection *connection) void ConnectionManager::devChanged(IConnection *connection)
{ {
//remove all registered devices //clear device list combobox
m_availableDevList->clear(); m_availableDevList->clear();
//remove registered devices of this IConnection from the list
unregisterAll(connection); unregisterAll(connection);
//and add them back in the list //and add them back in the list
foreach(QString dev, connection->availableDevices()) QStringList availableDev = connection->availableDevices();
foreach(QString dev, availableDev)
{ {
QString cbName = connection->shortName() + ": " + dev; QString cbName = connection->shortName() + ": " + dev;
registerDevice(connection, dev, cbName); registerDevice(connection, dev, cbName);
} }
//add all the list to the combobox //add all the list again to the combobox
foreach(devListItem d, m_devList) foreach(devListItem d, m_devList)
{ {
m_availableDevList->addItem(d.displayedName); m_availableDevList->addItem(d.displayedName);

3
ground/src/plugins/serialconnection/serialplugin.cpp
View File

@ -60,6 +60,9 @@ QStringList SerialConnection::availableDevices()
{ {
QStringList list; QStringList list;
QList<QextPortInfo> ports = QextSerialEnumerator::getPorts(); QList<QextPortInfo> ports = QextSerialEnumerator::getPorts();
//sort the list by port number (nice idea from PT_Dreamer :))
qSort(ports.begin(), ports.end());
foreach( QextPortInfo port, ports ) { foreach( QextPortInfo port, ports ) {
list.append(port.friendName); list.append(port.friendName);
} }