jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_gui: Sort frequency and signal numerically in the scan results dialog

Browse source 
Signal strength was sorted lexically rather than numerically, which
put "-100 dBm" before "-50 dBm" if sorted in descending order.
This change fixes that. It also treats frequency in the same
manner, preparing it for the IEEE 802.11ah.

Signed-off-by: Adrian Nowicki <adinowicki@gmail.com>
This commit is contained in:
Adrian Nowicki 2015-01-15 17:53:38 +01:00 committed by Jouni Malinen
parent fba25c99a5
commit ad905e4a79
4 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
wpa_supplicant/wpa_gui-qt4/scanresults.cpp
View file

@ -12,6 +12,7 @@
#include "signalbar.h"
#include "wpagui.h"
#include "networkconfig.h"
#include "scanresultsitem.h"
ScanResults::ScanResults(QWidget *parent, const char *, bool, Qt::WFlags)
@ -95,7 +96,7 @@ void ScanResults::updateResults()
ssid = (*it).mid(pos);
}
QTreeWidgetItem *item = new QTreeWidgetItem(scanResultsWidget);
ScanResultsItem *item = new ScanResultsItem(scanResultsWidget);
if (item) {
item->setText(0, ssid);
item->setText(1, bssid);

18
wpa_supplicant/wpa_gui-qt4/scanresultsitem.cpp Normal file
View file

@ -0,0 +1,18 @@
/*
* wpa_gui - ScanResultsItem class
* Copyright (c) 2015, Adrian Nowicki <adinowicki@gmail.com>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
*/
#include "scanresultsitem.h"
bool ScanResultsItem::operator< (const QTreeWidgetItem &other) const
{
int sortCol = treeWidget()->sortColumn();
if (sortCol == 2 || sortCol == 3) {
return text(sortCol).toInt() < other.text(sortCol).toInt();
}
return text(sortCol) < other.text(sortCol);
}

21
wpa_supplicant/wpa_gui-qt4/scanresultsitem.h Normal file
View file

@ -0,0 +1,21 @@
/*
* wpa_gui - ScanResultsItem class
* Copyright (c) 2015, Adrian Nowicki <adinowicki@gmail.com>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
*/
#ifndef SCANRESULTSITEM_H
#define SCANRESULTSITEM_H
#include <QtGui>
class ScanResultsItem : public QTreeWidgetItem
{
public:
ScanResultsItem(QTreeWidget *tree) : QTreeWidgetItem(tree) {}
bool operator< (const QTreeWidgetItem &other) const;
};
#endif /* SCANRESULTSITEM_H */

2
wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
View file

@ -34,6 +34,7 @@ HEADERS += wpamsg.h \
wpagui.h \
eventhistory.h \
scanresults.h \
scanresultsitem.h \
signalbar.h \
userdatarequest.h \
networkconfig.h \
@ -45,6 +46,7 @@ SOURCES += main.cpp \
wpagui.cpp \
eventhistory.cpp \
scanresults.cpp \
scanresultsitem.cpp \
signalbar.cpp \
userdatarequest.cpp \
networkconfig.cpp \