author | zecke <zecke> | 2005-03-12 23:56:15 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-03-12 23:56:15 (UTC) |
commit | eaec48ce99bc4e2f4e53dbd539a031b3ed993fb3 (patch) (unidiff) | |
tree | 0b88cd5c35336003b06a9df3717435a1ad396f09 | |
parent | 0dde10390f3b9c85030741e861d893a6a78fbbb1 (diff) | |
download | opie-eaec48ce99bc4e2f4e53dbd539a031b3ed993fb3.zip opie-eaec48ce99bc4e2f4e53dbd539a031b3ed993fb3.tar.gz opie-eaec48ce99bc4e2f4e53dbd539a031b3ed993fb3.tar.bz2 |
Sort packagaes and channels (numbers) according their size instead
of alphabeticaly. 9873 received packages are more than 10 but less than
10.000.
The same is applied to the channel number [0..15]
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 21 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.h | 2 |
2 files changed, 23 insertions, 0 deletions
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 8c2015e..f24e09f 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -554,16 +554,37 @@ void MScanListItem::setLocation( const QString& location ) | |||
554 | 554 | ||
555 | 555 | ||
556 | void MScanListItem::receivedBeacon() | 556 | void MScanListItem::receivedBeacon() |
557 | { | 557 | { |
558 | _beacons++; | 558 | _beacons++; |
559 | #ifdef DEBUG | 559 | #ifdef DEBUG |
560 | odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl; | 560 | odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl; |
561 | #endif | 561 | #endif |
562 | setText( col_sig, QString::number( _beacons ) ); | 562 | setText( col_sig, QString::number( _beacons ) ); |
563 | setText( col_lastseen, QTime::currentTime().toString() ); | 563 | setText( col_lastseen, QTime::currentTime().toString() ); |
564 | 564 | ||
565 | MScanListItem* p = (MScanListItem*) parent(); | 565 | MScanListItem* p = (MScanListItem*) parent(); |
566 | if ( p ) p->receivedBeacon(); | 566 | if ( p ) p->receivedBeacon(); |
567 | 567 | ||
568 | } | 568 | } |
569 | 569 | ||
570 | QString MScanListItem::key( int id, bool b )const { | ||
571 | QString str; | ||
572 | |||
573 | /* | ||
574 | * Pad the amount of received packages, number | ||
575 | * of the channel. | ||
576 | */ | ||
577 | switch( id ) { | ||
578 | case col_sig: | ||
579 | str = text(col_sig).rightJustify( 20, '0' ); | ||
580 | break; | ||
581 | case col_channel: | ||
582 | str = text(col_channel).rightJustify( 2, '0' ); | ||
583 | break; | ||
584 | default: | ||
585 | str = Opie::Ui::OListViewItem::key( id, b ); | ||
586 | break; | ||
587 | } | ||
588 | |||
589 | return str; | ||
590 | } | ||
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index 6a80f70..8b3814a 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h | |||
@@ -97,32 +97,34 @@ class MScanListItem: public Opie::Ui::OListViewItem | |||
97 | const QString& macaddr() { return _macaddr; }; | 97 | const QString& macaddr() { return _macaddr; }; |
98 | bool wep() { return _wep; }; | 98 | bool wep() { return _wep; }; |
99 | int channel() { return _channel; }; | 99 | int channel() { return _channel; }; |
100 | int signal() { return _signal; }; | 100 | int signal() { return _signal; }; |
101 | int beacons() { return _beacons; }; | 101 | int beacons() { return _beacons; }; |
102 | 102 | ||
103 | void setSignal( int signal ) { /* TODO */ }; | 103 | void setSignal( int signal ) { /* TODO */ }; |
104 | void receivedBeacon(); | 104 | void receivedBeacon(); |
105 | 105 | ||
106 | void setManufacturer( const QString& manufacturer ); | 106 | void setManufacturer( const QString& manufacturer ); |
107 | void setLocation( const QString& location ); | 107 | void setLocation( const QString& location ); |
108 | 108 | ||
109 | virtual Opie::Ui::OListViewItem* childFactory(); | 109 | virtual Opie::Ui::OListViewItem* childFactory(); |
110 | virtual void serializeTo( QDataStream& s ) const; | 110 | virtual void serializeTo( QDataStream& s ) const; |
111 | virtual void serializeFrom( QDataStream& s ); | 111 | virtual void serializeFrom( QDataStream& s ); |
112 | 112 | ||
113 | virtual QString key( int id, bool )const; | ||
114 | |||
113 | private: | 115 | private: |
114 | QString _type; | 116 | QString _type; |
115 | QString _essid; | 117 | QString _essid; |
116 | QString _macaddr; | 118 | QString _macaddr; |
117 | bool _wep; | 119 | bool _wep; |
118 | int _channel; | 120 | int _channel; |
119 | int _signal; | 121 | int _signal; |
120 | int _beacons; | 122 | int _beacons; |
121 | 123 | ||
122 | }; | 124 | }; |
123 | 125 | ||
124 | //****************************** MScanListViewFactory **************************************************************** | 126 | //****************************** MScanListViewFactory **************************************************************** |
125 | 127 | ||
126 | /* | 128 | /* |
127 | 129 | ||
128 | class MScanListViewFactory : public Opie::Ui::OListViewFactory | 130 | class MScanListViewFactory : public Opie::Ui::OListViewFactory |