info now works

8 files changed, 132 insertions, 28 deletions

diff --git a/noncore/net/networksetup/wlan/info.ui b/noncore/net/networksetup/wlan/info.ui
index 4e85b1b..52d3a43 100644
--- a/noncore/net/networksetup/wlan/info.ui
+++ b/noncore/net/networksetup/wlan/info.ui
@@ -222,13 +222,13 @@
                         <number>11</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
                     </property>
-                    <spacer row="3"  column="1" >
+                    <spacer row="4"  column="1" >
                         <property>
                             <name>name</name>
                             <cstring>Spacer2</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
@@ -297,12 +297,45 @@
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Quality</string>
                         </property>
                     </widget>
+                    <widget row="3"  column="0" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>TextLabel4_2</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Rate</string>
+                        </property>
+                    </widget>
+                    <widget row="3"  column="1" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>rateLabel</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>sizePolicy</name>
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>1</vsizetype>
+                            </sizepolicy>
+                        </property>
+                        <property stdset="1">
+                            <name>frameShape</name>
+                            <enum>Panel</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>frameShadow</name>
+                            <enum>Sunken</enum>
+                        </property>
+                    </widget>
                 </grid>
             </widget>
         </widget>
     </vbox>
 </widget>
 <customwidgets>
diff --git a/noncore/net/networksetup/wlan/wextensions.cpp b/noncore/net/networksetup/wlan/wextensions.cpp
index f45ebf2..ef4ba8f 100644
--- a/noncore/net/networksetup/wlan/wextensions.cpp
+++ b/noncore/net/networksetup/wlan/wextensions.cpp
@@ -7,14 +7,14 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
 #include <math.h>
 
 #define PROCNETWIRELESS "/proc/net/wireless"
-#define IW_LOWER 140
-#define IW_UPPER 200
+#define IW_LOWER 0
+#define IW_UPPER 256
 
 /**
  * Constructor.  Sets hasWirelessExtensions
  */ 
 WExtensions::WExtensions(QString interfaceName){
   interface = interfaceName;
@@ -86,15 +86,28 @@ QString WExtensions::mode(){
  */ 
 double WExtensions::frequency(){
   if(!hasWirelessExtensions)
     return 0;
   if ( 0 == ioctl( fd, SIOCGIWFREQ, &iwr ))
     return (double( iwr.u.freq.m ) * pow( 10, iwr.u.freq.e ) / 1000000000);
-  return 0;;
+  return 0;
 }
 
+/***
+ * Get the current rate that the card is transmiting at.
+ */ 
+double WExtensions::rate(){
+  if(!hasWirelessExtensions)
+    return 0;
+  if(0 == ioctl(fd, SIOCGIWRATE, &iwr)){
+    return ((double)iwr.u.bitrate.value)/1000000;
+  }
+  return 0;
+}
+
+
 /**
  * @return QString the AccessPoint that the interface is connected to.
  */ 
 QString WExtensions::ap(){
   if(!hasWirelessExtensions)
     return QString();
@@ -107,15 +120,21 @@ QString WExtensions::ap(){
       iwr.u.ap_addr.sa_data[3]&0xff,
       iwr.u.ap_addr.sa_data[4]&0xff,
       iwr.u.ap_addr.sa_data[5]&0xff );
     return ap;
   }
   else return QString();
-
 }
 
+/**
+ * Get the stats for interfaces
+ * @param signal the signal strength of interface
+ * @param noise the noise level of the interface
+ * @param quality the quality level of the interface
+ * @return bool true if successfull
+ */ 
 bool WExtensions::stats(int &signal, int &noise, int &quality){
   // gather link quality from /proc/net/wireless
   if(!QFile::exists(PROCNETWIRELESS))
     return false;
 
   char c;
@@ -128,30 +147,28 @@ bool WExtensions::stats(int &signal, int &noise, int &quality){
   
   QTextStream wstream( &wfile );
   wstream.readLine();  // skip the first two lines
   wstream.readLine();  // because they only contain headers
   while(!wstream.atEnd()){
     wstream >> name >> status >> quality >> c >> signal >> c >> noise;
-    if(name == interface){
+    if(name == QString("%1:").arg(interface)){
       if ( quality > 92 )
-        #ifdef MDEBUG
         qDebug( "WIFIAPPLET: D'oh! Quality %d > estimated max!\n", quality );
-        #endif
       if ( ( signal > IW_UPPER ) || ( signal < IW_LOWER ) )
-        #ifdef MDEBUG
         qDebug( "WIFIAPPLET: Doh! Strength %d > estimated max!\n", signal );
-        #endif
       if ( ( noise > IW_UPPER ) || ( noise < IW_LOWER ) )
-        #ifdef MDEBUG
         qDebug( "WIFIAPPLET: Doh! Noise %d > estimated max!\n", noise );
-        #endif
+      qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1());
+      signal = ( ( signal-IW_LOWER ) * 100 ) / IW_UPPER;
+      noise = ( ( noise-IW_LOWER ) * 100 ) / IW_UPPER;
+      quality = ( quality*100 ) / 92;
       return true;
     }  
   }
 
-  qDebug("Card no longer present");
+  qDebug("WExtensions::statsCard no longer present.");
   quality = -1;
   signal = IW_LOWER;
   noise = IW_LOWER;
   return false;
 }
 
diff --git a/noncore/net/networksetup/wlan/wextensions.h b/noncore/net/networksetup/wlan/wextensions.h
index 29997f5..1565eb5 100644
--- a/noncore/net/networksetup/wlan/wextensions.h
+++ b/noncore/net/networksetup/wlan/wextensions.h
@@ -13,12 +13,13 @@ public:
   QString getInterfaceName(){return interface;};
   bool doesHaveWirelessExtensions(){return hasWirelessExtensions;};
   QString station();
   QString essid();
   QString mode();
   double frequency();
+  double rate();
   QString ap();
   bool stats( int &signal, int &noise, int &quality);
 
 private:
   bool hasWirelessExtensions;
   QString interface;
diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp
index ab0b9a5..73e753c 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.cpp
+++ b/noncore/net/networksetup/wlan/wlanmodule.cpp
@@ -80,20 +80,21 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
   (*tabWidget) = info->tabWidget;
   
   info->essidLabel->setText(we.essid());
   info->apLabel->setText(we.ap());
   info->stationLabel->setText(we.station());
   info->modeLabel->setText(we.mode());
-  info->freqLabel->setText(QString("%1").arg(we.frequency()));
+  info->freqLabel->setText(QString("%1 GHz").arg(we.frequency()));
   int signal = 0;
   int noise = 0;
   int quality = 0;
   we.stats(signal, noise, quality);
   info->signalProgressBar->setProgress(signal);
   info->noiseProgressBar->setProgress(noise);
   info->qualityProgressBar->setProgress(quality);
+  info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate()));
   return info;
 }
 
 /**
  * Get all active (up or down) interfaces
  * @return QList<Interface> A list of interfaces that exsist that havn't
diff --git a/noncore/settings/networksettings/wlan/info.ui b/noncore/settings/networksettings/wlan/info.ui
index 4e85b1b..52d3a43 100644
--- a/noncore/settings/networksettings/wlan/info.ui
+++ b/noncore/settings/networksettings/wlan/info.ui
@@ -222,13 +222,13 @@
                         <number>11</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
                     </property>
-                    <spacer row="3"  column="1" >
+                    <spacer row="4"  column="1" >
                         <property>
                             <name>name</name>
                             <cstring>Spacer2</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
@@ -297,12 +297,45 @@
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Quality</string>
                         </property>
                     </widget>
+                    <widget row="3"  column="0" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>TextLabel4_2</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Rate</string>
+                        </property>
+                    </widget>
+                    <widget row="3"  column="1" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>rateLabel</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>sizePolicy</name>
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>1</vsizetype>
+                            </sizepolicy>
+                        </property>
+                        <property stdset="1">
+                            <name>frameShape</name>
+                            <enum>Panel</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>frameShadow</name>
+                            <enum>Sunken</enum>
+                        </property>
+                    </widget>
                 </grid>
             </widget>
         </widget>
     </vbox>
 </widget>
 <customwidgets>
diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp
index f45ebf2..ef4ba8f 100644
--- a/noncore/settings/networksettings/wlan/wextensions.cpp
+++ b/noncore/settings/networksettings/wlan/wextensions.cpp
@@ -7,14 +7,14 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
 #include <math.h>
 
 #define PROCNETWIRELESS "/proc/net/wireless"
-#define IW_LOWER 140
-#define IW_UPPER 200
+#define IW_LOWER 0
+#define IW_UPPER 256
 
 /**
  * Constructor.  Sets hasWirelessExtensions
  */ 
 WExtensions::WExtensions(QString interfaceName){
   interface = interfaceName;
@@ -86,15 +86,28 @@ QString WExtensions::mode(){
  */ 
 double WExtensions::frequency(){
   if(!hasWirelessExtensions)
     return 0;
   if ( 0 == ioctl( fd, SIOCGIWFREQ, &iwr ))
     return (double( iwr.u.freq.m ) * pow( 10, iwr.u.freq.e ) / 1000000000);
-  return 0;;
+  return 0;
 }
 
+/***
+ * Get the current rate that the card is transmiting at.
+ */ 
+double WExtensions::rate(){
+  if(!hasWirelessExtensions)
+    return 0;
+  if(0 == ioctl(fd, SIOCGIWRATE, &iwr)){
+    return ((double)iwr.u.bitrate.value)/1000000;
+  }
+  return 0;
+}
+
+
 /**
  * @return QString the AccessPoint that the interface is connected to.
  */ 
 QString WExtensions::ap(){
   if(!hasWirelessExtensions)
     return QString();
@@ -107,15 +120,21 @@ QString WExtensions::ap(){
       iwr.u.ap_addr.sa_data[3]&0xff,
       iwr.u.ap_addr.sa_data[4]&0xff,
       iwr.u.ap_addr.sa_data[5]&0xff );
     return ap;
   }
   else return QString();
-
 }
 
+/**
+ * Get the stats for interfaces
+ * @param signal the signal strength of interface
+ * @param noise the noise level of the interface
+ * @param quality the quality level of the interface
+ * @return bool true if successfull
+ */ 
 bool WExtensions::stats(int &signal, int &noise, int &quality){
   // gather link quality from /proc/net/wireless
   if(!QFile::exists(PROCNETWIRELESS))
     return false;
 
   char c;
@@ -128,30 +147,28 @@ bool WExtensions::stats(int &signal, int &noise, int &quality){
   
   QTextStream wstream( &wfile );
   wstream.readLine();  // skip the first two lines
   wstream.readLine();  // because they only contain headers
   while(!wstream.atEnd()){
     wstream >> name >> status >> quality >> c >> signal >> c >> noise;
-    if(name == interface){
+    if(name == QString("%1:").arg(interface)){
       if ( quality > 92 )
-        #ifdef MDEBUG
         qDebug( "WIFIAPPLET: D'oh! Quality %d > estimated max!\n", quality );
-        #endif
       if ( ( signal > IW_UPPER ) || ( signal < IW_LOWER ) )
-        #ifdef MDEBUG
         qDebug( "WIFIAPPLET: Doh! Strength %d > estimated max!\n", signal );
-        #endif
       if ( ( noise > IW_UPPER ) || ( noise < IW_LOWER ) )
-        #ifdef MDEBUG
         qDebug( "WIFIAPPLET: Doh! Noise %d > estimated max!\n", noise );
-        #endif
+      qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1());
+      signal = ( ( signal-IW_LOWER ) * 100 ) / IW_UPPER;
+      noise = ( ( noise-IW_LOWER ) * 100 ) / IW_UPPER;
+      quality = ( quality*100 ) / 92;
       return true;
     }  
   }
 
-  qDebug("Card no longer present");
+  qDebug("WExtensions::statsCard no longer present.");
   quality = -1;
   signal = IW_LOWER;
   noise = IW_LOWER;
   return false;
 }
 
diff --git a/noncore/settings/networksettings/wlan/wextensions.h b/noncore/settings/networksettings/wlan/wextensions.h
index 29997f5..1565eb5 100644
--- a/noncore/settings/networksettings/wlan/wextensions.h
+++ b/noncore/settings/networksettings/wlan/wextensions.h
@@ -13,12 +13,13 @@ public:
   QString getInterfaceName(){return interface;};
   bool doesHaveWirelessExtensions(){return hasWirelessExtensions;};
   QString station();
   QString essid();
   QString mode();
   double frequency();
+  double rate();
   QString ap();
   bool stats( int &signal, int &noise, int &quality);
 
 private:
   bool hasWirelessExtensions;
   QString interface;
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index ab0b9a5..73e753c 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -80,20 +80,21 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
   (*tabWidget) = info->tabWidget;
   
   info->essidLabel->setText(we.essid());
   info->apLabel->setText(we.ap());
   info->stationLabel->setText(we.station());
   info->modeLabel->setText(we.mode());
-  info->freqLabel->setText(QString("%1").arg(we.frequency()));
+  info->freqLabel->setText(QString("%1 GHz").arg(we.frequency()));
   int signal = 0;
   int noise = 0;
   int quality = 0;
   we.stats(signal, noise, quality);
   info->signalProgressBar->setProgress(signal);
   info->noiseProgressBar->setProgress(noise);
   info->qualityProgressBar->setProgress(quality);
+  info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate()));
   return info;
 }
 
 /**
  * Get all active (up or down) interfaces
  * @return QList<Interface> A list of interfaces that exsist that havn't