show signal strength for connections

2 files changed, 39 insertions, 1 deletions

diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 8ddcfe8..c89d325 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -260,7 +260,6 @@ void Manager::searchConnections() {
     }
 }
 void Manager::slotConnectionExited( OProcess* proc ) {
-    qWarning("<<<<<<<<<<<<<<<<<exited");
     ConnectionState::ValueList list;
     list = parseConnections( m_hcitoolCon );
     emit connections(list );
@@ -301,3 +300,35 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) {
     }
     return list2;
 }
+
+void Manager::signalStrength( const QString &mac ) {
+
+    OProcess* sig_proc = new OProcess();
+
+    connect(sig_proc, SIGNAL(processExited(OProcess*) ),
+            this, SLOT(slotSignalStrengthExited( OProcess*) ) );
+    connect(sig_proc, SIGNAL(receivedStdout(OProcess*, char*, int) ),
+            this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) );
+    *sig_proc << "hcitool";
+    *sig_proc << "lq";
+    *sig_proc << mac;
+
+    sig_proc->setName( mac.latin1() );
+
+    if (!sig_proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
+        emit signalStrength( mac, "-1" );
+        delete sig_proc;
+    }
+}
+
+void Manager::slotSignalStrengthOutput(OProcess* proc, char* cha, int len) {
+    QCString str(cha, len );
+    QString temp = QString(str).stripWhiteSpace();
+    QStringList value = QStringList::split(' ', temp );
+    emit signalStrength( proc->name(), value[2].latin1() );
+}
+
+
+void Manager::slotSignalStrengthExited( OProcess* proc ) {
+     delete proc;
+}
diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h
index 0ebe1b3..abc8ba1 100644
--- a/noncore/net/opietooth/lib/manager.h
+++ b/noncore/net/opietooth/lib/manager.h
@@ -124,6 +124,7 @@ namespace OpieTooth {
          */
         void searchConnections();
 
+        void signalStrength( const QString &mac );
 //// not implemented yet
         /*static*/ QString toDevice( const QString& mac );
         /*static*/ QString toMac( const QString &device );
@@ -138,6 +139,7 @@ namespace OpieTooth {
         void foundServices( const QString& device, Services::ValueList );
         void foundDevices( const QString& device, RemoteDevice::ValueList );
         void connections( ConnectionState::ValueList );
+        void signalStrength( const QString& mac, const QString& strengh );
 
 private slots:
         void slotProcessExited(OProcess* );
@@ -150,6 +152,9 @@ private slots:
 
         void slotConnectionExited(OProcess* );
         void slotConnectionOutput(OProcess*, char*, int );
+
+        void slotSignalStrengthOutput( OProcess*, char*, int );
+        void slotSignalStrengthExited( OProcess* );
     private:
         Services::ValueList parseSDPOutput( const QString& );
         RemoteDevice::ValueList parseHCIOutput( const QString& );
@@ -157,8 +162,10 @@ private slots:
         OProcess *m_hcitool;
         OProcess *m_sdp; // not only one
         QString m_device;
+        QMap<QString, int> m_signalStrength;
         QMap<QString, QString> m_out;
         QMap<QString, QString> m_devices;
+        QMap<OProcess*, QString> m_signalMac;
         QString m_hcitoolCon;
     };
 };